diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2014-11-27 20:23:31 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2014-11-27 20:23:31 +0800 |
| commit | ef7961b7d27be930a4d9dc81527a55497d3dea2e (patch) | |
| tree | 5746b715b1b66c5767779e2e4ca66be345333e13 /cmd/mist/html_container.go | |
| parent | c17a3cb0ceec44c10bc84d05f0d81f08894c792c (diff) | |
| parent | 8cf9ed0ea588e97f2baf0f834248727e8fbca18f (diff) | |
| download | dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.gz dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.bz2 dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.lz dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.xz dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.zst dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.zip | |
Merge pull request #194 from ethereum/poc8
Update tests branch to PoC8
Diffstat (limited to 'cmd/mist/html_container.go')
| -rw-r--r-- | cmd/mist/html_container.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/mist/html_container.go b/cmd/mist/html_container.go index 35e351b02..4c6609a95 100644 --- a/cmd/mist/html_container.go +++ b/cmd/mist/html_container.go @@ -26,8 +26,7 @@ import ( "os" "path" "path/filepath" - - "github.com/ethereum/go-ethereum/chain" + "github.com/ethereum/go-ethereum/chain/types" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/javascript" "github.com/ethereum/go-ethereum/state" @@ -138,7 +137,7 @@ func (app *HtmlApplication) Window() *qml.Window { return app.win } -func (app *HtmlApplication) NewBlock(block *chain.Block) { +func (app *HtmlApplication) NewBlock(block *types.Block) { b := &xeth.JSBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Bytes2Hex(block.Hash())} app.webView.Call("onNewBlockCb", b) } |