From b417766b36f46316cbae6fa42815f1a519e5f733 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 8 Oct 2014 11:59:44 +0200
Subject: Minor tweaks for poc7
---
ethstate/state.go | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'ethstate')
diff --git a/ethstate/state.go b/ethstate/state.go
index 0e87659fc..23b106e34 100644
--- a/ethstate/state.go
+++ b/ethstate/state.go
@@ -181,8 +181,6 @@ func (s *State) Reset() {
func (s *State) Sync() {
// Sync all nested states
for _, stateObject := range s.stateObjects {
- //s.UpdateStateObject(stateObject)
-
if stateObject.State == nil {
continue
}
@@ -200,9 +198,11 @@ func (self *State) Empty() {
}
func (self *State) Update() {
+ var deleted bool
for _, stateObject := range self.stateObjects {
if stateObject.remove {
self.DeleteStateObject(stateObject)
+ deleted = true
} else {
stateObject.Sync()
@@ -211,11 +211,13 @@ func (self *State) Update() {
}
// FIXME trie delete is broken
- valid, t2 := ethtrie.ParanoiaCheck(self.Trie)
- if !valid {
- statelogger.Infof("Warn: PARANOIA: Different state root during copy %x vs %x\n", self.Trie.Root, t2.Root)
+ if deleted {
+ valid, t2 := ethtrie.ParanoiaCheck(self.Trie)
+ if !valid {
+ statelogger.Infof("Warn: PARANOIA: Different state root during copy %x vs %x\n", self.Trie.Root, t2.Root)
- self.Trie = t2
+ self.Trie = t2
+ }
}
}
--
cgit v1.2.3