Merge pull request #3525 from fjl/all-gosimple-cleanup

all: clean up lint issues, remove more dead code

14 files changed, 154 insertions, 168 deletions

diff --git a/core/block_validator_test.go b/core/block_validator_test.go
index 054686612..413c3cc8e 100644
--- a/core/block_validator_test.go
+++ b/core/block_validator_test.go
@@ -27,7 +27,6 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/pow/ezp"
 )
 
 func testChainConfig() *params.ChainConfig {
@@ -48,20 +47,19 @@ func proc() (Validator, *BlockChain) {
 }
 
 func TestNumber(t *testing.T) {
-	pow := ezp.New()
 	_, chain := proc()
 
 	statedb, _ := state.New(chain.Genesis().Root(), chain.chainDb)
 	cfg := testChainConfig()
 	header := makeHeader(cfg, chain.Genesis(), statedb)
 	header.Number = big.NewInt(3)
-	err := ValidateHeader(cfg, pow, header, chain.Genesis().Header(), false, false)
+	err := ValidateHeader(cfg, FakePow{}, header, chain.Genesis().Header(), false, false)
 	if err != BlockNumberErr {
 		t.Errorf("expected block number error, got %q", err)
 	}
 
 	header = makeHeader(cfg, chain.Genesis(), statedb)
-	err = ValidateHeader(cfg, pow, header, chain.Genesis().Header(), false, false)
+	err = ValidateHeader(cfg, FakePow{}, header, chain.Genesis().Header(), false, false)
 	if err == BlockNumberErr {
 		t.Errorf("didn't expect block number error")
 	}
diff --git a/core/blockchain.go b/core/blockchain.go
index 2081457a9..c3530b93c 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -46,9 +46,6 @@ import (
 )
 
 var (
-	chainlogger = logger.NewLogger("CHAIN")
-	jsonlogger  = logger.NewJsonLogger()
-
 	blockInsertTimer = metrics.NewTimer("chain/inserts")
 
 	ErrNoGenesis = errors.New("Genesis not found in chain")
@@ -150,7 +147,7 @@ func NewBlockChain(chainDb ethdb.Database, config *params.ChainConfig, pow pow.P
 		return nil, err
 	}
 	// Check the current state of the block hashes and make sure that we do not have any of the bad blocks in our chain
-	for hash, _ := range BadHashes {
+	for hash := range BadHashes {
 		if header := bc.GetHeaderByHash(hash); header != nil {
 			// get the canonical block corresponding to the offending header's number
 			headerByNumber := bc.GetHeaderByNumber(header.Number.Uint64())
@@ -402,10 +399,7 @@ func (bc *BlockChain) ResetWithGenesisBlock(genesis *types.Block) {
 
 // Export writes the active chain to the given writer.
 func (self *BlockChain) Export(w io.Writer) error {
-	if err := self.ExportN(w, uint64(0), self.currentBlock.NumberU64()); err != nil {
-		return err
-	}
-	return nil
+	return self.ExportN(w, uint64(0), self.currentBlock.NumberU64())
 }
 
 // ExportN writes a subset of the active chain to the given writer.
diff --git a/core/blockchain_test.go b/core/blockchain_test.go
index 25733ce08..a5a83ba60 100644
--- a/core/blockchain_test.go
+++ b/core/blockchain_test.go
@@ -1107,7 +1107,7 @@ func TestCanonicalBlockRetrieval(t *testing.T) {
 
 	chain, _ := GenerateChain(params.TestChainConfig, genesis, db, 10, func(i int, gen *BlockGen) {})
 
-	for i, _ := range chain {
+	for i := range chain {
 		go func(block *types.Block) {
 			// try to retrieve a block by its canonical hash and see if the block data can be retrieved.
 			for {
diff --git a/core/dao.go b/core/dao.go
index 1260c310a..a7f544c3d 100644
--- a/core/dao.go
+++ b/core/dao.go
@@ -45,11 +45,11 @@ func ValidateDAOHeaderExtraData(config *params.ChainConfig, header *types.Header
 	}
 	// Depending whether we support or oppose the fork, validate the extra-data contents
 	if config.DAOForkSupport {
-		if bytes.Compare(header.Extra, params.DAOForkBlockExtra) != 0 {
+		if !bytes.Equal(header.Extra, params.DAOForkBlockExtra) {
 			return ValidationError("DAO pro-fork bad block extra-data: 0x%x", header.Extra)
 		}
 	} else {
-		if bytes.Compare(header.Extra, params.DAOForkBlockExtra) == 0 {
+		if bytes.Equal(header.Extra, params.DAOForkBlockExtra) {
 			return ValidationError("DAO no-fork bad block extra-data: 0x%x", header.Extra)
 		}
 	}
diff --git a/core/database_util_test.go b/core/database_util_test.go
index c8fd857ea..d96aa71ba 100644
--- a/core/database_util_test.go
+++ b/core/database_util_test.go
@@ -430,7 +430,7 @@ func TestReceiptStorage(t *testing.T) {
 			rlpHave, _ := rlp.EncodeToBytes(r)
 			rlpWant, _ := rlp.EncodeToBytes(receipt)
 
-			if bytes.Compare(rlpHave, rlpWant) != 0 {
+			if !bytes.Equal(rlpHave, rlpWant) {
 				t.Fatalf("receipt #%d [%x]: receipt mismatch: have %v, want %v", i, receipt.TxHash, r, receipt)
 			}
 		}
@@ -488,7 +488,7 @@ func TestBlockReceiptStorage(t *testing.T) {
 			rlpHave, _ := rlp.EncodeToBytes(rs[i])
 			rlpWant, _ := rlp.EncodeToBytes(receipts[i])
 
-			if bytes.Compare(rlpHave, rlpWant) != 0 {
+			if !bytes.Equal(rlpHave, rlpWant) {
 				t.Fatalf("receipt #%d: receipt mismatch: have %v, want %v", i, rs[i], receipts[i])
 			}
 		}
diff --git a/core/state/iterator.go b/core/state/iterator.go
index 14265b277..a58a15ad3 100644
--- a/core/state/iterator.go
+++ b/core/state/iterator.go
@@ -123,7 +123,7 @@ func (it *NodeIterator) step() error {
 	if !it.dataIt.Next() {
 		it.dataIt = nil
 	}
-	if bytes.Compare(account.CodeHash, emptyCodeHash) != 0 {
+	if !bytes.Equal(account.CodeHash, emptyCodeHash) {
 		it.codeHash = common.BytesToHash(account.CodeHash)
 		it.code, err = it.state.db.Get(account.CodeHash)
 		if err != nil {
diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go
index aa05c5dfe..aa9c5b728 100644
--- a/core/state/iterator_test.go
+++ b/core/state/iterator_test.go
@@ -41,7 +41,7 @@ func TestNodeIteratorCoverage(t *testing.T) {
 		}
 	}
 	// Cross check the hashes and the database itself
-	for hash, _ := range hashes {
+	for hash := range hashes {
 		if _, err := db.Get(hash.Bytes()); err != nil {
 			t.Errorf("failed to retrieve reported node %x: %v", hash, err)
 		}
diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go
index 3f7bc2aa8..d9c232ebb 100644
--- a/core/state/managed_state_test.go
+++ b/core/state/managed_state_test.go
@@ -52,7 +52,7 @@ func TestRemove(t *testing.T) {
 	ms, account := create()
 
 	nn := make([]bool, 10)
-	for i, _ := range nn {
+	for i := range nn {
 		nn[i] = true
 	}
 	account.nonces = append(account.nonces, nn...)
@@ -68,7 +68,7 @@ func TestReuse(t *testing.T) {
 	ms, account := create()
 
 	nn := make([]bool, 10)
-	for i, _ := range nn {
+	for i := range nn {
 		nn[i] = true
 	}
 	account.nonces = append(account.nonces, nn...)
@@ -84,7 +84,7 @@ func TestReuse(t *testing.T) {
 func TestRemoteNonceChange(t *testing.T) {
 	ms, account := create()
 	nn := make([]bool, 10)
-	for i, _ := range nn {
+	for i := range nn {
 		nn[i] = true
 	}
 	account.nonces = append(account.nonces, nn...)
diff --git a/core/state/statedb.go b/core/state/statedb.go
index bbcde9443..75c40b364 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -479,7 +479,7 @@ func (self *StateDB) Copy() *StateDB {
 		logSize:           self.logSize,
 	}
 	// Copy the dirty states and logs
-	for addr, _ := range self.stateObjectsDirty {
+	for addr := range self.stateObjectsDirty {
 		state.stateObjects[addr] = self.stateObjects[addr].deepCopy(state, state.MarkStateObjectDirty)
 		state.stateObjectsDirty[addr] = struct{}{}
 	}
@@ -530,7 +530,7 @@ func (self *StateDB) GetRefund() *big.Int {
 // It is called in between transactions to get the root hash that
 // goes into transaction receipts.
 func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
-	for addr, _ := range s.stateObjectsDirty {
+	for addr := range s.stateObjectsDirty {
 		stateObject := s.stateObjects[addr]
 		if stateObject.suicided || (deleteEmptyObjects && stateObject.empty()) {
 			s.deleteStateObject(stateObject)
@@ -553,7 +553,7 @@ func (s *StateDB) DeleteSuicides() {
 	// Reset refund so that any used-gas calculations can use this method.
 	s.clearJournalAndRefund()
 
-	for addr, _ := range s.stateObjectsDirty {
+	for addr := range s.stateObjectsDirty {
 		stateObject := s.stateObjects[addr]
 
 		// If the object has been removed by a suicide
diff --git a/core/state/sync_test.go b/core/state/sync_test.go
index 2a30c86f4..43d146e3a 100644
--- a/core/state/sync_test.go
+++ b/core/state/sync_test.go
@@ -84,7 +84,7 @@ func checkStateAccounts(t *testing.T, db ethdb.Database, root common.Hash, accou
 		if nonce := state.GetNonce(acc.address); nonce != acc.nonce {
 			t.Errorf("account %d: nonce mismatch: have %v, want %v", i, nonce, acc.nonce)
 		}
-		if code := state.GetCode(acc.address); bytes.Compare(code, acc.code) != 0 {
+		if code := state.GetCode(acc.address); !bytes.Equal(code, acc.code) {
 			t.Errorf("account %d: code mismatch: have %x, want %x", i, code, acc.code)
 		}
 	}
@@ -198,7 +198,7 @@ func testIterativeRandomStateSync(t *testing.T, batch int) {
 	for len(queue) > 0 {
 		// Fetch all the queued nodes in a random order
 		results := make([]trie.SyncResult, 0, len(queue))
-		for hash, _ := range queue {
+		for hash := range queue {
 			data, err := srcDb.Get(hash.Bytes())
 			if err != nil {
 				t.Fatalf("failed to retrieve node data for %x: %v", hash, err)
@@ -235,7 +235,7 @@ func TestIterativeRandomDelayedStateSync(t *testing.T) {
 	for len(queue) > 0 {
 		// Sync only half of the scheduled nodes, even those in random order
 		results := make([]trie.SyncResult, 0, len(queue)/2+1)
-		for hash, _ := range queue {
+		for hash := range queue {
 			delete(queue, hash)
 
 			data, err := srcDb.Get(hash.Bytes())
@@ -294,7 +294,7 @@ func TestIncompleteStateSync(t *testing.T) {
 			// Skim through the accounts and make sure the root hash is not a code node
 			codeHash := false
 			for _, acc := range srcAccounts {
-				if bytes.Compare(root.Bytes(), crypto.Sha3(acc.code)) == 0 {
+				if root == crypto.Keccak256Hash(acc.code) {
 					codeHash = true
 					break
 				}
diff --git a/core/tx_list.go b/core/tx_list.go
index c3ddf3148..95831c83b 100644
--- a/core/tx_list.go
+++ b/core/tx_list.go
@@ -110,7 +110,7 @@ func (m *txSortedMap) Filter(filter func(*types.Transaction) bool) types.Transac
 	// If transactions were removed, the heap and cache are ruined
 	if len(removed) > 0 {
 		*m.index = make([]uint64, 0, len(m.items))
-		for nonce, _ := range m.items {
+		for nonce := range m.items {
 			*m.index = append(*m.index, nonce)
 		}
 		heap.Init(m.index)
diff --git a/core/tx_pool.go b/core/tx_pool.go
index c5421fa02..2e1e5c63e 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -609,7 +609,7 @@ func (pool *TxPool) promoteExecutables(state *state.StateDB) {
 	if queued > maxQueuedInTotal {
 		// Sort all accounts with queued transactions by heartbeat
 		addresses := make(addresssByHeartbeat, 0, len(pool.queue))
-		for addr, _ := range pool.queue {
+		for addr := range pool.queue {
 			addresses = append(addresses, addressByHeartbeat{addr, pool.beats[addr]})
 		}
 		sort.Sort(addresses)
diff --git a/core/types/bloom9.go b/core/types/bloom9.go
index bcca59907..32aa47a41 100644
--- a/core/types/bloom9.go
+++ b/core/types/bloom9.go
@@ -97,14 +97,8 @@ func CreateBloom(receipts Receipts) Bloom {
 func LogsBloom(logs []*Log) *big.Int {
 	bin := new(big.Int)
 	for _, log := range logs {
-		data := make([]common.Hash, len(log.Topics))
 		bin.Or(bin, bloom9(log.Address.Bytes()))
-
-		for i, topic := range log.Topics {
-			data[i] = topic
-		}
-
-		for _, b := range data {
+		for _, b := range log.Topics {
 			bin.Or(bin, bloom9(b[:]))
 		}
 	}
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
index eb85ae6af..f4ce81883 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -52,283 +52,283 @@ var defaultJumpTable = NewJumpTable()
 
 func NewJumpTable() [256]operation {
 	return [256]operation{
-		ADD: operation{
+		ADD: {
 			execute:       opAdd,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		SUB: operation{
+		SUB: {
 			execute:       opSub,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		MUL: operation{
+		MUL: {
 			execute:       opMul,
 			gasCost:       constGasFunc(GasFastStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		DIV: operation{
+		DIV: {
 			execute:       opDiv,
 			gasCost:       constGasFunc(GasFastStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		SDIV: operation{
+		SDIV: {
 			execute:       opSdiv,
 			gasCost:       constGasFunc(GasFastStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		MOD: operation{
+		MOD: {
 			execute:       opMod,
 			gasCost:       constGasFunc(GasFastStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		SMOD: operation{
+		SMOD: {
 			execute:       opSmod,
 			gasCost:       constGasFunc(GasFastStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		EXP: operation{
+		EXP: {
 			execute:       opExp,
 			gasCost:       gasExp,
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		SIGNEXTEND: operation{
+		SIGNEXTEND: {
 			execute:       opSignExtend,
 			gasCost:       constGasFunc(GasFastStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		NOT: operation{
+		NOT: {
 			execute:       opNot,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(1, 1),
 			valid:         true,
 		},
-		LT: operation{
+		LT: {
 			execute:       opLt,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		GT: operation{
+		GT: {
 			execute:       opGt,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		SLT: operation{
+		SLT: {
 			execute:       opSlt,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		SGT: operation{
+		SGT: {
 			execute:       opSgt,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		EQ: operation{
+		EQ: {
 			execute:       opEq,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		ISZERO: operation{
+		ISZERO: {
 			execute:       opIszero,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(1, 1),
 			valid:         true,
 		},
-		AND: operation{
+		AND: {
 			execute:       opAnd,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		OR: operation{
+		OR: {
 			execute:       opOr,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		XOR: operation{
+		XOR: {
 			execute:       opXor,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		BYTE: operation{
+		BYTE: {
 			execute:       opByte,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		ADDMOD: operation{
+		ADDMOD: {
 			execute:       opAddmod,
 			gasCost:       constGasFunc(GasMidStep),
 			validateStack: makeStackFunc(3, 1),
 			valid:         true,
 		},
-		MULMOD: operation{
+		MULMOD: {
 			execute:       opMulmod,
 			gasCost:       constGasFunc(GasMidStep),
 			validateStack: makeStackFunc(3, 1),
 			valid:         true,
 		},
-		SHA3: operation{
+		SHA3: {
 			execute:       opSha3,
 			gasCost:       gasSha3,
 			validateStack: makeStackFunc(2, 1),
 			memorySize:    memorySha3,
 			valid:         true,
 		},
-		ADDRESS: operation{
+		ADDRESS: {
 			execute:       opAddress,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		BALANCE: operation{
+		BALANCE: {
 			execute:       opBalance,
 			gasCost:       gasBalance,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		ORIGIN: operation{
+		ORIGIN: {
 			execute:       opOrigin,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		CALLER: operation{
+		CALLER: {
 			execute:       opCaller,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		CALLVALUE: operation{
+		CALLVALUE: {
 			execute:       opCallValue,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		CALLDATALOAD: operation{
+		CALLDATALOAD: {
 			execute:       opCalldataLoad,
 			gasCost:       constGasFunc(GasFastestStep),
 			validateStack: makeStackFunc(1, 1),
 			valid:         true,
 		},
-		CALLDATASIZE: operation{
+		CALLDATASIZE: {
 			execute:       opCalldataSize,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		CALLDATACOPY: operation{
+		CALLDATACOPY: {
 			execute:       opCalldataCopy,
 			gasCost:       gasCalldataCopy,
 			validateStack: makeStackFunc(3, 1),
 			memorySize:    memoryCalldataCopy,
 			valid:         true,
 		},
-		CODESIZE: operation{
+		CODESIZE: {
 			execute:       opCodeSize,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		EXTCODESIZE: operation{
+		EXTCODESIZE: {
 			execute:       opExtCodeSize,
 			gasCost:       gasExtCodeSize,
 			validateStack: makeStackFunc(1, 1),
 			valid:         true,
 		},
-		CODECOPY: operation{
+		CODECOPY: {
 			execute:       opCodeCopy,
 			gasCost:       gasCodeCopy,
 			validateStack: makeStackFunc(3, 0),
 			memorySize:    memoryCodeCopy,
 			valid:         true,
 		},
-		EXTCODECOPY: operation{
+		EXTCODECOPY: {
 			execute:       opExtCodeCopy,
 			gasCost:       gasExtCodeCopy,
 			validateStack: makeStackFunc(4, 0),
 			memorySize:    memoryExtCodeCopy,
 			valid:         true,
 		},
-		GASPRICE: operation{
+		GASPRICE: {
 			execute:       opGasprice,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		BLOCKHASH: operation{
+		BLOCKHASH: {
 			execute:       opBlockhash,
 			gasCost:       constGasFunc(GasExtStep),
 			validateStack: makeStackFunc(1, 1),
 			valid:         true,
 		},
-		COINBASE: operation{
+		COINBASE: {
 			execute:       opCoinbase,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		TIMESTAMP: operation{
+		TIMESTAMP: {
 			execute:       opTimestamp,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		NUMBER: operation{
+		NUMBER: {
 			execute:       opNumber,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		DIFFICULTY: operation{
+		DIFFICULTY: {
 			execute:       opDifficulty,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		GASLIMIT: operation{
+		GASLIMIT: {
 			execute:       opGasLimit,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		POP: operation{
+		POP: {
 			execute:       opPop,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(1, 0),
 			valid:         true,
 		},
-		MLOAD: operation{
+		MLOAD: {
 			execute:       opMload,
 			gasCost:       gasMLoad,
 			validateStack: makeStackFunc(1, 1),
 			memorySize:    memoryMLoad,
 			valid:         true,
 		},
-		MSTORE: operation{
+		MSTORE: {
 			execute:       opMstore,
 			gasCost:       gasMStore,
 			validateStack: makeStackFunc(2, 0),
 			memorySize:    memoryMStore,
 			valid:         true,
 		},
-		MSTORE8: operation{
+		MSTORE8: {
 			execute:       opMstore8,
 			gasCost:       gasMStore8,
 			memorySize:    memoryMStore8,
@@ -336,71 +336,71 @@ func NewJumpTable() [256]operation {
 
 			valid: true,
 		},
-		SLOAD: operation{
+		SLOAD: {
 			execute:       opSload,
 			gasCost:       gasSLoad,
 			validateStack: makeStackFunc(1, 1),
 			valid:         true,
 		},
-		SSTORE: operation{
+		SSTORE: {
 			execute:       opSstore,
 			gasCost:       gasSStore,
 			validateStack: makeStackFunc(2, 0),
 			valid:         true,
 		},
-		JUMPDEST: operation{
+		JUMPDEST: {
 			execute:       opJumpdest,
 			gasCost:       constGasFunc(params.JumpdestGas),
 			validateStack: makeStackFunc(0, 0),
 			valid:         true,
 		},
-		PC: operation{
+		PC: {
 			execute:       opPc,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		MSIZE: operation{
+		MSIZE: {
 			execute:       opMsize,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		GAS: operation{
+		GAS: {
 			execute:       opGas,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		CREATE: operation{
+		CREATE: {
 			execute:       opCreate,
 			gasCost:       gasCreate,
 			validateStack: makeStackFunc(3, 1),
 			memorySize:    memoryCreate,
 			valid:         true,
 		},
-		CALL: operation{
+		CALL: {
 			execute:       opCall,
 			gasCost:       gasCall,
 			validateStack: makeStackFunc(7, 1),
 			memorySize:    memoryCall,
 			valid:         true,
 		},
-		CALLCODE: operation{
+		CALLCODE: {
 			execute:       opCallCode,
 			gasCost:       gasCallCode,
 			validateStack: makeStackFunc(7, 1),
 			memorySize:    memoryCall,
 			valid:         true,
 		},
-		DELEGATECALL: operation{
+		DELEGATECALL: {
 			execute:       opDelegateCall,
 			gasCost:       gasDelegateCall,
 			validateStack: makeStackFunc(6, 1),
 			memorySize:    memoryDelegateCall,
 			valid:         true,
 		},
-		RETURN: operation{
+		RETURN: {
 			execute:       opReturn,
 			gasCost:       gasReturn,
 			validateStack: makeStackFunc(2, 0),
@@ -408,448 +408,448 @@ func NewJumpTable() [256]operation {
 			halts:         true,
 			valid:         true,
 		},
-		SUICIDE: operation{
+		SUICIDE: {
 			execute:       opSuicide,
 			gasCost:       gasSuicide,
 			validateStack: makeStackFunc(1, 0),
 			halts:         true,
 			valid:         true,
 		},
-		JUMP: operation{
+		JUMP: {
 			execute:       opJump,
 			gasCost:       constGasFunc(GasMidStep),
 			validateStack: makeStackFunc(1, 0),
 			jumps:         true,
 			valid:         true,
 		},
-		JUMPI: operation{
+		JUMPI: {
 			execute:       opJumpi,
 			gasCost:       constGasFunc(GasSlowStep),
 			validateStack: makeStackFunc(2, 0),
 			jumps:         true,
 			valid:         true,
 		},
-		STOP: operation{
+		STOP: {
 			execute:       opStop,
 			gasCost:       constGasFunc(Zero),
 			validateStack: makeStackFunc(0, 0),
 			halts:         true,
 			valid:         true,
 		},
-		LOG0: operation{
+		LOG0: {
 			execute:       makeLog(0),
 			gasCost:       makeGasLog(0),
 			validateStack: makeStackFunc(2, 0),
 			memorySize:    memoryLog,
 			valid:         true,
 		},
-		LOG1: operation{
+		LOG1: {
 			execute:       makeLog(1),
 			gasCost:       makeGasLog(1),
 			validateStack: makeStackFunc(3, 0),
 			memorySize:    memoryLog,
 			valid:         true,
 		},
-		LOG2: operation{
+		LOG2: {
 			execute:       makeLog(2),
 			gasCost:       makeGasLog(2),
 			validateStack: makeStackFunc(4, 0),
 			memorySize:    memoryLog,
 			valid:         true,
 		},
-		LOG3: operation{
+		LOG3: {
 			execute:       makeLog(3),
 			gasCost:       makeGasLog(3),
 			validateStack: makeStackFunc(5, 0),
 			memorySize:    memoryLog,
 			valid:         true,
 		},
-		LOG4: operation{
+		LOG4: {
 			execute:       makeLog(4),
 			gasCost:       makeGasLog(4),
 			validateStack: makeStackFunc(6, 0),
 			memorySize:    memoryLog,
 			valid:         true,
 		},
-		SWAP1: operation{
+		SWAP1: {
 			execute:       makeSwap(1),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(2, 0),
 			valid:         true,
 		},
-		SWAP2: operation{
+		SWAP2: {
 			execute:       makeSwap(2),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(3, 0),
 			valid:         true,
 		},
-		SWAP3: operation{
+		SWAP3: {
 			execute:       makeSwap(3),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(4, 0),
 			valid:         true,
 		},
-		SWAP4: operation{
+		SWAP4: {
 			execute:       makeSwap(4),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(5, 0),
 			valid:         true,
 		},
-		SWAP5: operation{
+		SWAP5: {
 			execute:       makeSwap(5),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(6, 0),
 			valid:         true,
 		},
-		SWAP6: operation{
+		SWAP6: {
 			execute:       makeSwap(6),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(7, 0),
 			valid:         true,
 		},
-		SWAP7: operation{
+		SWAP7: {
 			execute:       makeSwap(7),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(8, 0),
 			valid:         true,
 		},
-		SWAP8: operation{
+		SWAP8: {
 			execute:       makeSwap(8),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(9, 0),
 			valid:         true,
 		},
-		SWAP9: operation{
+		SWAP9: {
 			execute:       makeSwap(9),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(10, 0),
 			valid:         true,
 		},
-		SWAP10: operation{
+		SWAP10: {
 			execute:       makeSwap(10),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(11, 0),
 			valid:         true,
 		},
-		SWAP11: operation{
+		SWAP11: {
 			execute:       makeSwap(11),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(12, 0),
 			valid:         true,
 		},
-		SWAP12: operation{
+		SWAP12: {
 			execute:       makeSwap(12),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(13, 0),
 			valid:         true,
 		},
-		SWAP13: operation{
+		SWAP13: {
 			execute:       makeSwap(13),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(14, 0),
 			valid:         true,
 		},
-		SWAP14: operation{
+		SWAP14: {
 			execute:       makeSwap(14),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(15, 0),
 			valid:         true,
 		},
-		SWAP15: operation{
+		SWAP15: {
 			execute:       makeSwap(15),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(16, 0),
 			valid:         true,
 		},
-		SWAP16: operation{
+		SWAP16: {
 			execute:       makeSwap(16),
 			gasCost:       gasSwap,
 			validateStack: makeStackFunc(17, 0),
 			valid:         true,
 		},
-		PUSH1: operation{
+		PUSH1: {
 			execute:       makePush(1, big.NewInt(1)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH2: operation{
+		PUSH2: {
 			execute:       makePush(2, big.NewInt(2)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH3: operation{
+		PUSH3: {
 			execute:       makePush(3, big.NewInt(3)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH4: operation{
+		PUSH4: {
 			execute:       makePush(4, big.NewInt(4)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH5: operation{
+		PUSH5: {
 			execute:       makePush(5, big.NewInt(5)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH6: operation{
+		PUSH6: {
 			execute:       makePush(6, big.NewInt(6)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH7: operation{
+		PUSH7: {
 			execute:       makePush(7, big.NewInt(7)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH8: operation{
+		PUSH8: {
 			execute:       makePush(8, big.NewInt(8)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH9: operation{
+		PUSH9: {
 			execute:       makePush(9, big.NewInt(9)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH10: operation{
+		PUSH10: {
 			execute:       makePush(10, big.NewInt(10)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH11: operation{
+		PUSH11: {
 			execute:       makePush(11, big.NewInt(11)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH12: operation{
+		PUSH12: {
 			execute:       makePush(12, big.NewInt(12)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH13: operation{
+		PUSH13: {
 			execute:       makePush(13, big.NewInt(13)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH14: operation{
+		PUSH14: {
 			execute:       makePush(14, big.NewInt(14)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH15: operation{
+		PUSH15: {
 			execute:       makePush(15, big.NewInt(15)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH16: operation{
+		PUSH16: {
 			execute:       makePush(16, big.NewInt(16)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH17: operation{
+		PUSH17: {
 			execute:       makePush(17, big.NewInt(17)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH18: operation{
+		PUSH18: {
 			execute:       makePush(18, big.NewInt(18)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH19: operation{
+		PUSH19: {
 			execute:       makePush(19, big.NewInt(19)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH20: operation{
+		PUSH20: {
 			execute:       makePush(20, big.NewInt(20)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH21: operation{
+		PUSH21: {
 			execute:       makePush(21, big.NewInt(21)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH22: operation{
+		PUSH22: {
 			execute:       makePush(22, big.NewInt(22)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH23: operation{
+		PUSH23: {
 			execute:       makePush(23, big.NewInt(23)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH24: operation{
+		PUSH24: {
 			execute:       makePush(24, big.NewInt(24)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH25: operation{
+		PUSH25: {
 			execute:       makePush(25, big.NewInt(25)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH26: operation{
+		PUSH26: {
 			execute:       makePush(26, big.NewInt(26)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH27: operation{
+		PUSH27: {
 			execute:       makePush(27, big.NewInt(27)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH28: operation{
+		PUSH28: {
 			execute:       makePush(28, big.NewInt(28)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH29: operation{
+		PUSH29: {
 			execute:       makePush(29, big.NewInt(29)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH30: operation{
+		PUSH30: {
 			execute:       makePush(30, big.NewInt(30)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH31: operation{
+		PUSH31: {
 			execute:       makePush(31, big.NewInt(31)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		PUSH32: operation{
+		PUSH32: {
 			execute:       makePush(32, big.NewInt(32)),
 			gasCost:       gasPush,
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		DUP1: operation{
+		DUP1: {
 			execute:       makeDup(1),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(1, 1),
 			valid:         true,
 		},
-		DUP2: operation{
+		DUP2: {
 			execute:       makeDup(2),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(2, 1),
 			valid:         true,
 		},
-		DUP3: operation{
+		DUP3: {
 			execute:       makeDup(3),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(3, 1),
 			valid:         true,
 		},
-		DUP4: operation{
+		DUP4: {
 			execute:       makeDup(4),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(4, 1),
 			valid:         true,
 		},
-		DUP5: operation{
+		DUP5: {
 			execute:       makeDup(5),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(5, 1),
 			valid:         true,
 		},
-		DUP6: operation{
+		DUP6: {
 			execute:       makeDup(6),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(6, 1),
 			valid:         true,
 		},
-		DUP7: operation{
+		DUP7: {
 			execute:       makeDup(7),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(7, 1),
 			valid:         true,
 		},
-		DUP8: operation{
+		DUP8: {
 			execute:       makeDup(8),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(8, 1),
 			valid:         true,
 		},
-		DUP9: operation{
+		DUP9: {
 			execute:       makeDup(9),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(9, 1),
 			valid:         true,
 		},
-		DUP10: operation{
+		DUP10: {
 			execute:       makeDup(10),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(10, 1),
 			valid:         true,
 		},
-		DUP11: operation{
+		DUP11: {
 			execute:       makeDup(11),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(11, 1),
 			valid:         true,
 		},
-		DUP12: operation{
+		DUP12: {
 			execute:       makeDup(12),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(12, 1),
 			valid:         true,
 		},
-		DUP13: operation{
+		DUP13: {
 			execute:       makeDup(13),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(13, 1),
 			valid:         true,
 		},
-		DUP14: operation{
+		DUP14: {
 			execute:       makeDup(14),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(14, 1),
 			valid:         true,
 		},
-		DUP15: operation{
+		DUP15: {
 			execute:       makeDup(15),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(15, 1),
 			valid:         true,
 		},
-		DUP16: operation{
+		DUP16: {
 			execute:       makeDup(16),
 			gasCost:       gasDup,
 			validateStack: makeStackFunc(16, 1),