diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-05 20:17:20 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-05 20:17:20 +0800 |
| commit | cb9ca992debfcef83f79b2c606955e6688880694 (patch) | |
| tree | 91133b39f56ab5292a538a353ab3c55c3b951383 /ethereal/ui | |
| parent | e94e5ac75dbbc4ec52228ae11377a4fa71ab95ab (diff) | |
| parent | 91824af46b59b7af84c7591236fe8b34b667ddb8 (diff) | |
| download | go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar.gz go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar.bz2 go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar.lz go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar.xz go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar.zst go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.zip | |
Merge branch 'develop' into feature/rpc
Diffstat (limited to 'ethereal/ui')
| -rw-r--r-- | ethereal/ui/ext_app.go | 7 | ||||
| -rw-r--r-- | ethereal/ui/html_container.go | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/ethereal/ui/ext_app.go b/ethereal/ui/ext_app.go index 110ad37d7..93db0ade1 100644 --- a/ethereal/ui/ext_app.go +++ b/ethereal/ui/ext_app.go @@ -6,7 +6,6 @@ import ( "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" "github.com/go-qml/qml" - "math/big" ) type AppContainer interface { @@ -18,7 +17,7 @@ type AppContainer interface { NewBlock(*ethchain.Block) ObjectChanged(*ethchain.StateObject) - StorageChanged(*ethchain.StateObject, []byte, *big.Int) + StorageChanged(*ethchain.StorageState) } type ExtApplication struct { @@ -105,8 +104,8 @@ out: case object := <-app.changeChan: if stateObject, ok := object.Resource.(*ethchain.StateObject); ok { app.container.ObjectChanged(stateObject) - } else if _, ok := object.Resource.(*big.Int); ok { - // + } else if storageObject, ok := object.Resource.(*ethchain.StorageState); ok { + app.container.StorageChanged(storageObject) } } } diff --git a/ethereal/ui/html_container.go b/ethereal/ui/html_container.go index e3e48bfcc..4f12aaaf6 100644 --- a/ethereal/ui/html_container.go +++ b/ethereal/ui/html_container.go @@ -6,7 +6,6 @@ import ( "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" "github.com/go-qml/qml" - "math/big" "path/filepath" ) @@ -65,8 +64,8 @@ func (app *HtmlApplication) ObjectChanged(stateObject *ethchain.StateObject) { app.webView.Call("onObjectChangeCb", ethpub.NewPStateObject(stateObject)) } -func (app *HtmlApplication) StorageChanged(stateObject *ethchain.StateObject, addr []byte, value *big.Int) { - app.webView.Call("onStorageChangeCb", nil) +func (app *HtmlApplication) StorageChanged(storageObject *ethchain.StorageState) { + app.webView.Call("onStorageChangeCb", ethpub.NewPStorageState(storageObject)) } func (app *HtmlApplication) Destroy() { |