feat[test]: remove memory mocker (#4005)

it doesn't really find bugs (since the calling convention was redone in 0.3.0) and we have better ways to analyze memory now since the introduction of the venom pipeline (cf. changes in 7d28a50)
vyperlang · May 6, 2024 · 6c272b7 · 6c272b7
1 parent ace3789
commit 6c272b7
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 99 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -70,7 +70,6 @@ jobs:
         debug: [true, false]
         evm-version: [shanghai]
         experimental-codegen: [false]
-        memorymock: [false]
         evm-backend: [revm]
 
         # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#expanding-or-adding-matrix-configurations
@@ -118,14 +117,6 @@ jobs:
             experimental-codegen: true
           # TODO: test experimental_codegen + -Ocodesize
 
-          # run with `--memorymock`, but only need to do it one configuration
-          # TODO: consider removing the memorymock tests
-          - python-version: ["3.11", "311"]
-            opt-mode: gas
-            debug: false
-            evm-version: shanghai
-            memorymock: true
-
           # run across other python versions. we don't really need to run all
           # modes across all python versions - one is enough
           - python-version: ["3.10", "310"]
@@ -141,7 +132,6 @@ jobs:
     name: "py${{ matrix.python-version[1] }}\
       -opt-${{ matrix.opt-mode }}\
       ${{ matrix.debug && '-debug' || '' }}\
-      ${{ matrix.memorymock && '-memorymock' || '' }}\
       ${{ matrix.experimental-codegen && '-experimental' || '' }}\
       -${{ matrix.evm-version }}\
       ${{ matrix.evm-backend && format('-{0}', matrix.evm-backend) || '' }}"
@@ -172,7 +162,6 @@ jobs:
           --evm-version ${{ matrix.evm-version }} \
           ${{ matrix.evm-backend && format('--evm-backend {0}', matrix.evm-backend) || '' }} \
           ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }} \
-          ${{ matrix.memorymock && '--memorymock' || '' }} \
           ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }} \
           --cov-branch \
           --cov-report xml:coverage.xml \

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -20,9 +20,6 @@
 from vyper.ir import compile_ir, optimizer
 from vyper.utils import keccak256
 
-# Import the base fixtures
-pytest_plugins = ["tests.fixtures.memorymock"]
-
 ############
 # PATCHING #
 ############

diff --git a/tests/fixtures/__init__.py b/tests/fixtures/__init__.py
diff --git a/tests/fixtures/memorymock.py b/tests/fixtures/memorymock.py
diff --git a/tests/functional/builtins/codegen/test_raw_call.py b/tests/functional/builtins/codegen/test_raw_call.py
@@ -6,8 +6,6 @@
 from vyper.builtins.functions import eip1167_bytecode
 from vyper.exceptions import ArgumentException, StateAccessViolation, TypeMismatch
 
-pytestmark = pytest.mark.usefixtures("memory_mocker")
-
 
 def test_max_outsize_exceeds_returndatasize(get_contract):
     source_code = """

diff --git a/tests/functional/builtins/codegen/test_sha256.py b/tests/functional/builtins/codegen/test_sha256.py
@@ -1,11 +1,7 @@
 import hashlib
 
-import pytest
-
 from vyper.utils import hex_to_int
 
-pytestmark = pytest.mark.usefixtures("memory_mocker")
-
 
 def test_sha256_string_literal(get_contract):
     code = """

diff --git a/tests/functional/codegen/calling_convention/test_return.py b/tests/functional/codegen/calling_convention/test_return.py
@@ -4,8 +4,6 @@
 from vyper import compile_code
 from vyper.exceptions import TypeMismatch
 
-pytestmark = pytest.mark.usefixtures("memory_mocker")
-
 
 def test_correct_abi_right_padding(env, get_contract):
     selfcall_code_6 = """

diff --git a/tests/functional/codegen/features/test_assert.py b/tests/functional/codegen/features/test_assert.py
@@ -17,7 +17,7 @@ def foo():
     assert env.last_result.gas_used < gas_sent
 
 
-def test_assert_reason(env, get_contract, tx_failed, memory_mocker):
+def test_assert_reason(env, get_contract, tx_failed):
     code = """
 err: String[32]
 
@@ -134,7 +134,7 @@ def test_valid_assertions(get_contract, code):
     get_contract(code)
 
 
-def test_assert_staticcall(get_contract, env, tx_failed, memory_mocker):
+def test_assert_staticcall(get_contract, env, tx_failed):
     foreign_code = """
 state: uint256
 @external
@@ -158,7 +158,7 @@ def test(c: ForeignContract):
         c2.test(c1.address)
 
 
-def test_assert_in_for_loop(get_contract, tx_failed, memory_mocker):
+def test_assert_in_for_loop(get_contract, tx_failed):
     code = """
 @external
 def test(x: uint256[3]) -> bool:
@@ -178,7 +178,7 @@ def test(x: uint256[3]) -> bool:
         c.test([1, 3, 5])
 
 
-def test_assert_with_reason_in_for_loop(get_contract, tx_failed, memory_mocker):
+def test_assert_with_reason_in_for_loop(get_contract, tx_failed):
     code = """
 @external
 def test(x: uint256[3]) -> bool:
@@ -198,7 +198,7 @@ def test(x: uint256[3]) -> bool:
         c.test([1, 3, 5])
 
 
-def test_assert_reason_revert_length(env, get_contract, tx_failed, memory_mocker):
+def test_assert_reason_revert_length(env, get_contract, tx_failed):
     code = """
 @external
 def test() -> int128:

diff --git a/tests/functional/codegen/features/test_internal_call.py b/tests/functional/codegen/features/test_internal_call.py
@@ -8,8 +8,6 @@
 from vyper.compiler import compile_code
 from vyper.exceptions import ArgumentException, CallViolation
 
-pytestmark = pytest.mark.usefixtures("memory_mocker")
-
 
 def test_selfcall_code(get_contract):
     selfcall_code = """

diff --git a/tests/functional/codegen/features/test_logging.py b/tests/functional/codegen/features/test_logging.py
@@ -15,8 +15,6 @@
 )
 from vyper.utils import keccak256
 
-pytestmark = pytest.mark.usefixtures("memory_mocker")
-
 
 def test_empty_event_logging(get_logs, keccak, get_contract):
     loggy_code = """

diff --git a/tests/functional/codegen/features/test_logging_from_call.py b/tests/functional/codegen/features/test_logging_from_call.py
@@ -1,8 +1,5 @@
-import pytest
 from eth_utils import to_int
 
-pytestmark = pytest.mark.usefixtures("memory_mocker")
-
 
 def test_log_dynamic_static_combo(get_logs, get_contract):
     code = """

diff --git a/tests/functional/codegen/features/test_packing.py b/tests/functional/codegen/features/test_packing.py
@@ -1,4 +1,4 @@
-def test_packing_test(get_contract, memory_mocker):
+def test_packing_test(get_contract):
     packing_test = """
 struct Bar:
     a: int128

diff --git a/tests/functional/codegen/features/test_reverting.py b/tests/functional/codegen/features/test_reverting.py
@@ -1,10 +1,7 @@
-import pytest
 from eth.codecs import abi
 
 from vyper.utils import method_id
 
-pytestmark = pytest.mark.usefixtures("memory_mocker")
-
 
 def test_revert_reason(env, tx_failed, get_contract):
     reverty_code = """

diff --git a/tests/functional/codegen/types/test_string.py b/tests/functional/codegen/types/test_string.py
@@ -1,7 +1,5 @@
 import pytest
 
-pytestmark = pytest.mark.usefixtures("memory_mocker")
-
 
 def test_string_return(get_contract):
     code = """

diff --git a/tests/functional/examples/conftest.py b/tests/functional/examples/conftest.py
diff --git a/tests/functional/syntax/test_return_tuple.py b/tests/functional/syntax/test_return_tuple.py
@@ -3,8 +3,6 @@
 from vyper import compiler
 from vyper.exceptions import FunctionDeclarationException
 
-pytestmark = pytest.mark.usefixtures("memory_mocker")
-
 fail_list = [
     """
 @external