Merge branch 'develop' of github.com:ethereum/pyethereum into develop

Author: vbuterin

.coveragerc

@@ -8,6 +8,8 @@ omit =
   */fixtures/*
   */tests/*
   */utils/*
+  */ethereum/fastvm.py
+  */ethereum/spv.py
 
 [report]
 exclude_lines =

.travis.yml

@@ -4,7 +4,12 @@ env:
   - TOX_ENV=py27
 
 install:
-  - pip install tox
+  - pip install -r requirements.txt
+  - pip install -r dev_requirements.txt
 
 script:
-  - tox -e $TOX_ENV
+- coverage run --source ethereum setup.py test
+#- tox -e $TOX_ENV
+
+after_success:
+- coveralls

Makefile

@@ -8,6 +8,7 @@ help:
 	@echo "lint - check style with flake8"
 	@echo "test - run tests with the default Python"
 	@echo "testnovm - run tests except test_vm"
+	@echo "testquick - run tests except test_vm, test_state"
 	@echo "testtb - run tests with tracebacks"
 	@echo "test-all - run tests on every Python version with tox"
 	@echo "coverage - check code coverage quickly with the default Python"
@@ -42,6 +43,9 @@ test:
 testnovm:
 	py.test --tb=no ethereum/tests/ --ignore=ethereum/tests/test_vm.py
 
+testquick:
+	py.test --tb=no ethereum/tests/ --ignore=ethereum/tests/test_vm.py --ignore=ethereum/tests/test_state.py
+
 testtb:
 	python setup.py test
 

dev_requirements.txt

@@ -0,0 +1,5 @@
+tox
+coveralls
+pytest
+pytest-timeout
+https://github.com/ethereum/serpent/tarball/develop

ethereum/blocks.py

@@ -347,10 +347,9 @@ def check_pow(self, db=None, nonce=None):
 
         # Grab current cache
         current_cache_size = get_cache_size(self.number)
-        cache = get_cache_memoized(db, seed, current_cache_size)
+        cache = get_cache_memoized(seed, current_cache_size)
         current_full_size = get_full_size(self.number)
-        mining_output = hashimoto_light(current_full_size, cache,
-                                        header_hash, nonce)
+        mining_output = hashimoto_light(current_full_size, cache, header_hash, nonce)
         diff = self.difficulty
         if mining_output['mix digest'] != self.mixhash:
             return False
@@ -1242,30 +1241,9 @@ def __repr__(self):
     def __structlog__(self):
         return encode_hex(self.hash)
 
-
-cache_cache = {}
-
-
-def peck_cache(db, seedhash, size):
-    key = b'cache:' + seedhash + b',' + str_to_bytes(str(size))
-    if key not in db:
-        cache = mkcache(size, seedhash)
-        cache_cache[key] = cache
-        cache_serialized = serialize_cache(cache)
-        cache_hash = utils.sha3(cache_serialized)
-        db.put(cache_hash, cache_serialized)
-        db.put(key, cache_hash)
-    elif key not in cache_cache:
-        o = db.get(db.get(key))
-        cache_cache[key] = o
-        return deserialize_cache(o)
-
-
-def get_cache_memoized(db, seedhash, size):
-    key = b'cache:' + seedhash + b',' + str_to_bytes(str(size))
-    peck_cache(db, seedhash, size)
-    return cache_cache[key]
-
+@lru_cache(5)
+def get_cache_memoized(seedhash, size):
+    return mkcache(size, seedhash)
 
 # Gas limit adjustment algo
 def calc_gaslimit(parent):

ethereum/common.py

@@ -1,4 +1,3 @@
-from ethereum.compress import compress, decompress
 from ethereum import utils
 from ethereum.slogging import get_logger
 from rlp.utils import str_to_bytes
@@ -14,10 +13,10 @@ def __init__(self):
         self.db = {}
 
     def get(self, key):
-        return decompress(self.db[key])
+        return self.db[key]
 
     def put(self, key, value):
-        self.db[key] = compress(value)
+        self.db[key] = value
 
     def delete(self, key):
         del self.db[key]

ethereum/config.py

@@ -58,7 +58,7 @@ def mine(self, steps=1000):
         """
         #b = self.block
         sz = blocks.get_cache_size(self.block.number)
-        cache = blocks.get_cache_memoized(self.block.db, self.block.header.seed, sz)
+        cache = blocks.get_cache_memoized(self.block.header.seed, sz)
         fsz = blocks.get_full_size(self.block.number)
         nonce = utils.big_endian_to_int(self.block.nonce)
         TT64M1 = 2**64 - 1

ethereum/db.py

@@ -243,7 +243,7 @@ def _apply_msg(ext, msg, code):
 
 
 def create_contract(ext, msg):
-    print('CREATING WITH GAS', msg.gas)
+    #print('CREATING WITH GAS', msg.gas)
     sender = decode_hex(msg.sender) if len(msg.sender) == 40 else msg.sender
     if ext.tx_origin != msg.sender:
         ext._block.increment_nonce(msg.sender)
@@ -270,7 +270,7 @@ def create_contract(ext, msg):
             gas -= gcost
         else:
             dat = []
-            print('CONTRACT CREATION OOG', 'have', gas, 'want', gcost)
+            #print('CONTRACT CREATION OOG', 'have', gas, 'want', gcost)
             log_msg.debug('CONTRACT CREATION OOG', have=gas, want=gcost)
         ext._block.set_code(msg.to, b''.join(map(ascii_chr, dat)))
         return 1, gas, msg.to