From ce862ee7589a0780cebc8a7bb1cf6a75193d55a0 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sat, 21 Mar 2015 14:51:45 +0100
Subject: [PATCH] Removed some comments
---
miner/worker.go | 3 ++-
xeth/xeth.go | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/miner/worker.go b/miner/worker.go
index ae6782aca..4a52a40fe 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -211,7 +211,8 @@ gasLimit:
from, _ := tx.From()
self.chain.TxState().RemoveNonce(from, tx.Nonce())
remove = append(remove, tx)
- minerlogger.Infof("TX (%x) failed. Transaction will be removed\n", tx.Hash().Bytes()[:4])
+ minerlogger.Infof("TX (%x) failed, will be removed: %v\n", tx.Hash().Bytes()[:4], err)
+ minerlogger.Infoln(tx)
case state.IsGasLimitErr(err):
minerlogger.Infof("Gas limit reached for block. %d TXs included in this block\n", i)
// Break on gas limit
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 2c324be26..9f183aa61 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -611,7 +611,7 @@ func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeSt
}
state := self.chainManager.TxState()
- nonce := state.NewNonce(from) //state.GetNonce(from)
+ nonce := state.NewNonce(from)
tx.SetNonce(nonce)
if err := self.sign(tx, from, false); err != nil {
@@ -620,7 +620,6 @@ func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeSt
if err := self.eth.TxPool().Add(tx); err != nil {
return "", err
}
- //state.IncrementNonce(from)
if contractCreation {
addr := core.AddressFromMessage(tx)
--
GitLab