aboutsummaryrefslogtreecommitdiffstats
path: root/ethchain
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-04-30 23:43:48 +0800
committerobscuren <geffobscura@gmail.com>2014-04-30 23:43:48 +0800
commitd2ab322267e489f47b4b908d060411eb0554a029 (patch)
tree28a37fea6fa970ddb146c4ab309c24595e3d51bd /ethchain
parentc3293641e7b49c7e2d85d2bd69b37bc74cb5b00d (diff)
downloadgo-tangerine-d2ab322267e489f47b4b908d060411eb0554a029.tar
go-tangerine-d2ab322267e489f47b4b908d060411eb0554a029.tar.gz
go-tangerine-d2ab322267e489f47b4b908d060411eb0554a029.tar.bz2
go-tangerine-d2ab322267e489f47b4b908d060411eb0554a029.tar.lz
go-tangerine-d2ab322267e489f47b4b908d060411eb0554a029.tar.xz
go-tangerine-d2ab322267e489f47b4b908d060411eb0554a029.tar.zst
go-tangerine-d2ab322267e489f47b4b908d060411eb0554a029.zip
Removed debugging log
Diffstat (limited to 'ethchain')
-rw-r--r--ethchain/transaction_pool.go18
1 files changed, 10 insertions, 8 deletions
diff --git a/ethchain/transaction_pool.go b/ethchain/transaction_pool.go
index fc807c580..8fbe676f5 100644
--- a/ethchain/transaction_pool.go
+++ b/ethchain/transaction_pool.go
@@ -91,14 +91,16 @@ func (pool *TxPool) addTransaction(tx *Transaction) {
// Process transaction validates the Tx and processes funds from the
// sender to the recipient.
func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block, toContract bool) (err error) {
- defer func() {
- if r := recover(); r != nil {
- log.Println(r)
- err = fmt.Errorf("%v", r)
- }
- }()
+ /*
+ defer func() {
+ if r := recover(); r != nil {
+ log.Println(r)
+ err = fmt.Errorf("%v", r)
+ }
+ }()
+ */
// Get the sender
- sender := block.state.GetStateObject(tx.Sender())
+ sender := block.state.GetAccount(tx.Sender())
if sender.Nonce != tx.Nonce {
return fmt.Errorf("[TXPL] Invalid account nonce, state nonce is %d transaction nonce is %d instead", sender.Nonce, tx.Nonce)
@@ -112,7 +114,7 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block, toContract
}
// Get the receiver
- receiver := block.state.GetStateObject(tx.Recipient)
+ receiver := block.state.GetAccount(tx.Recipient)
sender.Nonce += 1
// Send Tx to self