[WIP] Implement subroutine opcodes

Peppece · Peppece · commit 5d2cdb760232 · 2020-10-25T07:55:26.000+01:00
diff --git a/eth/vm/rstack.py b/eth/vm/rstack.py
@@ -61,6 +61,6 @@ def pop1_int(self, value) -> int:
                 return big_endian_to_int(popped)  # type: ignore
             else:
                 raise ValidationError(
-                   "Stack must always be bytes or int, "
-                   f"got {item_type!r} type, val {value!r}"
+                    "Stack must always be bytes or int, "
+                    f"got {item_type!r} type, val {value!r}"
                 )
diff --git a/tests/core/opcodes/test_opcodes.py b/tests/core/opcodes/test_opcodes.py
@@ -1159,7 +1159,7 @@ def test_jumpsub(vm_class, code, expect_gas_used):
     assert comp.get_gas_used() == expect_gas_used
 
 
-@pytest.mark.xfail(reason="invalid subroutines") # noqa: F811
+@pytest.mark.xfail(reason="invalid subroutines")  # noqa: F811
 @pytest.mark.parametrize(
     'vm_class, code',
     (

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,6 @@ def pop1_int(self, value) -> int:`
`61`	`61`	`return big_endian_to_int(popped) # type: ignore`
`62`	`62`	`else:`
`63`	`63`	`raise ValidationError(`
`64`		`- "Stack must always be bytes or int, "`
`65`		`- f"got {item_type!r} type, val {value!r}"`
	`64`	`+ "Stack must always be bytes or int, "`
	`65`	`+ f"got {item_type!r} type, val {value!r}"`
`66`	`66`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1159,7 +1159,7 @@ def test_jumpsub(vm_class, code, expect_gas_used):`
`1159`	`1159`	`assert comp.get_gas_used() == expect_gas_used`
`1160`	`1160`
`1161`	`1161`
`1162`		`-@pytest.mark.xfail(reason="invalid subroutines") # noqa: F811`
	`1162`	`+@pytest.mark.xfail(reason="invalid subroutines") # noqa: F811`
`1163`	`1163`	`@pytest.mark.parametrize(`
`1164`	`1164`	`'vm_class, code',`
`1165`	`1165`	`(`