Merge branch 'master' into chore/test-cancun

vyperlang · Mar 18, 2024 · 8ec0698 · 8ec0698
2 parents 96731f4 + 58ecff5
commit 8ec0698
Show file tree

Hide file tree

Showing 15 changed files with 101 additions and 125 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,6 +26,9 @@ jobs:
     - name: Install Dependencies
       run: pip install .[lint]
 
+    - name: Debug dependencies
+      run: pip freeze
+
     - name: Run Black
       run: black --check -C --force-exclude=vyper/version.py ./vyper ./tests ./setup.py
 
@@ -50,11 +53,12 @@ jobs:
           python-version: "3.11"
           cache: "pip"
 
-      - name: Install Tox
-        run: pip install tox
+      - name: Install deps
+        # TODO these should really be in setup.py
+        run: pip install shibuya sphinx sphinx-copybutton
 
-      - name: Run Tox
-        run: TOXENV=docs tox -r
+      - name: Run docs
+        run: sphinx-build -E -b html docs dist/docs -n -q --color
 
   # "Regular"/core tests.
   tests:
@@ -65,6 +69,7 @@ jobs:
         opt-mode: ["gas", "none", "codesize"]
         evm-version: [shanghai]
         debug: [true, false]
+        memorymock: [false]
 
         # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#expanding-or-adding-matrix-configurations
         include:
@@ -77,26 +82,38 @@ jobs:
             debug: false
             opt-mode: gas
             evm-version: paris
+
+          # redundant rule, for clarity
           - python-version: ["3.11", "311"]
             debug: false
             opt-mode: gas
             evm-version: shanghai
+
           - python-version: ["3.11", "311"]
             debug: false
             opt-mode: gas
             evm-version: cancun
 
+          # 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"]
             opt-mode: gas
             debug: false
             evm-version: shanghai
+          - python-version: ["3.12", "312"]
+            opt-mode: gas
+            debug: false
+            evm-version: shanghai
 
-          # TODO 3.12 doesn't work yet, investigate - may be hypothesis issue
-          #- python-version: ["3.12", "312"]
-
-    name: py${{ matrix.python-version[1] }}-opt-${{ matrix.opt-mode }}${{ matrix.debug && '-debug' || '' }}-${{ matrix.evm-version }}
+    name: py${{ matrix.python-version[1] }}-opt-${{ matrix.opt-mode }}${{ matrix.debug && '-debug' || '' }}${{ matrix.memorymock && '-memorymock' || '' }}-${{ matrix.evm-version }}
 
     steps:
     - uses: actions/checkout@v4
@@ -113,13 +130,18 @@ jobs:
     - name: Install dependencies
       run: pip install .[test]
 
+    - name: Debug dependencies
+      run: pip freeze
+
     - name: Run tests
       run: |
         pytest \
+          --dist worksteal \
           -m "not fuzzing" \
           --optimize ${{ matrix.opt-mode }} \
           --evm-version ${{ matrix.evm-version }} \
           ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }} \
+          ${{ matrix.memorymock && '--memorymock' || '' }} \
           --showlocals -r aR \
           tests/
 
@@ -149,7 +171,10 @@ jobs:
 
     strategy:
       matrix:
-        group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60]
+        # note that every time this is updated, `--splits` needs to be
+        # updated below as well.
+        # python -c "print(list(range(1, 121)))"
+        group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120]
 
     steps:
     - uses: actions/checkout@v4
@@ -160,17 +185,24 @@ jobs:
         python-version: "3.11"
         cache: "pip"
 
-    - name: Install Tox
-      run: pip install tox
+    - name: Install dependencies
+      run: pip install .[test]
 
     # fetch test durations
     # NOTE: if the tests get poorly distributed, run this and commit the resulting `.test_durations` file to the `vyper-test-durations` repo.
-    # `TOXENV=fuzzing tox -r -- --store-durations -r aR tests/`
+    # `pytest -m "fuzzing" --store-durations -r aR tests/`
     - name: Fetch test-durations
-      run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/5982755ee8459f771f2e8622427c36494646e1dd/test_durations" -o .test_durations
+      run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/master/test_durations" -o .test_durations
 
-    - name: Run Tox
-      run: TOXENV=fuzzing tox -r -- --splits 60 --group ${{ matrix.group }} --splitting-algorithm least_duration -r aR tests/
+    - name: Run tests
+      run: |
+        pytest \
+          -m "fuzzing" \
+          --splits 120 \
+          --group ${{ matrix.group }} \
+          --splitting-algorithm least_duration \
+          --dist worksteal \
+          -r aR tests/
 
     - name: Upload Coverage
       uses: codecov/codecov-action@v4
@@ -189,30 +221,3 @@ jobs:
       - name: Check slow tests all succeeded
         if: ${{ needs.fuzzing.result != 'success' }}
         run: exit 1
-
-  memory:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-          # need to fetch unshallow so that setuptools_scm can infer the version
-          fetch-depth: 0
-
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.11"
-        cache: "pip"
-
-    - name: Install Tox
-      run: pip install tox
-
-    - name: Run Tox
-      run: TOXENV=memory tox -r
-
-    - name: Upload Coverage
-      uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage.xml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
     -   id: mypy
         additional_dependencies:
           - "types-setuptools"
-        args:  # settings from tox.ini
+        args:  # settings from Makefile
           - --install-types
           - --non-interactive
           - --follow-imports=silent

diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,6 @@ exclude = '''
   | \.git
   | \.hg
   | \.mypy_cache
-  | \.tox
   | \.venv
   | _build
   | buck-out

diff --git a/quicktest.sh b/quicktest.sh
@@ -6,4 +6,4 @@
 
 # run pytest but bail out on first error and suppress coverage.
 # useful for dev workflow
-pytest -q --no-cov -s --instafail -x --disable-warnings "$@"
+pytest --dist worksteal -q --no-cov -s --instafail -x --disable-warnings "$@"
diff --git a/setup.cfg b/setup.cfg
@@ -9,7 +9,6 @@ extend-ignore = E203
 max-line-length = 100
 exclude =
 	venv*
-	.tox
 	docs
 	build
 per-file-ignores =

diff --git a/setup.py b/setup.py
@@ -8,19 +8,19 @@
 
 extras_require = {
     "test": [
-        "pytest>=6.2.5,<7.0",
-        "pytest-cov>=2.10,<3.0",
+        "pytest>=8.0,<9.0",
+        "pytest-cov>=4.1,<5.0",
         "pytest-instafail>=0.4,<1.0",
-        "pytest-xdist>=2.5,<3.0",
+        "pytest-xdist>=3.5,<4.0",
         "pytest-split>=0.7.0,<1.0",
         "eth-tester[py-evm]>=0.10.0b3,<0.11",
         "eth_abi>=4.0.0,<5.0.0",
         "py-evm>=0.10.0b2,<0.11",
         "web3==6.0.0",
-        "tox>=3.15,<4.0",
         "lark==1.1.9",
-        "hypothesis[lark]>=5.37.1,<6.0",
-        "eth-stdlib==0.2.6",
+        "hypothesis[lark]>=6.0,<7.0",
+        "eth-stdlib==0.2.7",
+        "setuptools",
     ],
     "lint": [
         "black==23.12.0",
@@ -115,6 +115,7 @@ def _global_version(version):
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
     package_data={"vyper.ast": ["grammar.lark"]},
     data_files=[("", [hash_file_rel_path])],

diff --git a/tests/functional/builtins/codegen/test_slice.py b/tests/functional/builtins/codegen/test_slice.py
@@ -2,7 +2,8 @@
 import pytest
 from hypothesis import given, settings
 
-from vyper.compiler.settings import OptimizationLevel
+from vyper.compiler import compile_code
+from vyper.compiler.settings import OptimizationLevel, Settings
 from vyper.exceptions import ArgumentException, TypeMismatch
 
 _fun_bytes32_bounds = [(0, 32), (3, 29), (27, 5), (0, 5), (5, 3), (30, 2)]
@@ -32,6 +33,12 @@ def slice_tower_test(inp1: Bytes[50]) -> Bytes[50]:
 _bytes_1024 = st.binary(min_size=0, max_size=1024)
 
 
+def _fail_contract(code, opt_level, exceptions):
+    settings = Settings(optimize=opt_level)
+    with pytest.raises(exceptions):
+        compile_code(code, settings)
+
+
 @pytest.mark.parametrize("use_literal_start", (True, False))
 @pytest.mark.parametrize("use_literal_length", (True, False))
 @pytest.mark.parametrize("opt_level", list(OptimizationLevel))
@@ -40,7 +47,6 @@ def slice_tower_test(inp1: Bytes[50]) -> Bytes[50]:
 @pytest.mark.fuzzing
 def test_slice_immutable(
     get_contract,
-    assert_compile_failed,
     tx_failed,
     opt_level,
     bytesdata,
@@ -76,7 +82,8 @@ def _get_contract():
         or (use_literal_start and start > length_bound)
         or (use_literal_length and length == 0)
     ):
-        assert_compile_failed(lambda: _get_contract(), ArgumentException)
+        _fail_contract(code, opt_level, ArgumentException)
+
     elif start + length > len(bytesdata) or (len(bytesdata) > length_bound):
         # deploy fail
         with tx_failed():
@@ -95,7 +102,6 @@ def _get_contract():
 @pytest.mark.fuzzing
 def test_slice_bytes_fuzz(
     get_contract,
-    assert_compile_failed,
     tx_failed,
     opt_level,
     location,
@@ -173,7 +179,8 @@ def _get_contract():
     )
 
     if compile_time_oob or slice_output_too_large:
-        assert_compile_failed(lambda: _get_contract(), (ArgumentException, TypeMismatch))
+        _fail_contract(code, opt_level, (ArgumentException, TypeMismatch))
+
     elif location == "code" and len(bytesdata) > length_bound:
         # deploy fail
         with tx_failed():

diff --git a/tests/functional/builtins/folding/test_powmod.py b/tests/functional/builtins/folding/test_powmod.py
@@ -4,7 +4,7 @@
 
 from tests.utils import parse_and_fold
 
-st_uint256 = st.integers(min_value=0, max_value=2**256)
+st_uint256 = st.integers(min_value=0, max_value=(2**256 - 1))
 
 
 @pytest.mark.fuzzing

diff --git a/tests/functional/codegen/test_selector_table_stability.py b/tests/functional/codegen/test_selector_table_stability.py
@@ -13,7 +13,7 @@ def test_dense_jumptable_stability():
     )
 
     # test that the selector table data is stable across different runs
-    # (tox should provide different PYTHONHASHSEEDs).
+    # (xdist should provide different PYTHONHASHSEEDs).
     expected_asm = """{ DATA _sym_BUCKET_HEADERS b\'\\x0bB\' _sym_bucket_0 b\'\\n\' b\'+\\x8d\' _sym_bucket_1 b\'\\x0c\' b\'\\x00\\x85\' _sym_bucket_2 b\'\\x08\' } { DATA _sym_bucket_1 b\'\\xd8\\xee\\xa1\\xe8\' _sym_external 6 foo6()3639517672 b\'\\x05\' b\'\\xd2\\x9e\\xe0\\xf9\' _sym_external 0 foo0()3533627641 b\'\\x05\' b\'\\x05\\xf1\\xe0_\' _sym_external 2 foo2()99737695 b\'\\x05\' b\'\\x91\\t\\xb4{\' _sym_external 23 foo23()2433332347 b\'\\x05\' b\'np3\\x7f\' _sym_external 11 foo11()1852846975 b\'\\x05\' b\'&\\xf5\\x96\\xf9\' _sym_external 13 foo13()653629177 b\'\\x05\' b\'\\x04ga\\xeb\' _sym_external 14 foo14()73884139 b\'\\x05\' b\'\\x89\\x06\\xad\\xc6\' _sym_external 17 foo17()2298916294 b\'\\x05\' b\'\\xe4%\\xac\\xd1\' _sym_external 4 foo4()3827674321 b\'\\x05\' b\'yj\\x01\\xac\' _sym_external 7 foo7()2036990380 b\'\\x05\' b\'\\xf1\\xe6K\\xe5\' _sym_external 29 foo29()4058401765 b\'\\x05\' b\'\\xd2\\x89X\\xb8\' _sym_external 3 foo3()3532216504 b\'\\x05\' } { DATA _sym_bucket_2 b\'\\x06p\\xffj\' _sym_external 25 foo25()108068714 b\'\\x05\' b\'\\x964\\x99I\' _sym_external 24 foo24()2520029513 b\'\\x05\' b\'s\\x81\\xe7\\xc1\' _sym_external 10 foo10()1937893313 b\'\\x05\' b\'\\x85\\xad\\xc11\' _sym_external 28 foo28()2242756913 b\'\\x05\' b\'\\xfa"\\xb1\\xed\' _sym_external 5 foo5()4196577773 b\'\\x05\' b\'A\\xe7[\\x05\' _sym_external 22 foo22()1105681157 b\'\\x05\' b\'\\xd3\\x89U\\xe8\' _sym_external 1 foo1()3548993000 b\'\\x05\' b\'hL\\xf8\\xf3\' _sym_external 20 foo20()1749874931 b\'\\x05\' } { DATA _sym_bucket_0 b\'\\xee\\xd9\\x1d\\xe3\' _sym_external 9 foo9()4007206371 b\'\\x05\' b\'a\\xbc\\x1ch\' _sym_external 16 foo16()1639717992 b\'\\x05\' b\'\\xd3*\\xa7\\x0c\' _sym_external 21 foo21()3542787852 b\'\\x05\' b\'\\x18iG\\xd9\' _sym_external 19 foo19()409552857 b\'\\x05\' b\'\\n\\xf1\\xf9\\x7f\' _sym_external 18 foo18()183630207 b\'\\x05\' b\')\\xda\\xd7`\' _sym_external 27 foo27()702207840 b\'\\x05\' b\'2\\xf6\\xaa\\xda\' _sym_external 12 foo12()855026394 b\'\\x05\' b\'\\xbe\\xb5\\x05\\xf5\' _sym_external 15 foo15()3199534581 b\'\\x05\' b\'\\xfc\\xa7_\\xe6\' _sym_external 8 foo8()4238827494 b\'\\x05\' b\'\\x1b\\x12C8\' _sym_external 26 foo26()454181688 b\'\\x05\' } }"""  # noqa: E501
     assert expected_asm in output["asm"]
 

diff --git a/tests/functional/codegen/types/test_bytes_zero_padding.py b/tests/functional/codegen/types/test_bytes_zero_padding.py
@@ -25,7 +25,7 @@ def get_count(counter: uint256) -> Bytes[24]:
 
 
 @pytest.mark.fuzzing
-@hypothesis.given(value=hypothesis.strategies.integers(min_value=0, max_value=2**64))
+@hypothesis.given(value=hypothesis.strategies.integers(min_value=0, max_value=(2**64 - 1)))
 def test_zero_pad_range(little_endian_contract, value):
     actual_bytes = value.to_bytes(8, byteorder="little")
     contract_bytes = little_endian_contract.get_count(value)

diff --git a/tests/functional/grammar/test_grammar.py b/tests/functional/grammar/test_grammar.py
@@ -37,36 +37,31 @@ def test_basic_grammar_empty():
     assert len(tree.children) == 0
 
 
-def utf8_encodable(terminal: str) -> bool:
-    try:
-        if "\x00" not in terminal and "\\ " not in terminal and "\x0c" not in terminal:
-            terminal.encode("utf-8-sig")
-            return True
-        else:
-            return False
-    except UnicodeEncodeError:  # pragma: no cover
-        # Very rarely, a "." in some terminal regex will generate a surrogate
-        # character that cannot be encoded as UTF-8.  We apply this filter to
-        # ensure it doesn't happen at runtime, but don't worry about coverage.
-        return False
+def fix_terminal(terminal: str) -> bool:
+    # these throw exceptions in the grammar
+    for bad in ("\x00", "\\ ", "\x0c"):
+        terminal = terminal.replace(bad, " ")
+    return terminal
+
+
+ALLOWED_CHARS = st.characters(codec="utf-8", min_codepoint=1)
 
 
 # With help from hyposmith
 # https://github.com/Zac-HD/hypothesmith/blob/master/src/hypothesmith/syntactic.py
 class GrammarStrategy(LarkStrategy):
     def __init__(self, grammar, start, explicit_strategies):
-        super().__init__(grammar, start, explicit_strategies)
+        super().__init__(grammar, start, explicit_strategies, alphabet=ALLOWED_CHARS)
         self.terminal_strategies = {
-            k: v.map(lambda s: s.replace("\0", "")).filter(utf8_encodable)
-            for k, v in self.terminal_strategies.items()  # type: ignore
+            k: v.map(fix_terminal) for k, v in self.terminal_strategies.items()  # type: ignore
         }
 
     def draw_symbol(self, data, symbol, draw_state):  # type: ignore
-        count = len(draw_state.result)
+        count = len(draw_state)
         super().draw_symbol(data, symbol, draw_state)
         try:
             compile(
-                source="".join(draw_state.result[count:])
+                source="".join(draw_state[count:])
                 .replace("contract", "class")
                 .replace("struct", "class"),  # HACK: Python ast.parse
                 filename="<string>",
@@ -102,10 +97,11 @@ def has_no_docstrings(c):
 
 
 @pytest.mark.fuzzing
-@given(code=from_grammar().filter(lambda c: utf8_encodable(c)))
-@hypothesis.settings(max_examples=500, suppress_health_check=[HealthCheck.too_slow])
+@given(code=from_grammar())
+@hypothesis.settings(
+    max_examples=500, suppress_health_check=[HealthCheck.too_slow, HealthCheck.filter_too_much]
+)
 def test_grammar_bruteforce(code):
-    if utf8_encodable(code):
-        _, _, _, reformatted_code = pre_parse(code + "\n")
-        tree = parse_to_ast(reformatted_code)
-        assert isinstance(tree, Module)
+    _, _, _, reformatted_code = pre_parse(code + "\n")
+    tree = parse_to_ast(reformatted_code)
+    assert isinstance(tree, Module)