aboutsummaryrefslogtreecommitdiffstats
path: root/ethchain
diff options
context:
space:
mode:
Diffstat (limited to 'ethchain')
-rw-r--r--ethchain/state_object.go1
-rw-r--r--ethchain/transaction_pool.go14
2 files changed, 6 insertions, 9 deletions
diff --git a/ethchain/state_object.go b/ethchain/state_object.go
index 8e921795d..4ec91d2e0 100644
--- a/ethchain/state_object.go
+++ b/ethchain/state_object.go
@@ -80,7 +80,6 @@ func (c *StateObject) SetAddr(addr []byte, value interface{}) {
func (c *StateObject) SetMem(num *big.Int, val *ethutil.Value) {
addr := ethutil.BigToBytes(num, 256)
c.SetAddr(addr, val)
- //c.state.trie.Update(string(addr), string(val.Encode()))
}
func (c *StateObject) GetMem(num *big.Int) *ethutil.Value {
diff --git a/ethchain/transaction_pool.go b/ethchain/transaction_pool.go
index 8fbe676f5..72836d6cb 100644
--- a/ethchain/transaction_pool.go
+++ b/ethchain/transaction_pool.go
@@ -91,14 +91,12 @@ 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.GetAccount(tx.Sender())