merge upstream

2014-06-25 16:58:07 +01:00
parent a02edf7a93 b0dc50c2a0
commit 98f1ee9442
4 changed files with 11 additions and 42 deletions
--- a/ethchain/state_object.go
+++ b/ethchain/state_object.go
@ -91,7 +91,6 @@ func (c *StateObject) SetAddr(addr []byte, value interface{}) {
 func (c *StateObject) SetStorage(num *big.Int, val *ethutil.Value) {
 	addr := ethutil.BigToBytes(num, 256)

-	// FIXME This should be handled in the Trie it self
 	if val.BigInt().Cmp(ethutil.Big0) == 0 {
 		c.state.trie.Delete(string(addr))