aboutsummaryrefslogtreecommitdiffstats
path: root/state/dump.go
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-03-03 03:13:41 +0800
committerzelig <viktor.tron@gmail.com>2015-03-03 03:13:41 +0800
commitaf6971f823431e091142dc81f1b252f681d086cf (patch)
tree2b34e0f42adaeebcf28c955249934f7dc5270792 /state/dump.go
parenta60a18b080197cad836f18f9d093bba3bcb6cef8 (diff)
parent65cad14f9b27db396d036f47814d4843d947ac43 (diff)
downloadgo-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar
go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar.gz
go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar.bz2
go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar.lz
go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar.xz
go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar.zst
go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.zip
Merge remote-tracking branch 'upstream/develop' into blockpool2
Diffstat (limited to 'state/dump.go')
-rw-r--r--state/dump.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/state/dump.go b/state/dump.go
index 81895f1a3..2c611d76b 100644
--- a/state/dump.go
+++ b/state/dump.go
@@ -20,7 +20,7 @@ type World struct {
Accounts map[string]Account `json:"accounts"`
}
-func (self *StateDB) Dump() []byte {
+func (self *StateDB) RawDump() World {
world := World{
Root: ethutil.Bytes2Hex(self.trie.Root()),
Accounts: make(map[string]Account),
@@ -35,12 +35,15 @@ func (self *StateDB) Dump() []byte {
storageIt := stateObject.State.trie.Iterator()
for storageIt.Next() {
- account.Storage[ethutil.Bytes2Hex(it.Key)] = ethutil.Bytes2Hex(it.Value)
+ account.Storage[ethutil.Bytes2Hex(storageIt.Key)] = ethutil.Bytes2Hex(storageIt.Value)
}
world.Accounts[ethutil.Bytes2Hex(it.Key)] = account
}
+ return world
+}
- json, err := json.MarshalIndent(world, "", " ")
+func (self *StateDB) Dump() []byte {
+ json, err := json.MarshalIndent(self.RawDump(), "", " ")
if err != nil {
fmt.Println("dump err", err)
}