Removed recursive function for loop

pull/94/head
Maran 11 years ago
parent 474c85bc9d
commit 47a58b40cd
  1. 8
      ethereal/assets/qml/wallet.qml
  2. 15
      ethereal/ui/gui.go

@ -643,12 +643,12 @@ ApplicationWindow {
} }
function addBlock(block) { function addBlock(block) {
var objtt = JSON.parse(block.transactions); var txs = JSON.parse(block.transactions);
var amount = 0 var amount = 0
if(objtt != null){ if(txs != null){
amount = objtt.length 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) { function addLog(str) {

@ -136,20 +136,13 @@ func (gui *Gui) createWindow(comp qml.Object) *qml.Window {
return gui.win return gui.win
} }
func (gui *Gui) recursiveAdd(sBlk []byte) { func (gui *Gui) setInitialBlockChain() {
sBlk := gui.eth.BlockChain().LastBlockHash
blk := gui.eth.BlockChain().GetBlock(sBlk) blk := gui.eth.BlockChain().GetBlock(sBlk)
if blk != nil { for ; blk != nil; blk = gui.eth.BlockChain().GetBlock(sBlk) {
//ethutil.Config.Log.Infoln("Adding block", blk) sBlk = blk.PrevHash
gui.processBlock(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)
} }
func (gui *Gui) readPreviousTransactions() { func (gui *Gui) readPreviousTransactions() {

Loading…
Cancel
Save