diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-02 20:08:08 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-02 20:08:08 +0800 |
| commit | 231ad9b562f4870d6fa6b250e791437d330c5535 (patch) | |
| tree | f1af29b9485d98f6e3ea7c8b588beb7bd5181512 /ethereal/ui/html_container.go | |
| parent | 60f9966cd8f991967882dd61e602822a95681d85 (diff) | |
| parent | 2582d719b2a8a3facac4410dd9a2ddaf5000f038 (diff) | |
| download | go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar.gz go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar.bz2 go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar.lz go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar.xz go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar.zst go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.zip | |
Merge branch 'develop' into feature/rpc
Diffstat (limited to 'ethereal/ui/html_container.go')
| -rw-r--r-- | ethereal/ui/html_container.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ethereal/ui/html_container.go b/ethereal/ui/html_container.go index 16cc531f2..e3e48bfcc 100644 --- a/ethereal/ui/html_container.go +++ b/ethereal/ui/html_container.go @@ -3,8 +3,8 @@ package ethui import ( "errors" "github.com/ethereum/eth-go/ethchain" + "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/go-ethereum/utils" "github.com/go-qml/qml" "math/big" "path/filepath" @@ -57,12 +57,12 @@ func (app *HtmlApplication) Window() *qml.Window { } func (app *HtmlApplication) NewBlock(block *ethchain.Block) { - b := &utils.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())} + b := ðpub.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())} app.webView.Call("onNewBlockCb", b) } func (app *HtmlApplication) ObjectChanged(stateObject *ethchain.StateObject) { - app.webView.Call("onObjectChangeCb", utils.NewPStateObject(stateObject)) + app.webView.Call("onObjectChangeCb", ethpub.NewPStateObject(stateObject)) } func (app *HtmlApplication) StorageChanged(stateObject *ethchain.StateObject, addr []byte, value *big.Int) { |