gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ethtrie => trie

Browse Source
This commit is contained in:
obscuren
2014-10-31 14:45:03 +01:00
parent af8f5f0b69
commit af34749a6b
10 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
chain/block.go
View File

@@ -8,9 +8,9 @@ import (
"time"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethtrie"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/trie"
)
type BlockInfo struct {
@@ -137,7 +137,7 @@ func CreateBlock(root interface{},
}
block.SetUncles([]*Block{})
block.state = state.New(ethtrie.New(ethutil.Config.Db, root))
block.state = state.New(trie.New(ethutil.Config.Db, root))
return block
}
@@ -294,7 +294,7 @@ func (self *Block) setHeader(header *ethutil.Value) {
self.PrevHash = header.Get(0).Bytes()
self.UncleSha = header.Get(1).Bytes()
self.Coinbase = header.Get(2).Bytes()
self.state = state.New(ethtrie.New(ethutil.Config.Db, header.Get(3).Val))
self.state = state.New(trie.New(ethutil.Config.Db, header.Get(3).Val))
self.TxSha = header.Get(4).Bytes()
self.ReceiptSha = header.Get(5).Bytes()
self.LogsBloom = header.Get(6).Bytes()
@@ -315,7 +315,7 @@ func NewUncleBlockFromValue(header *ethutil.Value) *Block {
return block
}
func (block *Block) Trie() *ethtrie.Trie {
func (block *Block) Trie() *trie.Trie {
return block.state.Trie
}

4
chain/derive_sha.go
View File

@@ -1,8 +1,8 @@
package chain
import (
"github.com/ethereum/go-ethereum/ethtrie"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/trie"
)
type DerivableList interface {
@@ -11,7 +11,7 @@ type DerivableList interface {
}
func DeriveSha(list DerivableList) []byte {
trie := ethtrie.New(ethutil.Config.Db, "")
trie := trie.New(ethutil.Config.Db, "")
for i := 0; i < list.Len(); i++ {
trie.Update(string(ethutil.NewValue(i).Encode()), string(list.GetRlp(i)))
}