Reverted False to TransactionFailed in tester

Author: vbuterin

ethereum/tools/tester2.py

@@ -50,6 +50,9 @@
 except ImportError:
     pass
 
+class TransactionFailed(Exception):
+    pass
+
 from ethereum.abi import ContractTranslator
 import types
 
@@ -134,7 +137,7 @@ def tx(self, sender=k0, to=b'\x00' * 20, value=0, data=b'', startgas=STARTGAS, g
         success, output = apply_transaction(self.head_state, transaction)
         self.block.transactions.append(transaction)
         if not success:
-            return False
+            raise TransactionFailed()
         return output
 
     def contract(self, sourcecode, args=[], sender=k0, value=0, language='evm', startgas=STARTGAS, gasprice=GASPRICE):

tools/mk_ecadd_tests.py

@@ -34,15 +34,15 @@ def intrinsic_gas_of_data(d):
 def mk_test(p1, p2, execgas, datarestrict=128):
     encoded = mk_ecadd_data(p1, p2)[:datarestrict] + b'\x00' * max(datarestrict - 128, 0)
     pre = tester2.mk_state_test_prefill(c)
-    o = x1.foo(encoded, startgas=21000 + intrinsic_gas_of_data(x1.translator.encode('foo', [encoded])) + execgas)
-    if o is False:
-        print('OOG %r %r %d %d' % (p1, p2, datarestrict, execgas))
-    else:
+    try:
+        o = x1.foo(encoded, startgas=21000 + intrinsic_gas_of_data(x1.translator.encode('foo', [encoded])) + execgas)
         x, y = big_endian_to_int(o[:32]), big_endian_to_int(o[32:])
         if py_pairing.normalize(py_pairing.add(p1, p2)) != (py_pairing.FQ(x), py_pairing.FQ(y)):
             raise Exception("Mismatch! %r %r %d, expected %r computed %r" %
                             (p1, p2, datarestrict, py_pairing.normalize(py_pairing.add(p1, p2)), (x, y)))
         print('Succeeded! %r %r %d %r' % (p1, p2, datarestrict, (x, y)))
+    except tester2.TransactionFailed:
+        print('OOG %r %r %d %d' % (p1, p2, datarestrict, execgas))
     o = tester2.mk_state_test_postfill(c, pre)
     o2 = tester2.mk_state_test_postfill(c, pre, filler_mode=True)
     assert new_statetest_utils.verify_state_test(o)

tools/mk_ecmul_tests.py

@@ -31,16 +31,15 @@ def intrinsic_gas_of_data(d):
 def mk_test(p1, m, execgas, datarestrict=96):
     encoded = mk_ecmul_data(p1, m)[:datarestrict] + b'\x00' * max(datarestrict - 96, 0)
     pre = tester2.mk_state_test_prefill(c)
-    o = x1.foo(encoded, startgas=21000 + intrinsic_gas_of_data(x1.translator.encode('foo', [encoded])) + execgas)
-    if o is False:
-        print('OOG %r %d %d %d' % (p1, m, datarestrict, execgas))
-    else:
+    try:
+        o = x1.foo(encoded, startgas=21000 + intrinsic_gas_of_data(x1.translator.encode('foo', [encoded])) + execgas)
         x, y = big_endian_to_int(o[:32]), big_endian_to_int(o[32:])
-        print('m', p1, m, py_pairing.multiply(p1, m))
         if py_pairing.normalize(py_pairing.multiply(p1, m)) != (py_pairing.FQ(x), py_pairing.FQ(y)):
             raise Exception("Mismatch! %r %r %d, expected %r computed %r" %
                             (p1, m, datarestrict, py_pairing.normalize(py_pairing.multiply(p1, m)), (x, y)))
         print('Succeeded! %r %d %d %r' % (p1, m, datarestrict, (x, y)))
+    except tester2.TransactionFailed:
+        print('OOG %r %d %d %d' % (p1, m, datarestrict, execgas))
     o = tester2.mk_state_test_postfill(c, pre)
     o2 = tester2.mk_state_test_postfill(c, pre, filler_mode=True)
     assert new_statetest_utils.verify_state_test(o)

tools/mk_ecpairing_tests.py

@@ -54,7 +54,10 @@ def intrinsic_gas_of_data(d):
 
 def mk_test(encoded, execgas, expect):
     pre = tester2.mk_state_test_prefill(c)
-    o = x1.foo(encoded, startgas=21000 + intrinsic_gas_of_data(x1.translator.encode('foo', [encoded])) + execgas)
+    try:
+        o = x1.foo(encoded, startgas=21000 + intrinsic_gas_of_data(x1.translator.encode('foo', [encoded])) + execgas)
+    except tester2.TransactionFailed:
+        o = False
     if o is False:
         if expect != 'error':
             raise Exception('OOG')

tools/mk_modexp_tests.py

@@ -33,13 +33,13 @@ def mk_test(b, e, m, execgas):
     s = c.snapshot()
     x = c.contract(kode % (len(encoded) + 36, max(intlen(m), 1), max(intlen(m), 1)), language='viper')
     pre = tester2.mk_state_test_prefill(c)
-    o = x.foo(encoded, startgas=21000 + intrinsic_gas_of_data(x.translator.encode('foo', [encoded])) + execgas)
-    if o is False:
-        print('OOG %d %d %d sg %d' % (b, e, m, execgas))
-    else:
+    try:
+        o = x.foo(encoded, startgas=21000 + intrinsic_gas_of_data(x.translator.encode('foo', [encoded])) + execgas)
         if big_endian_to_int(o[:intlen(m)]) != (pow(b, e, m) if m else 0):
             raise Exception("Mismatch! %d %d %d expected %d computed %d" % (b, e, m, pow(b, e, m), big_endian_to_int(o[:intlen(m)])))
         print("Succeeded %d %d %d sg %d" % (b, e, m, execgas))
+    except tester2.TransactionFailed:
+        print('OOG %d %d %d sg %d' % (b, e, m, execgas))
     o = tester2.mk_state_test_postfill(c, pre)
     o2 = tester2.mk_state_test_postfill(c, pre, filler_mode=True)
     assert new_statetest_utils.verify_state_test(o)