Skip to content

Commit f9e2e52

Browse files
obscurenobscuren
committed
Merge pull request #100 from ethersphere/feature/ethutil-refactor
ethreact - Feature/ethutil refactor
2 parents 8e51174 + 1e4ae24 commit f9e2e52

File tree

3 files changed

+68
-64
lines changed

3 files changed

+68
-64
lines changed

‎ethereal/ext_app.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"github.com/ethereum/eth-go/ethchain"
66
"github.com/ethereum/eth-go/ethpub"
7+
"github.com/ethereum/eth-go/ethreact"
78
"github.com/ethereum/eth-go/ethutil"
89
"github.com/go-qml/qml"
910
)
@@ -24,8 +25,8 @@ type AppContainer interface {
2425
type ExtApplication struct {
2526
*ethpub.PEthereum
2627

27-
blockChan chan ethutil.React
28-
changeChan chan ethutil.React
28+
blockChan chan ethreact.Event
29+
changeChan chan ethreact.Event
2930
quitChan chan bool
3031
watcherQuitChan chan bool
3132

@@ -37,8 +38,8 @@ type ExtApplication struct {
3738
func NewExtApplication(container AppContainer, lib *UiLib) *ExtApplication {
3839
app := &ExtApplication{
3940
ethpub.NewPEthereum(lib.eth),
40-
make(chan ethutil.React, 1),
41-
make(chan ethutil.React, 1),
41+
make(chan ethreact.Event),
42+
make(chan ethreact.Event),
4243
make(chan bool),
4344
make(chan bool),
4445
container,

‎ethereal/gui.go‎

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/ethereum/eth-go/ethdb"
99
"github.com/ethereum/eth-go/ethlog"
1010
"github.com/ethereum/eth-go/ethpub"
11+
"github.com/ethereum/eth-go/ethreact"
1112
"github.com/ethereum/eth-go/ethutil"
1213
"github.com/ethereum/eth-go/ethwire"
1314
"github.com/ethereum/go-ethereum/utils"
@@ -143,7 +144,7 @@ func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) {
143144
gui.readPreviousTransactions()
144145
gui.setPeerInfo()
145146

146-
go gui.update()
147+
gui.update()
147148

148149
return win, nil
149150
}
@@ -266,20 +267,10 @@ func (gui *Gui) setWalletValue(amount, unconfirmedFunds *big.Int) {
266267
func (gui *Gui) update() {
267268
reactor := gui.eth.Reactor()
268269

269-
blockChan := make(chan ethutil.React, 1)
270-
txChan := make(chan ethutil.React, 1)
271-
objectChan := make(chan ethutil.React, 1)
272-
peerChan := make(chan ethutil.React, 1)
273-
274-
reactor.Subscribe("newBlock", blockChan)
275-
reactor.Subscribe("newTx:pre", txChan)
276-
reactor.Subscribe("newTx:post", txChan)
277-
278-
nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg()
279-
if nameReg != nil {
280-
reactor.Subscribe("object:"+string(nameReg.Address()), objectChan)
281-
}
282-
reactor.Subscribe("peerList", peerChan)
270+
blockChan := make(chan ethreact.Event)
271+
txChan := make(chan ethreact.Event)
272+
objectChan := make(chan ethreact.Event)
273+
peerChan := make(chan ethreact.Event)
283274

284275
ticker := time.NewTicker(5 * time.Second)
285276

@@ -288,54 +279,66 @@ func (gui *Gui) update() {
288279
unconfirmedFunds := new(big.Int)
289280
gui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(state.GetAccount(gui.address()).Amount)))
290281

291-
for {
292-
select {
293-
case b := <-blockChan:
294-
block := b.Resource.(*ethchain.Block)
295-
gui.processBlock(block, false)
296-
if bytes.Compare(block.Coinbase, gui.address()) == 0 {
297-
gui.setWalletValue(gui.eth.StateManager().CurrentState().GetAccount(gui.address()).Amount, nil)
298-
}
282+
go func() {
283+
for {
284+
select {
285+
case b := <-blockChan:
286+
block := b.Resource.(*ethchain.Block)
287+
gui.processBlock(block, false)
288+
if bytes.Compare(block.Coinbase, gui.address()) == 0 {
289+
gui.setWalletValue(gui.eth.StateManager().CurrentState().GetAccount(gui.address()).Amount, nil)
290+
}
299291

300-
case txMsg := <-txChan:
301-
tx := txMsg.Resource.(*ethchain.Transaction)
292+
case txMsg := <-txChan:
293+
tx := txMsg.Resource.(*ethchain.Transaction)
302294

303-
if txMsg.Event == "newTx:pre" {
304-
object := state.GetAccount(gui.address())
295+
if txMsg.Name == "newTx:pre" {
296+
object := state.GetAccount(gui.address())
305297

306-
if bytes.Compare(tx.Sender(), gui.address()) == 0 {
307-
gui.win.Root().Call("addTx", ethpub.NewPTx(tx), "send")
308-
gui.txDb.Put(tx.Hash(), tx.RlpEncode())
298+
if bytes.Compare(tx.Sender(), gui.address()) == 0 {
299+
gui.win.Root().Call("addTx", ethpub.NewPTx(tx), "send")
300+
gui.txDb.Put(tx.Hash(), tx.RlpEncode())
309301

310-
unconfirmedFunds.Sub(unconfirmedFunds, tx.Value)
311-
} else if bytes.Compare(tx.Recipient, gui.address()) == 0 {
312-
gui.win.Root().Call("addTx", ethpub.NewPTx(tx), "recv")
313-
gui.txDb.Put(tx.Hash(), tx.RlpEncode())
302+
unconfirmedFunds.Sub(unconfirmedFunds, tx.Value)
303+
} else if bytes.Compare(tx.Recipient, gui.address()) == 0 {
304+
gui.win.Root().Call("addTx", ethpub.NewPTx(tx), "recv")
305+
gui.txDb.Put(tx.Hash(), tx.RlpEncode())
314306

315-
unconfirmedFunds.Add(unconfirmedFunds, tx.Value)
316-
}
307+
unconfirmedFunds.Add(unconfirmedFunds, tx.Value)
308+
}
317309

318-
gui.setWalletValue(object.Amount, unconfirmedFunds)
319-
} else {
320-
object := state.GetAccount(gui.address())
321-
if bytes.Compare(tx.Sender(), gui.address()) == 0 {
322-
object.SubAmount(tx.Value)
323-
} else if bytes.Compare(tx.Recipient, gui.address()) == 0 {
324-
object.AddAmount(tx.Value)
325-
}
310+
gui.setWalletValue(object.Amount, unconfirmedFunds)
311+
} else {
312+
object := state.GetAccount(gui.address())
313+
if bytes.Compare(tx.Sender(), gui.address()) == 0 {
314+
object.SubAmount(tx.Value)
315+
} else if bytes.Compare(tx.Recipient, gui.address()) == 0 {
316+
object.AddAmount(tx.Value)
317+
}
326318

327-
gui.setWalletValue(object.Amount, nil)
319+
gui.setWalletValue(object.Amount, nil)
328320

329-
state.UpdateStateObject(object)
321+
state.UpdateStateObject(object)
322+
}
323+
case <-objectChan:
324+
gui.loadAddressBook()
325+
case <-peerChan:
326+
gui.setPeerInfo()
327+
case <-ticker.C:
328+
gui.setPeerInfo()
330329
}
331-
case <-objectChan:
332-
gui.loadAddressBook()
333-
case <-peerChan:
334-
gui.setPeerInfo()
335-
case <-ticker.C:
336-
gui.setPeerInfo()
337330
}
331+
}()
332+
reactor.Subscribe("newBlock", blockChan)
333+
reactor.Subscribe("newTx:pre", txChan)
334+
reactor.Subscribe("newTx:post", txChan)
335+
336+
nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg()
337+
if nameReg != nil {
338+
reactor.Subscribe("object:"+string(nameReg.Address()), objectChan)
338339
}
340+
reactor.Subscribe("peerList", peerChan)
341+
339342
}
340343

341344
func (gui *Gui) setPeerInfo() {

‎ethereum/javascript_runtime.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/ethereum/eth-go/ethchain"
77
"github.com/ethereum/eth-go/ethlog"
88
"github.com/ethereum/eth-go/ethpub"
9+
"github.com/ethereum/eth-go/ethreact"
910
"github.com/ethereum/eth-go/ethutil"
1011
"github.com/ethereum/go-ethereum/utils"
1112
"github.com/obscuren/otto"
@@ -22,8 +23,8 @@ type JSRE struct {
2223
vm *otto.Otto
2324
lib *ethpub.PEthereum
2425

25-
blockChan chan ethutil.React
26-
changeChan chan ethutil.React
26+
blockChan chan ethreact.Event
27+
changeChan chan ethreact.Event
2728
quitChan chan bool
2829

2930
objectCb map[string][]otto.Value
@@ -48,8 +49,8 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE {
4849
ethereum,
4950
otto.New(),
5051
ethpub.NewPEthereum(ethereum),
51-
make(chan ethutil.React, 1),
52-
make(chan ethutil.React, 1),
52+
make(chan ethreact.Event),
53+
make(chan ethreact.Event),
5354
make(chan bool),
5455
make(map[string][]otto.Value),
5556
}
@@ -63,6 +64,9 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE {
6364

6465
// We have to make sure that, whoever calls this, calls "Stop"
6566
go re.mainLoop()
67+
// Subscribe to events
68+
reactor := ethereum.Reactor()
69+
reactor.Subscribe("newBlock", re.blockChan)
6670

6771
re.Bind("eth", &JSEthereum{re.lib, re.vm})
6872

@@ -108,10 +112,6 @@ func (self *JSRE) Stop() {
108112
}
109113

110114
func (self *JSRE) mainLoop() {
111-
// Subscribe to events
112-
reactor := self.ethereum.Reactor()
113-
reactor.Subscribe("newBlock", self.blockChan)
114-
115115
out:
116116
for {
117117
select {

0 commit comments

Comments
 (0)