[WIP] Implement subroutine opcodes

Author: Giuseppe Cerami

eth/vm/computation.py

@@ -329,11 +329,11 @@ def stack_push_bytes(self) -> Callable[[bytes], None]:
     # Return Stack Management
     #
     @cached_property
-    def rstack_push_int(self) -> Callable[[int], None]:
+    def rstack_push_int(self) -> None:
         return self._rstack.push_int
 
     @cached_property
-    def rstack_pop1_int(self) -> Callable[[int]], None]:
+    def rstack_pop1_int(self) -> int:
         return self._rstack.pop1_int
 
     #

eth/vm/rstack.py

@@ -11,12 +11,12 @@
     validate_stack_int,
 )
 
-from eth.utils import (
+from eth_utils import (
     big_endian_to_int,
     ValidationError,
 )
 
-import collections.UserList as rstack
+from collections import UserList as rstack
 """
 This module simply implements for the return stack the exact same design used for the data stack.
 As this stack must simply push_int or pop1_int any time a subroutine is accessed or left, only those two functions are provided.

tests/core/opcodes/test_opcodes.py

@@ -1126,9 +1126,10 @@ def test_blake2b_f_compression(vm_class, input_hex, output_hex, expect_exception
         result = comp.output
         assert result.hex() == output_hex
 
-
+"""
 def test_jumpsub():
 	computation.prepare_general_computation(vm_class)
 	computation.stack_push1_int(val1)
 	#do jumpsub
 	#do returnsub
+"""