Added direct_tx method to tester

Author: vbuterin

ethereum/tests/test_contracts.py

@@ -1088,7 +1088,7 @@ def kall(a:arr, b, c:arr, d:str, e):
 def test_multiarg_code():
     c = tester.Chain()
     x = c.contract(multiarg_code, language='serpent')
-    o = x.kall([1, 2, 3], 4, [5, 6, 7], "doge", 8)
+    o = x.kall([1, 2, 3], 4, [5, 6, 7], b"doge", 8)
     assert o == [862541, safe_ord('d') + safe_ord('o') + safe_ord('g'), 4]
 
 peano_code = """
@@ -1378,7 +1378,7 @@ def mcopy_test(foo:str, a, b, c):
 def test_mcopy():
     c = tester.Chain()
     x = c.contract(mcopy_code, language='serpent')
-    assert x.mcopy_test("123", 5, 6, 259) == \
+    assert x.mcopy_test(b"123", 5, 6, 259) == \
         b'\x00'*31+b'\x05'+b'\x00'*31+b'\x06'+b'\x00'*30+b'\x01\x03'+b'123'
 
 
@@ -1493,7 +1493,7 @@ def test_double_array():
     c = tester.Chain()
     x = c.contract(double_array_code, language='serpent')
     assert x.foo([1, 2, 3], [4, 5, 6, 7]) == [123, 4567]
-    assert x.bar([1, 2, 3], "moo", [4, 5, 6, 7]) == [123, 4567]
+    assert x.bar([1, 2, 3], b"moo", [4, 5, 6, 7]) == [123, 4567]
 
 
 abi_logging_code = """
@@ -1527,7 +1527,7 @@ def test_abi_logging():
     x.test_frog(5)
     assert o == [{"_event_type": b"frog", "y": 5}]
     o.pop()
-    x.test_moose(7, "nine", 11, [13, 15, 17])
+    x.test_moose(7, b"nine", 11, [13, 15, 17])
     assert o == [{"_event_type": b"moose", "a": 7, "b": b"nine",
                  "c": 11, "d": [13, 15, 17]}]
     o.pop()

ethereum/tools/tester.py

@@ -132,17 +132,22 @@ def __init__(self, alloc=None, env=None):
         self.last_sender = None
         self.last_tx = None
 
-    def tx(self, sender=k0, to=b'\x00' * 20, value=0, data=b'', startgas=STARTGAS, gasprice=GASPRICE):
-        sender_addr = privtoaddr(sender)
-        transaction = Transaction(self.head_state.get_nonce(sender_addr), gasprice, startgas,
-                                  to, value, data).sign(sender)
-        self.last_tx, self.last_sender = transaction, sender
+    def direct_tx(self, transaction):
+        self.last_tx, self.last_sender = transaction, None
         success, output = apply_transaction(self.head_state, transaction)
         self.block.transactions.append(transaction)
         if not success:
             raise TransactionFailed()
         return output
 
+    def tx(self, sender=k0, to=b'\x00' * 20, value=0, data=b'', startgas=STARTGAS, gasprice=GASPRICE):
+        sender_addr = privtoaddr(sender)
+        transaction = Transaction(self.head_state.get_nonce(sender_addr), gasprice, startgas,
+                                  to, value, data).sign(sender)
+        o = self.direct_tx(transaction)
+        self.last_sender = sender
+        return o
+
     def contract(self, sourcecode, args=[], sender=k0, value=0, language='evm', startgas=STARTGAS, gasprice=GASPRICE):
         if language == 'evm':
             assert len(args) == 0