diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-13 18:40:45 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-13 18:40:45 +0800 |
| commit | c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78 (patch) | |
| tree | aa8a175c0c85c963a4110c247348cde29c73cabe | |
| parent | 5208b04821a1522c6535835539943d8c874f9fdb (diff) | |
| parent | 03371b74d7b169c0ad6ccf8868bc97c7fe85169d (diff) | |
| download | go-tangerine-c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78.tar.gz go-tangerine-c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78.tar.zst go-tangerine-c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78.zip | |
Fix merge conflict
| -rw-r--r-- | ethereal/assets/qml/webapp.qml | 4 | ||||
| -rw-r--r-- | ethereal/ui/ext_app.go | 2 | ||||
| -rw-r--r-- | ethereal/ui/gui.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index 1f3c3874a..14f3bd6d0 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -48,11 +48,11 @@ ApplicationWindow { try { switch(data.call) { case "getBlockByNumber": - var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") + var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") postData(data._seed, block) break case "getBlockByHash": - var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") + var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") postData(data._seed, block) break case "transact": diff --git a/ethereal/ui/ext_app.go b/ethereal/ui/ext_app.go index 93db0ade1..de5f15db6 100644 --- a/ethereal/ui/ext_app.go +++ b/ethereal/ui/ext_app.go @@ -34,7 +34,7 @@ type ExtApplication struct { func NewExtApplication(container AppContainer, lib *UiLib) *ExtApplication { app := &ExtApplication{ - ethpub.NewPEthereum(lib.eth.StateManager(), lib.eth.BlockChain(), lib.eth.TxPool()), + ethpub.NewPEthereum(lib.eth), make(chan ethutil.React, 1), make(chan ethutil.React, 1), make(chan bool), diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index c1fda47f4..3393b1101 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -53,7 +53,7 @@ func New(ethereum *eth.Ethereum) *Gui { //ethereum.StateManager().WatchAddr(addr) } - pub := ethpub.NewPEthereum(ethereum.StateManager(), ethereum.BlockChain(), ethereum.TxPool()) + pub := ethpub.NewPEthereum(ethereum) return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub} } |