Merge pull request #1480 from obscuren/miner-state-sync

miner: moved state sync
2015-07-19 05:03:59 -07:00 · 2015-07-19 05:03:59 -07:00 · 26c0fa1cb0
parent a38f3740d6 1b9ef0e52d
commit 26c0fa1cb0
1 changed files with 1 additions and 1 deletions
--- a/miner/worker.go
+++ b/miner/worker.go
@ -263,6 +263,7 @@ func (self *worker) wait() {
 			}
 			block := result.Block

+			self.current.state.Sync()
 			if self.fullValidation {
 				if _, err := self.chain.InsertChain(types.Blocks{block}); err != nil {
 					glog.V(logger.Error).Infoln("mining err", err)
@ -489,7 +490,6 @@ func (self *worker) commitNewWork() {
 		// commit state root after all state transitions.
 		core.AccumulateRewards(self.current.state, header, uncles)
 		current.state.SyncObjects()
-		self.current.state.Sync()
 		header.Root = current.state.Root()
 	}