aboutsummaryrefslogtreecommitdiffstats
path: root/ethchain/state.go
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-07-03 22:08:13 +0800
committerzelig <viktor.tron@gmail.com>2014-07-03 22:08:13 +0800
commitde2da4fd19b53a541ffbddfa4360ceabef14f1a9 (patch)
treee1895a115645ae46b33ed33f5fcc148a1cd1a288 /ethchain/state.go
parent198e5eeab9e2a7c359c12cdd5c8782dc56ae54ec (diff)
parent5d6713920625b82df2b55728b2cbb9f7f3df2025 (diff)
downloadgo-tangerine-de2da4fd19b53a541ffbddfa4360ceabef14f1a9.tar.gz
go-tangerine-de2da4fd19b53a541ffbddfa4360ceabef14f1a9.tar.zst
go-tangerine-de2da4fd19b53a541ffbddfa4360ceabef14f1a9.zip
Merge branch 'develop' of github.com:ethereum/eth-go into feature/clientid
Diffstat (limited to 'ethchain/state.go')
-rw-r--r--ethchain/state.go6
1 files changed, 1 insertions, 5 deletions
diff --git a/ethchain/state.go b/ethchain/state.go
index 3d05ff582..7ddf7916f 100644
--- a/ethchain/state.go
+++ b/ethchain/state.go
@@ -93,10 +93,6 @@ func (self *State) ResetStateObject(stateObject *StateObject) {
func (self *State) UpdateStateObject(stateObject *StateObject) {
addr := stateObject.Address()
- if self.stateObjects[string(addr)] == nil {
- self.stateObjects[string(addr)] = stateObject
- }
-
ethutil.Config.Db.Put(ethcrypto.Sha3Bin(stateObject.Script()), stateObject.Script())
self.trie.Update(string(addr), string(stateObject.RlpEncode()))
@@ -131,7 +127,7 @@ func (self *State) GetOrNewStateObject(addr []byte) *StateObject {
}
func (self *State) NewStateObject(addr []byte) *StateObject {
- //statelogger.Infof("(+) %x\n", addr)
+ statelogger.Infof("(+) %x\n", addr)
stateObject := NewStateObject(addr)
self.stateObjects[string(addr)] = stateObject