aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/ui/gui.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-02 19:55:58 +0800
committerobscuren <geffobscura@gmail.com>2014-05-02 19:55:58 +0800
commited64434dcc10347ad9846182ece2d71238138de9 (patch)
tree288190920f552cd559895f60a823a4209144507e /ethereal/ui/gui.go
parentf1da6f0564696f4fb5a6c04d1b9e24ed12432d63 (diff)
downloaddexon-ed64434dcc10347ad9846182ece2d71238138de9.tar
dexon-ed64434dcc10347ad9846182ece2d71238138de9.tar.gz
dexon-ed64434dcc10347ad9846182ece2d71238138de9.tar.bz2
dexon-ed64434dcc10347ad9846182ece2d71238138de9.tar.lz
dexon-ed64434dcc10347ad9846182ece2d71238138de9.tar.xz
dexon-ed64434dcc10347ad9846182ece2d71238138de9.tar.zst
dexon-ed64434dcc10347ad9846182ece2d71238138de9.zip
Moved public interface
Diffstat (limited to 'ethereal/ui/gui.go')
-rw-r--r--ethereal/ui/gui.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index 8e6433207..522c081a3 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -6,8 +6,8 @@ import (
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethdb"
+ "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"
"strings"
@@ -57,9 +57,9 @@ func (ui *Gui) Start(assetPath string) {
// Register ethereum functions
qml.RegisterTypes("Ethereum", 1, 0, []qml.TypeSpec{{
- Init: func(p *utils.PBlock, obj qml.Object) { p.Number = 0; p.Hash = "" },
+ Init: func(p *ethpub.PBlock, obj qml.Object) { p.Number = 0; p.Hash = "" },
}, {
- Init: func(p *utils.PTx, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" },
+ Init: func(p *ethpub.PTx, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" },
}})
ethutil.Config.SetClientString(fmt.Sprintf("/Ethereal v%s", "0.2"))
@@ -130,13 +130,13 @@ func (ui *Gui) readPreviousTransactions() {
for it.Next() {
tx := ethchain.NewTransactionFromBytes(it.Value())
- ui.win.Root().Call("addTx", utils.NewPTx(tx))
+ ui.win.Root().Call("addTx", ethpub.NewPTx(tx))
}
it.Release()
}
func (ui *Gui) ProcessBlock(block *ethchain.Block) {
- ui.win.Root().Call("addBlock", utils.NewPBlock(block))
+ ui.win.Root().Call("addBlock", ethpub.NewPBlock(block))
}
// Simple go routine function that updates the list of peers in the GUI
@@ -157,13 +157,13 @@ func (ui *Gui) update() {
if txMsg.Type == ethchain.TxPre {
if bytes.Compare(tx.Sender(), ui.addr) == 0 && addrState.Nonce <= tx.Nonce {
- ui.win.Root().Call("addTx", utils.NewPTx(tx))
+ ui.win.Root().Call("addTx", ethpub.NewPTx(tx))
ui.txDb.Put(tx.Hash(), tx.RlpEncode())
addrState.Nonce += 1
unconfirmedFunds.Sub(unconfirmedFunds, tx.Value)
} else if bytes.Compare(tx.Recipient, ui.addr) == 0 {
- ui.win.Root().Call("addTx", utils.NewPTx(tx))
+ ui.win.Root().Call("addTx", ethpub.NewPTx(tx))
ui.txDb.Put(tx.Hash(), tx.RlpEncode())
unconfirmedFunds.Add(unconfirmedFunds, tx.Value)