diff options
Diffstat (limited to 'ethereal')
| -rw-r--r-- | ethereal/html_container.go | 4 | ||||
| -rw-r--r-- | ethereal/qml_container.go | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/ethereal/html_container.go b/ethereal/html_container.go index 172fff08e..e682dc3eb 100644 --- a/ethereal/html_container.go +++ b/ethereal/html_container.go @@ -10,7 +10,7 @@ import ( "path/filepath" "github.com/ethereum/eth-go/ethchain" - "github.com/ethereum/eth-go/ethpub" + "github.com/ethereum/eth-go/ethpipe" "github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/go-ethereum/javascript" @@ -121,7 +121,7 @@ func (app *HtmlApplication) Window() *qml.Window { } func (app *HtmlApplication) NewBlock(block *ethchain.Block) { - b := ðpub.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Bytes2Hex(block.Hash())} + b := ðpipe.JSBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Bytes2Hex(block.Hash())} app.webView.Call("onNewBlockCb", b) } diff --git a/ethereal/qml_container.go b/ethereal/qml_container.go index babb9ceab..8c9ea0a8f 100644 --- a/ethereal/qml_container.go +++ b/ethereal/qml_container.go @@ -5,7 +5,7 @@ import ( "runtime" "github.com/ethereum/eth-go/ethchain" - "github.com/ethereum/eth-go/ethpub" + "github.com/ethereum/eth-go/ethpipe" "github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethutil" "gopkg.in/qml.v1" @@ -49,18 +49,10 @@ func (app *QmlApplication) NewWatcher(quitChan chan bool) { // Events func (app *QmlApplication) NewBlock(block *ethchain.Block) { - pblock := ðpub.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Bytes2Hex(block.Hash())} + pblock := ðpipe.JSBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Bytes2Hex(block.Hash())} app.win.Call("onNewBlockCb", pblock) } -func (app *QmlApplication) ObjectChanged(stateObject *ethstate.StateObject) { - app.win.Call("onObjectChangeCb", ethpub.NewPStateObject(stateObject)) -} - -func (app *QmlApplication) StorageChanged(storageObject *ethstate.StorageState) { - app.win.Call("onStorageChangeCb", ethpub.NewPStorageState(storageObject)) -} - func (self *QmlApplication) Messages(msgs ethstate.Messages, id string) { fmt.Println("IMPLEMENT QML APPLICATION MESSAGES METHOD") } |