diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-04-02 19:39:46 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-04-02 19:39:46 +0800 |
| commit | 118ad22ee59658ec8ff476999e48d9bffb0c7db6 (patch) | |
| tree | b60422477450918993bdce27f22cd45d81952bd8 /core/state | |
| parent | 81de8ed0912f767b2e3104aaad5c7f31920aaf2a (diff) | |
| parent | 79828531b1e6a1d5073f45e0e672c54a019de7c0 (diff) | |
| download | dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.gz dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.bz2 dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.lz dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.xz dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.zst dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.zip | |
Merge branch 'develop' into rpcfabian
Diffstat (limited to 'core/state')
| -rw-r--r-- | core/state/state_test.go | 2 | ||||
| -rw-r--r-- | core/state/statedb.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/state/state_test.go b/core/state/state_test.go index da597d773..09a65de54 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -72,7 +72,7 @@ func TestNull(t *testing.T) { //value := common.FromHex("0x823140710bf13990e4500136726d8b55") value := make([]byte, 16) state.SetState(address, common.Hash{}, value) - state.Update(nil) + state.Update() state.Sync() value = state.GetState(address, common.Hash{}) } diff --git a/core/state/statedb.go b/core/state/statedb.go index 2dc8239ef..e69bb34fe 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -316,7 +316,7 @@ func (self *StateDB) Refunds() map[string]*big.Int { return self.refund } -func (self *StateDB) Update(gasUsed *big.Int) { +func (self *StateDB) Update() { self.refund = make(map[string]*big.Int) for _, stateObject := range self.stateObjects { |