diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-10 06:25:46 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-10 06:25:46 +0800 |
| commit | 9bf513e99305af733110cf23a0b47c8e73359010 (patch) | |
| tree | f9d36e1ae1f2f7c3eb803c7499a4e85a5cdcd5bd /state/state_object.go | |
| parent | cd51860bf024d949a09b3863c88a278a386227a7 (diff) | |
| parent | 676a0de58d3d7c508b0eeeff192d2095a46f7382 (diff) | |
| download | go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.gz go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.bz2 go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.lz go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.xz go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.zst go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.zip | |
Merge ethereum/poc-9 into accounts-integration
Conflicts:
cmd/utils/cmd.go
cmd/utils/flags.go
core/manager.go
eth/backend.go
rpc/http/server.go
xeth/xeth.go
Diffstat (limited to 'state/state_object.go')
| -rw-r--r-- | state/state_object.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/state/state_object.go b/state/state_object.go index 51ec95efa..ccbfea391 100644 --- a/state/state_object.go +++ b/state/state_object.go @@ -111,7 +111,7 @@ func NewStateObjectFromBytes(address, data []byte, db ethutil.Database) *StateOb func (self *StateObject) MarkForDeletion() { self.remove = true self.dirty = true - statelogger.DebugDetailf("%x: #%d %v (deletion)\n", self.Address(), self.nonce, self.balance) + statelogger.Debugf("%x: #%d %v X\n", self.Address(), self.nonce, self.balance) } func (c *StateObject) getAddr(addr []byte) *ethutil.Value { |