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

Unify `ValidationError`

Author: pipermerriam

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 (