From 15960a5c04c154a07d8813fcc9a6fa465d8d4500 Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 21 Jul 2014 11:55:50 +0200 Subject: [PATCH] changed iterator --- ethereal/debugger.go | 2 +- ethereal/gui.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ethereal/debugger.go b/ethereal/debugger.go index 7742b16271..17087f8ce4 100644 --- a/ethereal/debugger.go +++ b/ethereal/debugger.go @@ -289,7 +289,7 @@ func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, sta d.win.Root().Call("setStack", val.String()) } - stateObject.State().EachStorage(func(key string, node *ethutil.Value) { + stateObject.EachStorage(func(key string, node *ethutil.Value) { d.win.Root().Call("setStorage", storeVal{fmt.Sprintf("% x", key), fmt.Sprintf("% x", node.Str())}) }) diff --git a/ethereal/gui.go b/ethereal/gui.go index d816a774fa..d76db2ade3 100644 --- a/ethereal/gui.go +++ b/ethereal/gui.go @@ -220,8 +220,9 @@ func (gui *Gui) loadAddressBook() { nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg() if nameReg != nil { - nameReg.State().EachStorage(func(name string, value *ethutil.Value) { + nameReg.EachStorage(func(name string, value *ethutil.Value) { if name[0] != 0 { + value.Decode() gui.win.Root().Call("addAddress", struct{ Name, Address string }{name, ethutil.Bytes2Hex(value.Bytes())}) } })