poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed recursive function for loop

This commit is contained in:
Maran 2014-05-27 10:29:39 +02:00
parent 474c85bc9d
commit 47a58b40cd
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ethereal/assets/qml/wallet.qml
View File

@ -643,12 +643,12 @@ ApplicationWindow {
}
function addBlock(block) {
var objtt = JSON.parse(block.transactions);
var txs = JSON.parse(block.transactions);
var amount = 0
if(objtt != null){
amount = objtt.length
if(txs != null){
amount = txs.length
}
blockModel.insert(0, {number: block.number, hash: block.hash, txs: objtt, txAmount: amount, time: block.time, prettyTime: convertToPretty(block.time)})
blockModel.insert(0, {number: block.number, hash: block.hash, txs: txs, txAmount: amount, time: block.time, prettyTime: convertToPretty(block.time)})
}
function addLog(str) {

19
ethereal/ui/gui.go
View File

@ -136,20 +136,13 @@ func (gui *Gui) createWindow(comp qml.Object) *qml.Window {
return gui.win
}
func (gui *Gui) recursiveAdd(sBlk []byte) {
blk := gui.eth.BlockChain().GetBlock(sBlk)
if blk != nil {
//ethutil.Config.Log.Infoln("Adding block", blk)
gui.processBlock(blk)
gui.recursiveAdd(blk.PrevHash)
return
} else {
//ethutil.Config.Log.Debugln("At Genesis, added all blocks to GUI")
}
return
}
func (gui *Gui) setInitialBlockChain() {
gui.recursiveAdd(gui.eth.BlockChain().LastBlockHash)
sBlk := gui.eth.BlockChain().LastBlockHash
blk := gui.eth.BlockChain().GetBlock(sBlk)
for ; blk != nil; blk = gui.eth.BlockChain().GetBlock(sBlk) {
sBlk = blk.PrevHash
gui.processBlock(blk)
}
}
func (gui *Gui) readPreviousTransactions() {