Import exceptions directly

get rid of wildcard import and indirection

Author: konradkonrad

ethereum/chain.py

@@ -9,6 +9,7 @@
 from rlp.utils import encode_hex
 from ethereum import blocks
 from ethereum import processblock
+from ethereum.exceptions import VerificationFailed, InvalidTransaction
 from ethereum.slogging import get_logger
 from ethereum.config import Env
 import sys
@@ -301,7 +302,7 @@ def add_block(self, block, forward_pending_transactions=True):
         if block.has_parent():
             try:
                 processblock.verify(block, block.get_parent())
-            except processblock.VerificationFailed as e:
+            except VerificationFailed as e:
                 _log.critical('VERIFICATION FAILED', error=e)
                 f = os.path.join(utils.data_dir, 'badblock.log')
                 open(f, 'w').write(to_string(block.hex_serialize()))
@@ -351,7 +352,7 @@ def add_transaction(self, transaction):
         head_candidate.state_root = self.pre_finalize_state_root
         try:
             success, output = processblock.apply_transaction(head_candidate, transaction)
-        except processblock.InvalidTransaction as e:
+        except InvalidTransaction as e:
             # if unsuccessful the prerequisites were not fullfilled
             # and the tx is invalid, state must not have changed
             log.debug('invalid tx', error=e)

ethereum/processblock.py

@@ -7,7 +7,8 @@
 from ethereum import specials
 from ethereum import bloom
 from ethereum import vm as vm
-from ethereum.exceptions import *
+from ethereum.exceptions import InvalidNonce, InsufficientStartGas, UnsignedTransaction, \
+        BlockGasLimitReached, InsufficientBalance
 from ethereum.utils import safe_ord, normalize_address, mk_contract_address
 from ethereum import transactions
 import ethereum.config as config