Merge pull request #1194 from glaksmono/eth-py-evm-1125

Unify `ValidationError`

eth/chains/base.py

@@ -36,6 +36,7 @@
 from eth_utils import (
     to_tuple,
     to_set,
+    ValidationError,
 )
 
 from eth.db.backends.base import BaseDB
@@ -56,7 +57,6 @@
 from eth.exceptions import (
     HeaderNotFound,
     TransactionNotFound,
-    ValidationError,
     VMNotFound,
 )
 from eth.utils.spoof import (

eth/chains/mainnet/__init__.py

@@ -3,6 +3,7 @@
 from eth_utils import (
     decode_hex,
     encode_hex,
+    ValidationError,
 )
 
 from .constants import (
@@ -17,7 +18,6 @@
 from eth.chains.base import (
     Chain,
 )
-from eth.exceptions import ValidationError
 from eth.rlp.headers import BlockHeader
 from eth.vm.base import BaseVM  # noqa: F401
 from eth.vm.forks import (

eth/chains/shard.py

@@ -4,16 +4,13 @@
 from eth_typing import (
     Hash32,
 )
-
+from eth_utils import (
+    ValidationError,
+)
 from eth.db.shard import (
     Availability,
     ShardDB,
 )
-
-from eth.exceptions import (
-    ValidationError,
-)
-
 from eth.rlp.headers import (
     CollationHeader,
 )

eth/chains/tester/__init__.py

@@ -16,11 +16,11 @@
 
 from eth_utils import (
     to_tuple,
+    ValidationError,
 )
 
 from eth.chains.base import Chain
 from eth.chains.mainnet import MainnetChain
-from eth.exceptions import ValidationError
 from eth.rlp.headers import (
     BlockHeader
 )

eth/consensus/pow.py

@@ -13,15 +13,15 @@
 from eth_typing import (
     Hash32
 )
+from eth_utils import (
+    ValidationError,
+)
 
 from eth_hash.auto import keccak
 
 from eth.utils.hexadecimal import (
     encode_hex,
 )
-from eth.exceptions import (
-    ValidationError,
-)
 from eth.utils.numeric import (
     big_endian_to_int,
 )

eth/db/chain.py

@@ -27,6 +27,7 @@
 from eth_utils import (
     to_list,
     to_tuple,
+    ValidationError,
 )
 
 from eth_hash.auto import keccak
@@ -40,7 +41,6 @@
     HeaderNotFound,
     ParentNotFound,
     TransactionNotFound,
-    ValidationError,
 )
 from eth.db.header import BaseHeaderDB, HeaderDB
 from eth.db.backends.base import (

eth/db/journal.py

@@ -7,9 +7,11 @@
     merge,
     last,
 )
+from eth_utils import (
+    ValidationError,
+)
 
 from eth.db.backends.base import BaseDB
-from eth.exceptions import ValidationError
 
 
 class DeletedEntry:

eth/exceptions.py

@@ -74,13 +74,6 @@ class CanonicalCollationNotFound(PyEVMError):
     pass
 
 
-class ValidationError(PyEVMError):
-    """
-    Raised when something does not pass a validation check.
-    """
-    pass
-
-
 class Halt(PyEVMError):
     """
     Raised when an opcode function halts vm execution.

eth/precompiles/ecadd.py

@@ -2,9 +2,13 @@
     optimized_bn128 as bn128,
 )
 
+from eth_utils import (
+    ValidationError,
+)
+
 from eth import constants
+
 from eth.exceptions import (
-    ValidationError,
     VMError,
 )
 from eth.utils.bn128 import (

eth/precompiles/ecmul.py

@@ -2,9 +2,13 @@
     optimized_bn128 as bn128,
 )
 
+from eth_utils import (
+    ValidationError,
+)
+
 from eth import constants
+
 from eth.exceptions import (
-    ValidationError,
     VMError,
 )
 from eth.utils.bn128 import (

eth/precompiles/ecpairing.py

@@ -6,9 +6,13 @@
     optimized_bn128 as bn128,
 )
 
+from eth_utils import (
+    ValidationError,
+)
+
 from eth import constants
+
 from eth.exceptions import (
-    ValidationError,
     VMError,
 )
 from eth.utils.bn128 import (

eth/precompiles/ecrecover.py

@@ -3,10 +3,12 @@
     BadSignature,
 )
 
-from eth import constants
-from eth.exceptions import (
+from eth_utils import (
     ValidationError,
 )
+
+from eth import constants
+
 from eth.validation import (
     validate_lt_secpk1n,
     validate_gte,

eth/rlp/headers.py

@@ -25,6 +25,7 @@
 )
 from eth_utils import (
     to_dict,
+    ValidationError,
 )
 
 from eth_hash.auto import keccak
@@ -37,9 +38,6 @@
     GENESIS_PARENT_HASH,
     BLANK_ROOT_HASH,
 )
-from eth.exceptions import (
-    ValidationError,
-)
 
 from eth.utils.hexadecimal import (
     encode_hex,

eth/rlp/receipts.py

@@ -6,11 +6,12 @@
     CountableList,
     binary,
 )
+from eth_utils import (
+    ValidationError,
+)
 
 from eth_bloom import BloomFilter
 
-from eth.exceptions import ValidationError
-
 from .sedes import (
     int256,
     int32,

eth/rlp/transactions.py

@@ -18,7 +18,7 @@
 
 from eth_hash.auto import keccak
 
-from eth.exceptions import (
+from eth_utils import (
     ValidationError,
 )
 

eth/tools/test_builder/builder_utils.py

@@ -7,8 +7,6 @@
     Mapping,
 )
 
-from eth.db.backends.memory import MemoryDB
-
 from cytoolz import (
     first,
     merge_with,
@@ -18,6 +16,8 @@
     int_to_big_endian,
 )
 
+from eth.db.backends.memory import MemoryDB
+
 from eth.utils.db import (
     apply_state_dict,
 )

eth/tools/test_builder/test_builder.py

@@ -10,14 +10,6 @@
     Dict,
     List,
 )
-
-from eth.db.account import (
-    AccountDB,
-)
-from eth.tools.fixture_tests import (
-    hash_log_entries,
-)
-
 from cytoolz import (
     assoc,
     assoc_in,
@@ -31,6 +23,13 @@
     to_canonical_address,
 )
 
+from eth.db.account import (
+    AccountDB,
+)
+from eth.tools.fixture_tests import (
+    hash_log_entries,
+)
+
 from .normalization import (
     normalize_bytes,
     normalize_call_creates,

eth/utils/blobs.py

@@ -10,6 +10,7 @@
 from eth_utils import (
     apply_to_return_value,
     int_to_big_endian,
+    ValidationError,
 )
 
 from eth.utils.padding import (
@@ -26,10 +27,6 @@
     MAX_BLOB_SIZE,
 )
 
-from eth.exceptions import (
-    ValidationError,
-)
-
 from typing import (
     cast,
 )

eth/utils/bn128.py

@@ -2,7 +2,7 @@
     optimized_bn128 as bn128,
 )
 
-from eth.exceptions import (
+from eth_utils import (
     ValidationError,
 )
 

eth/utils/merkle.py

@@ -26,8 +26,7 @@
 from eth_typing import (
     Hash32,
 )
-
-from eth.exceptions import (
+from eth_utils import (
     ValidationError,
 )
 

eth/utils/rlp.py

@@ -8,10 +8,9 @@
 
 from eth_utils import (
     to_tuple,
+    ValidationError,
 )
 
-from eth.exceptions import ValidationError
-
 
 @to_tuple
 def diff_rlp_object(left, right):

eth/utils/transactions.py

@@ -6,7 +6,7 @@
     BadSignature,
 )
 
-from eth.exceptions import (
+from eth_utils import (
     ValidationError,
 )
 from eth.utils.numeric import (

eth/validation.py

@@ -1,5 +1,9 @@
 import functools
 
+from eth_utils import (
+    ValidationError,
+)
+
 from cytoolz.dicttoolz import (
     valfilter,
 )
@@ -19,9 +23,6 @@
     SECPK1_N,
     UINT_256_MAX,
 )
-from eth.exceptions import (
-    ValidationError,
-)
 
 
 def validate_is_bytes(value, title="Value"):

eth/vm/base.py

@@ -19,6 +19,7 @@
 
 from eth_utils import (
     to_tuple,
+    ValidationError,
 )
 
 from eth_hash.auto import keccak
@@ -34,7 +35,6 @@
 from eth.db.chain import BaseChainDB  # noqa: F401
 from eth.exceptions import (
     HeaderNotFound,
-    ValidationError,
 )
 from eth.rlp.blocks import (  # noqa: F401
     BaseBlock,

eth/vm/forks/frontier/validation.py

@@ -1,4 +1,4 @@
-from eth.exceptions import (
+from eth_utils import (
     ValidationError,
 )
 

eth/vm/forks/homestead/validation.py

@@ -1,9 +1,10 @@
+from eth_utils import (
+    ValidationError,
+)
+
 from eth.constants import (
     SECPK1_N,
 )
-from eth.exceptions import (
-    ValidationError,
-)
 
 from eth.vm.forks.frontier.validation import (
     validate_frontier_transaction,

eth/vm/forks/spurious_dragon/utils.py

@@ -1,6 +1,7 @@
 from eth_utils import to_set
 
 from eth import constants
+
 from eth.utils.address import (
     force_bytes_to_address,
 )