From aa699a1283c93740bba15f94c774d92ea6fe1980 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 17 Jun 2015 13:27:51 +0200 Subject: core/state: removed state from state object --- core/state/statedb.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'core/state/statedb.go') diff --git a/core/state/statedb.go b/core/state/statedb.go index 1c75ee4db..134c4b3c7 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -296,10 +296,6 @@ func (s *StateDB) Reset() { // Reset all nested states for _, stateObject := range s.stateObjects { - if stateObject.State == nil { - continue - } - stateObject.Reset() } @@ -310,11 +306,7 @@ func (s *StateDB) Reset() { func (s *StateDB) Sync() { // Sync all nested states for _, stateObject := range s.stateObjects { - if stateObject.State == nil { - continue - } - - stateObject.State.Sync() + stateObject.trie.Commit() } s.trie.Commit() @@ -339,7 +331,7 @@ func (self *StateDB) Update() { if stateObject.remove { self.DeleteStateObject(stateObject) } else { - stateObject.Sync() + stateObject.Update() self.UpdateStateObject(stateObject) } -- cgit v1.2.3