Made more tests pass

Author: vbuterin

ethereum/tests/test_transactions.py

@@ -3,7 +3,7 @@
 import rlp
 from rlp.utils import decode_hex, encode_hex, str_to_bytes
 from ethereum.tools import testutils
-from ethereum.messages import config_fork_specific_validation
+from ethereum.messages import config_fork_specific_validation, null_address
 import ethereum.config as config
 import sys
 import json
@@ -28,6 +28,9 @@ def test_transaction(filename, testname, testdata):
         #if blknum >= config.default_config["HOMESTEAD_FORK_BLKNUM"]:
         #    tx.check_low_s_homestead()
         assert config_fork_specific_validation(konfig, blknum, tx)
+        assert tx.startgas >= tx.intrinsic_gas_used
+        if tx.sender == null_address:
+            assert tx.value == 0 and tx.gasprice == 0 and tx.nonce == 0
         o["sender"] = tx.sender
         o["transaction"] = {
             "data": '0x' * (len(tx.data) > 0) + encode_hex(tx.data),
@@ -44,11 +47,12 @@ def test_transaction(filename, testname, testdata):
         tx = None
         sys.stderr.write(str(e))
     if 'transaction' not in testdata:  # expected to fail
+        # print(tx.to_dict(), testdata)
         assert tx is None
     else:
         assert set(o['transaction'].keys()) == set(testdata.get("transaction", dict()).keys())
         o.get("transaction", None) == testdata.get("transaction", None)
-        assert str_to_bytes(encode_hex(o.get("sender", ''))) == testdata.get("sender", '')
+        assert str_to_bytes(encode_hex(o.get("sender", ''))) == str_to_bytes(testdata.get("sender", ''))
 
 
 def pytest_generate_tests(metafunc):

ethereum/tests/test_trie.py

@@ -5,7 +5,7 @@
 import itertools
 from ethereum.slogging import get_logger
 from rlp.utils import decode_hex
-from ethereum.utils import encode_hex
+from ethereum.utils import encode_hex, to_string
 from ethereum.abi import is_string
 logger = get_logger()
 
@@ -53,15 +53,15 @@ def _dec(x):
         for k, v in permut:
             #logger.debug('updating with (%s, %s)' %(k, v))
             if v is not None:
-                t.update(k, v)
+                t.update(to_string(k), to_string(v))
             else:
-                t.delete(k)
+                t.delete(to_string(k))
         # make sure we have deletes at the end
         for k, v in deletes:
-            t.delete(k)
-        if pairs['root'] != b'0x' + encode_hex(t.root_hash):
+            t.delete(to_string(k))
+        if pairs['root'] != '0x' + encode_hex(t.root_hash):
             raise Exception("Mismatch: %r %r %r %r" % (
-                name, pairs['root'], b'0x' + encode_hex(t.root_hash), (i, list(permut) + deletes)))
+                name, pairs['root'], '0x' + encode_hex(t.root_hash), (i, list(permut) + deletes)))
 
 
 if __name__ == '__main__':