Fixed test chain

Author: vbuterin

ethereum/chain.py

@@ -271,32 +271,31 @@ def add_transaction(self, transaction):
         assert self.head_candidate is not None
         _log = log.bind(tx_hash=transaction)
         _log.debug("add transaction")
-        with self.lock:
-            old_state_root = self.head_candidate.state_root
-            # revert finalization
-            self.head_candidate.state_root = self.pre_finalize_state_root
-            try:
-                success, output = processblock.apply_transaction(self.head_candidate, transaction)
-            except processblock.InvalidTransaction as e:
-                # if unsuccessful the prerequisites were not fullfilled
-                # and the tx is invalid, state must not have changed
-                log.debug('invalid tx', tx_hash=transaction, errors=e)
-                success = False
-
-            # finalize
-            self.pre_finalize_state_root = self.head_candidate.state_root
-            self.head_candidate.finalize()
-
-            if not success:
-                log.debug('tx not applied', tx_hash=transaction)
-                assert old_state_root == self.head_candidate.state_root
-                return False
-            else:
-                assert transaction in self.get_transactions()
-                log.debug('transaction applied', tx_hash=transaction,
-                          block_hash=self.head_candidate, result=output)
-                assert old_state_root != self.head_candidate.state_root
-                return True
+        old_state_root = self.head_candidate.state_root
+        # revert finalization
+        self.head_candidate.state_root = self.pre_finalize_state_root
+        try:
+            success, output = processblock.apply_transaction(self.head_candidate, transaction)
+        except processblock.InvalidTransaction as e:
+            # if unsuccessful the prerequisites were not fullfilled
+            # and the tx is invalid, state must not have changed
+            log.debug('invalid tx', tx_hash=transaction, errors=e)
+            success = False
+
+        # finalize
+        self.pre_finalize_state_root = self.head_candidate.state_root
+        self.head_candidate.finalize()
+
+        if not success:
+            log.debug('tx not applied', tx_hash=transaction)
+            assert old_state_root == self.head_candidate.state_root
+            return False
+        else:
+            assert transaction in self.get_transactions()
+            log.debug('transaction applied', tx_hash=transaction,
+                      block_hash=self.head_candidate, result=output)
+            assert old_state_root != self.head_candidate.state_root
+            return True
 
     def get_transactions(self):
         """Get a list of new transactions not yet included in a mined block

ethereum/miner.py

@@ -63,31 +63,17 @@ def mine(self, steps=1000):
         nonce = utils.big_endian_to_int(self.block.nonce)
         TT64M1 = 2**64 - 1
         target = utils.zpad(utils.int_to_big_endian(2**256 // (self.block.difficulty or 1)), 32)
-        near_target = target[1:] + '\x00'
-        dtarget = utils.big_endian_to_int(target)
         found = False
         sys.stderr.write("Starting mining\n")
-        near_misses = 0
-        start_time = time.time()
         for i in range(1, steps + 1):
             self.block.nonce = utils.zpad(utils.int_to_big_endian((nonce + i) & TT64M1), 8)
             o = blocks.hashimoto_light(fsz, cache, self.block.mining_hash,
                                        self.block.nonce)
-            if o["result"] <= near_target:
-                if o["result"] <= target:
-                    sys.stderr.write("Success!\n")
-                    self.block.mixhash = o["mix digest"]
-                    found = True
-                    break
-                else:
-                    r = utils.big_endian_to_int(o["result"])
-                    near_misses += 1
-                    elapsed = time.time() - start_time
-                    sys.stderr.write('Near miss, %f %% of threshold! Elapsed: '
-                                     '%f, estimated time remaining: %f\n' %
-                                     (dtarget * 100.0 / r, elapsed,
-                                      elapsed * 256. / near_misses))
-            steps -= 1
+            if o["result"] <= target:
+                sys.stderr.write("Success!\n")
+                self.block.mixhash = o["mix digest"]
+                found = True
+                break
         if not found:
             return False
 

ethereum/tests/test_chain.py

@@ -41,9 +41,9 @@ def __contains__(self, key):
 @pytest.fixture(scope="module")
 def accounts():
     k = utils.sha3(b'cow')
-    v = decode_hex(utils.privtoaddr(k))
+    v = utils.privtoaddr(k)
     k2 = utils.sha3(b'horse')
-    v2 = decode_hex(utils.privtoaddr(k2))
+    v2 = utils.privtoaddr(k2)
     return k, v, k2, v2