diff options
author | obscuren <geffobscura@gmail.com> | 2014-10-31 21:45:03 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-10-31 21:45:03 +0800 |
commit | af34749a6b47ff8f9b4cb55d9ea65e1235d63b68 (patch) | |
tree | d7b244bf5076cd6a56df626d97249b3264d92a86 /state | |
parent | af8f5f0b69f1c359991d12c7708804fe8dd1f944 (diff) | |
download | dexon-af34749a6b47ff8f9b4cb55d9ea65e1235d63b68.tar dexon-af34749a6b47ff8f9b4cb55d9ea65e1235d63b68.tar.gz dexon-af34749a6b47ff8f9b4cb55d9ea65e1235d63b68.tar.bz2 dexon-af34749a6b47ff8f9b4cb55d9ea65e1235d63b68.tar.lz dexon-af34749a6b47ff8f9b4cb55d9ea65e1235d63b68.tar.xz dexon-af34749a6b47ff8f9b4cb55d9ea65e1235d63b68.tar.zst dexon-af34749a6b47ff8f9b4cb55d9ea65e1235d63b68.zip |
ethtrie => trie
Diffstat (limited to 'state')
-rw-r--r-- | state/state.go | 8 | ||||
-rw-r--r-- | state/state_object.go | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/state/state.go b/state/state.go index 298cf9680..e1b73a6ab 100644 --- a/state/state.go +++ b/state/state.go @@ -3,9 +3,9 @@ package state import ( "math/big" - "github.com/ethereum/go-ethereum/ethtrie" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/trie" ) var statelogger = logger.NewLogger("STATE") @@ -17,7 +17,7 @@ var statelogger = logger.NewLogger("STATE") // * Accounts type State struct { // The trie for this structure - Trie *ethtrie.Trie + Trie *trie.Trie stateObjects map[string]*StateObject @@ -29,7 +29,7 @@ type State struct { } // Create a new state from a given trie -func New(trie *ethtrie.Trie) *State { +func New(trie *trie.Trie) *State { return &State{Trie: trie, stateObjects: make(map[string]*StateObject), manifest: NewManifest(), refund: make(map[string]*big.Int)} } @@ -300,7 +300,7 @@ func (self *State) Update() { // FIXME trie delete is broken if deleted { - valid, t2 := ethtrie.ParanoiaCheck(self.Trie) + valid, t2 := trie.ParanoiaCheck(self.Trie) if !valid { statelogger.Infof("Warn: PARANOIA: Different state root during copy %x vs %x\n", self.Trie.Root, t2.Root) diff --git a/state/state_object.go b/state/state_object.go index fb568e543..aa5c13678 100644 --- a/state/state_object.go +++ b/state/state_object.go @@ -5,8 +5,8 @@ import ( "math/big" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethtrie" "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/trie" ) type Code []byte @@ -62,7 +62,7 @@ func NewStateObject(addr []byte) *StateObject { address := ethutil.Address(addr) object := &StateObject{address: address, balance: new(big.Int), gasPool: new(big.Int)} - object.State = New(ethtrie.New(ethutil.Config.Db, "")) + object.State = New(trie.New(ethutil.Config.Db, "")) object.storage = make(Storage) object.gasPool = new(big.Int) @@ -72,7 +72,7 @@ func NewStateObject(addr []byte) *StateObject { func NewContract(address []byte, balance *big.Int, root []byte) *StateObject { contract := NewStateObject(address) contract.balance = balance - contract.State = New(ethtrie.New(ethutil.Config.Db, string(root))) + contract.State = New(trie.New(ethutil.Config.Db, string(root))) return contract } @@ -129,7 +129,7 @@ func (self *StateObject) SetState(k []byte, value *ethutil.Value) { } // Iterate over each storage address and yield callback -func (self *StateObject) EachStorage(cb ethtrie.EachCallback) { +func (self *StateObject) EachStorage(cb trie.EachCallback) { // First loop over the uncommit/cached values in storage for key, value := range self.storage { // XXX Most iterators Fns as it stands require encoded values @@ -158,7 +158,7 @@ func (self *StateObject) Sync() { self.SetAddr([]byte(key), value) } - valid, t2 := ethtrie.ParanoiaCheck(self.State.Trie) + valid, t2 := trie.ParanoiaCheck(self.State.Trie) if !valid { statelogger.Infof("Warn: PARANOIA: Different state storage root during copy %x vs %x\n", self.State.Trie.Root, t2.Root) @@ -321,7 +321,7 @@ func (c *StateObject) RlpDecode(data []byte) { c.Nonce = decoder.Get(0).Uint() c.balance = decoder.Get(1).BigInt() - c.State = New(ethtrie.New(ethutil.Config.Db, decoder.Get(2).Interface())) + c.State = New(trie.New(ethutil.Config.Db, decoder.Get(2).Interface())) c.storage = make(map[string]*ethutil.Value) c.gasPool = new(big.Int) |