test_contracts works

Author: vbuterin

ethereum/tester.py

@@ -6,7 +6,7 @@
 import ethereum.db as db
 import ethereum.opcodes as opcodes
 import ethereum.abi as abi
-from ethereum.slogging import LogRecorder, configure_logging
+from ethereum.slogging import LogRecorder, configure_logging, set_level
 from ethereum.utils import to_string
 import rlp
 from rlp.utils import decode_hex, encode_hex, ascii_chr
@@ -76,7 +76,7 @@ def __init__(self, num_accounts=len(keys)):
         self.block = b.genesis(self.db, o)
         self.blocks = [self.block]
         self.block.timestamp = 1410973349
-        self.block.coinbase = decode_hex(a0)
+        self.block.coinbase = a0
         self.block.gas_limit = 10 ** 9
 
     def __del__(self):
@@ -101,7 +101,7 @@ def __init__(self, _state, code, sender=k0,
                     languages[language] = __import__(language)
                 language = languages[language]
                 evm = language.compile(code)
-                self.address = encode_hex(me.evm(evm, sender, endowment, gas))
+                self.address = me.evm(evm, sender, endowment, gas)
                 assert len(me.block.get_code(self.address)), \
                     "Contract code empty"
                 sig = language.mk_full_signature(code)
@@ -141,7 +141,7 @@ def kall(*args, **kwargs):
         return _abi_contract(me, code, sender, endowment, language)
 
     def evm(self, evm, sender=k0, endowment=0, gas=None):
-        sendnonce = self.block.get_nonce(decode_hex(u.privtoaddr(sender)))
+        sendnonce = self.block.get_nonce(u.privtoaddr(sender))
         tx = t.contract(sendnonce, 1, gas_limit, endowment, evm)
         tx.sign(sender)
         if gas is not None:
@@ -164,7 +164,7 @@ def _send(self, sender, to, value, evmdata='', output=None,
             raise Exception("Send with funid+abi is deprecated. Please use"
                             " the abi_contract mechanism")
         tm, g = time.time(), self.block.gas_used
-        sendnonce = self.block.get_nonce(decode_hex(u.privtoaddr(sender)))
+        sendnonce = self.block.get_nonce(u.privtoaddr(sender))
         tx = t.Transaction(sendnonce, 1, gas_limit, to, value, evmdata)
         self.last_tx = tx
         tx.sign(sender)
@@ -254,6 +254,8 @@ def set_logging_level(lvl=1):
         'eth.vm.storage:trace,eth.vm.memory:trace'
     ]
     configure_logging(config_string=trace_lvl_map[lvl])
+    if lvl == 0:
+        set_level(None, 'info')
     print('Set logging level: %d' % lvl)
 
 

ethereum/tests/test_contracts.py

@@ -5,10 +5,11 @@
 import serpent
 from rlp.utils import decode_hex, encode_hex
 from ethereum.utils import safe_ord
+from ethereum.slogging import set_level
 
 # customize VM log output to your needs
 # hint: use 'py.test' with the '-s' option to dump logs to the console
-tester.set_logging_level(2)
+tester.set_logging_level(0)
 
 
 # Test EVM contracts
@@ -907,7 +908,7 @@ def test_crowdfund():
     c.contribute(200, value=70001, sender=tester.k4)
     # Expect the 100001 units to be delivered to the destination
     # account for campaign 2
-    assert 100001 == s.block.get_balance(decode_hex(utils.int_to_addr(48)))
+    assert 100001 == s.block.get_balance(utils.int_to_addr(48))
     mida1 = s.block.get_balance(tester.a1)
     mida3 = s.block.get_balance(tester.a3)
     # Mine 5 blocks to expire the campaign
@@ -1051,6 +1052,7 @@ def sort(args:arr):
 
 @pytest.mark.timeout(10)
 def test_sort():
+    set_level(None, 'info')
     s = tester.state()
     c = s.abi_contract(sort_code)
     assert c.sort([9]) == [9]
@@ -1075,6 +1077,7 @@ def test(args:arr):
 
 @pytest.mark.timeout(10)
 def test_indirect_sort():
+    set_level(None, 'info')
     s = tester.state()
     open(filename9, 'w').write(sort_code)
     c = s.abi_contract(sort_tester_code)
@@ -1208,7 +1211,7 @@ def test_ecrecover():
     assert bitcoin.ecdsa_raw_verify(msghash, (V, R, S), pub)
 
     addr = utils.big_endian_to_int(utils.sha3(bitcoin.encode_pubkey(pub, 'bin')[1:])[12:])
-    assert int(utils.privtoaddr(priv), 16) == addr
+    assert utils.big_endian_to_int(utils.privtoaddr(priv)) == addr
 
     result = c.test_ecrecover(utils.big_endian_to_int(decode_hex(msghash)), V, R, S)
     assert result == addr
@@ -1310,6 +1313,7 @@ def get_prevhashes(k):
 
 @pytest.mark.timeout(10)
 def test_prevhashes():
+    set_level(None, 'info')
     s = tester.state()
     c = s.abi_contract(prevhashes_code)
     s.mine(7)

ethereum/tests/test_state.py

@@ -19,7 +19,6 @@ def gen_func(filename, testname, testdata):
 
 def do_test_state(filename, testname=None, testdata=None, limit=99999999):
     set_level(None, 'info')
-    print logger.is_active('trace')
     logger.debug('running test:%r in %r' % (testname, filename))
     testutils.check_state_test(testutils.fixture_to_bytes(testdata))
 

ethereum/transactions.py

@@ -75,7 +75,7 @@ def sign(self, key):
         """
         rawhash = utils.sha3(rlp.encode(self, UnsignedTransaction))
         self.v, self.r, self.s = ecdsa_raw_sign(rawhash, key)
-        self.sender = decode_hex(utils.privtoaddr(key))
+        self.sender = utils.privtoaddr(key)
         return self
 
     @property

ethereum/utils.py

@@ -96,7 +96,7 @@ def sha3(seed):
 def privtoaddr(x):
     if len(x) > 32:
         x = decode_hex(x)
-    return encode_hex(sha3(privtopub(x)[1:])[12:])
+    return sha3(privtopub(x)[1:])[12:]
 
 
 def zpad(x, l):
@@ -115,7 +115,7 @@ def int_to_addr(x):
     for i in range(20):
         o[19 - i] = ascii_chr(x & 0xff)
         x >>= 8
-    return encode_hex(b''.join(o))
+    return b''.join(o)
 
 
 def coerce_addr_to_bin(x):