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/qml_container.go | |
| parent | c17a3cb0ceec44c10bc84d05f0d81f08894c792c (diff) | |
| parent | 8cf9ed0ea588e97f2baf0f834248727e8fbca18f (diff) | |
| download | go-tangerine-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar go-tangerine-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.gz go-tangerine-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.bz2 go-tangerine-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.lz go-tangerine-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.xz go-tangerine-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.zst go-tangerine-ef7961b7d27be930a4d9dc81527a55497d3dea2e.zip | |
Merge pull request #194 from ethereum/poc8
Update tests branch to PoC8
Diffstat (limited to 'cmd/mist/qml_container.go')
| -rw-r--r-- | cmd/mist/qml_container.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/mist/qml_container.go b/cmd/mist/qml_container.go index 60013ec2b..b5986c16e 100644 --- a/cmd/mist/qml_container.go +++ b/cmd/mist/qml_container.go @@ -20,8 +20,7 @@ package main import ( "fmt" "runtime" - - "github.com/ethereum/go-ethereum/chain" + "github.com/ethereum/go-ethereum/chain/types" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/xeth" @@ -65,7 +64,7 @@ func (app *QmlApplication) NewWatcher(quitChan chan bool) { } // Events -func (app *QmlApplication) NewBlock(block *chain.Block) { +func (app *QmlApplication) NewBlock(block *types.Block) { pblock := &xeth.JSBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Bytes2Hex(block.Hash())} app.win.Call("onNewBlockCb", pblock) } |