Merge branch 'master' into piper/remove-multi-trie-support

ethereum · Apr 30, 2018 · 48d09d8 · 48d09d8
2 parents 457ac14 + 2edd73a
commit 48d09d8
Show file tree

Hide file tree

Showing 30 changed files with 48 additions and 65 deletions.
diff --git a/evm/consensus/pow.py b/evm/consensus/pow.py
@@ -10,9 +10,8 @@
 from eth_typing import (
     Hash32
 )
-from eth_utils import (
-    keccak,
-)
+
+from eth_hash.auto import keccak
 
 from evm.utils.hexadecimal import (
     encode_hex,

diff --git a/evm/db/account.py b/evm/db/account.py
@@ -12,9 +12,7 @@
     HexaryTrie,
 )
 
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm.constants import (
     BLANK_ROOT_HASH,

diff --git a/evm/db/chain.py b/evm/db/chain.py
@@ -21,11 +21,12 @@
 )
 
 from eth_utils import (
-    keccak,
     to_list,
     to_tuple,
 )
 
+from eth_hash.auto import keccak
+
 from evm.constants import (
     GENESIS_PARENT_HASH,
 )

diff --git a/evm/db/hash_trie.py b/evm/db/hash_trie.py
@@ -1,6 +1,4 @@
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 
 class HashTrie(object):

diff --git a/evm/rlp/headers.py b/evm/rlp/headers.py
@@ -16,10 +16,11 @@
     Hash32
 )
 from eth_utils import (
-    keccak,
     to_dict,
 )
 
+from eth_hash.auto import keccak
+
 from evm.constants import (
     ZERO_ADDRESS,
     ZERO_HASH32,

diff --git a/evm/rlp/transactions.py b/evm/rlp/transactions.py
@@ -16,9 +16,7 @@
     Address
 )
 
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm.exceptions import (
     ValidationError,

diff --git a/evm/tools/fixture_tests.py b/evm/tools/fixture_tests.py
@@ -20,7 +20,6 @@
     decode_hex,
     is_0x_prefixed,
     to_bytes,
-    keccak,
     to_canonical_address,
     to_normalized_address,
     to_tuple,
@@ -30,6 +29,8 @@
     hexstr_if_str,
 )
 
+from eth_hash.auto import keccak
+
 from evm import MainnetChain
 from evm.constants import (
     CREATE_CONTRACT_ADDRESS,

diff --git a/evm/utils/address.py b/evm/utils/address.py
@@ -1,8 +1,6 @@
 import rlp
 
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 
 def force_bytes_to_address(value: bytes) -> bytes:

diff --git a/evm/utils/blobs.py b/evm/utils/blobs.py
@@ -12,8 +12,10 @@
 from eth_utils import (
     apply_to_return_value,
     int_to_big_endian,
-    keccak,
 )
+
+from eth_hash.auto import keccak
+
 from evm.utils.padding import (
     zpad_right,
 )

diff --git a/evm/vm/base.py b/evm/vm/base.py
@@ -11,10 +11,11 @@
 import rlp
 
 from eth_utils import (
-    keccak,
     to_tuple,
 )
 
+from eth_hash.auto import keccak
+
 from evm.constants import (
     GENESIS_PARENT_HASH,
     MAX_PREV_HEADER_DEPTH,

diff --git a/evm/vm/forks/frontier/blocks.py b/evm/vm/forks/frontier/blocks.py
@@ -11,9 +11,7 @@
     BloomFilter,
 )
 
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm.constants import (
     EMPTY_UNCLE_HASH,

diff --git a/evm/vm/forks/frontier/computation.py b/evm/vm/forks/frontier/computation.py
@@ -1,6 +1,4 @@
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm import constants
 from evm import precompiles

diff --git a/evm/vm/forks/frontier/state.py b/evm/vm/forks/frontier/state.py
@@ -1,9 +1,7 @@
 from __future__ import absolute_import
 from typing import Type  # noqa: F401
 
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm import constants
 from evm.constants import (

diff --git a/evm/vm/forks/homestead/computation.py b/evm/vm/forks/homestead/computation.py
@@ -1,6 +1,4 @@
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm import constants
 from evm.exceptions import (

diff --git a/evm/vm/forks/spurious_dragon/computation.py b/evm/vm/forks/spurious_dragon/computation.py
@@ -1,6 +1,4 @@
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm import constants
 from evm.exceptions import (

diff --git a/evm/vm/logic/sha3.py b/evm/vm/logic/sha3.py
@@ -1,6 +1,4 @@
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm import constants
 from evm.utils.numeric import (

diff --git a/p2p/auth.py b/p2p/auth.py
@@ -15,9 +15,7 @@
     keys,
 )
 
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from p2p import ecies
 from p2p import kademlia

diff --git a/p2p/discovery.py b/p2p/discovery.py
@@ -20,7 +20,6 @@
 import rlp
 from eth_utils import (
     encode_hex,
-    keccak,
     text_if_str,
     to_bytes,
     to_list,
@@ -29,6 +28,8 @@
 from eth_keys import keys
 from eth_keys import datatypes
 
+from eth_hash.auto import keccak
+
 from p2p.cancel_token import CancelToken
 from p2p import kademlia
 from evm.utils.numeric import (

diff --git a/p2p/kademlia.py b/p2p/kademlia.py
@@ -26,14 +26,15 @@
     big_endian_to_int,
     decode_hex,
     encode_hex,
-    keccak,
 )
 
 from eth_keys import (
     datatypes,
     keys,
 )
 
+from eth_hash.auto import keccak
+
 from p2p.cancel_token import CancelToken, wait_with_token
 
 # Workaround for import cycles caused by type annotations:

diff --git a/p2p/peer.py b/p2p/peer.py
@@ -23,14 +23,15 @@
 from eth_utils import (
     decode_hex,
     encode_hex,
-    keccak,
 )
 
 from eth_keys import (
     datatypes,
     keys,
 )
 
+from eth_hash.auto import keccak
+
 from trie import HexaryTrie
 
 from evm.constants import GENESIS_BLOCK_NUMBER

diff --git a/p2p/state.py b/p2p/state.py
@@ -19,9 +19,10 @@
 
 from eth_utils import (
     encode_hex,
-    keccak,
 )
 
+from eth_hash.auto import keccak
+
 from evm.constants import (
     BLANK_ROOT_HASH,
     EMPTY_SHA3,

diff --git a/tests/core/test_blob_utils.py b/tests/core/test_blob_utils.py
@@ -4,6 +4,8 @@
     zip_longest,
 )
 
+from eth_hash.auto import keccak
+
 from evm.utils.blobs import (
     calc_chunk_root,
     calc_merkle_root,
@@ -17,9 +19,6 @@
 
 from evm.utils.padding import zpad_left
 from evm.utils.numeric import int_to_big_endian
-from eth_utils import (
-    keccak,
-)
 
 from evm.constants import (
     CHUNK_SIZE,

diff --git a/tests/database/test_account_db.py b/tests/database/test_account_db.py
@@ -1,8 +1,6 @@
 import pytest
 
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm.exceptions import (
     ValidationError,

diff --git a/tests/database/test_chaindb.py b/tests/database/test_chaindb.py
@@ -7,9 +7,7 @@
 
 import rlp
 
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm.constants import (
     BLANK_ROOT_HASH,

diff --git a/tests/fillers/build_json.py b/tests/fillers/build_json.py
@@ -11,9 +11,7 @@
     get_test_name,
 )
 
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm.utils.hexadecimal import (
     encode_hex,

diff --git a/tests/json-fixtures/test_state.py b/tests/json-fixtures/test_state.py
@@ -9,10 +9,12 @@
 )
 
 from eth_utils import (
-    keccak,
+    to_bytes,
     to_tuple,
 )
 
+from eth_hash.auto import keccak
+
 from evm.db.chain import ChainDB
 from evm.exceptions import (
     ValidationError,
@@ -176,7 +178,7 @@ def get_block_hash_for_testing(self, block_number):
     elif block_number < self.block_number - 256:
         return b''
     else:
-        return keccak(text="{0}".format(block_number))
+        return keccak(to_bytes(text="{0}".format(block_number)))
 
 
 def get_prev_hashes_testing(self, last_block_hash, db):

diff --git a/tests/json-fixtures/test_virtual_machine.py b/tests/json-fixtures/test_virtual_machine.py
@@ -8,10 +8,11 @@
 from evm.db.chain import ChainDB
 
 from eth_utils import (
-    keccak,
     to_bytes,
 )
 
+from eth_hash.auto import keccak
+
 from evm.exceptions import (
     VMError,
 )

diff --git a/tests/p2p/peer_helpers.py b/tests/p2p/peer_helpers.py
@@ -1,9 +1,7 @@
 import asyncio
 import os
 
-from eth_utils import (
-    keccak,
-)
+from eth_hash.auto import keccak
 
 from evm.chains.mainnet import MAINNET_GENESIS_HEADER
 from evm.db.backends.memory import MemoryDB

diff --git a/tests/p2p/test_discovery.py b/tests/p2p/test_discovery.py
@@ -5,10 +5,11 @@
 
 from eth_utils import (
     decode_hex,
-    keccak,
     to_bytes,
 )
 
+from eth_hash.auto import keccak
+
 from eth_keys import keys
 
 from p2p import discovery

diff --git a/tests/p2p/test_lightchain_integration.py b/tests/p2p/test_lightchain_integration.py
@@ -5,9 +5,10 @@
 from eth_utils import (
     decode_hex,
     encode_hex,
-    keccak,
 )
 
+from eth_hash.auto import keccak
+
 from evm.chains.ropsten import ROPSTEN_NETWORK_ID, ROPSTEN_GENESIS_HEADER
 from evm.chains.mainnet import MAINNET_VM_CONFIGURATION
 from evm.db.backends.memory import MemoryDB