refactor, add MAX_GAS_LIMIT config

Author: Jan Xie

ethereum/blocks.py

@@ -446,7 +446,7 @@ def __init__(self, header, transaction_list=[], uncles=[], env=None,
             if self.timestamp >= 2 ** 256:
                 raise ValueError("Timestamp waaaaaaaaaaayy too large")
 
-        if self.gas_limit > 2 ** 63 - 1:
+        if self.gas_limit > self.config['MAX_GAS_LIMIT']:
             raise ValueError("Block's gaslimit went too high!")
 
         for uncle in uncles:

ethereum/config.py

@@ -20,6 +20,7 @@
     GENESIS_INITIAL_ALLOC={},
     # Minimum gas limit
     MIN_GAS_LIMIT=5000,
+    MAX_GAS_LIMIT=2 ** 63 - 1,
     # Gas limit adjustment algo:
     # block.gas_limit=block.parent.gas_limit * 1023/1024 +
     #                   (block.gas_used * 6 / 5) / 1024

ethereum/testutils.py

@@ -294,7 +294,7 @@ def run_state_test(params, mode):
         difficulty=parse_int_or_hex(env['currentDifficulty']),
         timestamp=parse_int_or_hex(env['currentTimestamp']),
         # work around https://github.com/ethereum/pyethereum/issues/390 [1]:
-        gas_limit=min(2 ** 63 - 1, parse_int_or_hex(env['currentGasLimit'])))
+        gas_limit=min(db_env.config['MAX_GAS_LIMIT'], parse_int_or_hex(env['currentGasLimit'])))
     blk = blocks.Block(header, env=db_env)
 
     # work around https://github.com/ethereum/pyethereum/issues/390 [2]: