diff options
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | miner/worker.go | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index ff3ff71f7..2b3ff92f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,6 @@ language: go go: - 1.4.2 -before_install: - - sudo apt-get update -qq - - sudo apt-get install -yqq libgmp3-dev install: # - go get code.google.com/p/go.tools/cmd/goimports # - go get github.com/golang/lint/golint @@ -22,7 +19,11 @@ after_success: env: global: - secure: "U2U1AmkU4NJBgKR/uUAebQY87cNL0+1JHjnLOmmXwxYYyj5ralWb1aSuSH3qSXiT93qLBmtaUkuv9fberHVqrbAeVlztVdUsKAq7JMQH+M99iFkC9UiRMqHmtjWJ0ok4COD1sRYixxi21wb/JrMe3M1iL4QJVS61iltjHhVdM64=" - +sudo: false +addons: + apt: + packages: + - libgmp3-dev notifications: webhooks: urls: diff --git a/miner/worker.go b/miner/worker.go index b93444b1e..90ef79e3f 100644 --- 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() } |