Merge pull request #1971 from carver/tests-upgrade

Upgrade ethereum/tests to v7.0.1

Author: carver

.circleci/config.yml

@@ -46,6 +46,12 @@ jobs:
       - image: circleci/python:3.6
         environment:
           TOXENV: py36-benchmark
+  py36-native-blockchain-berlin:
+    <<: *common
+    docker:
+      - image: circleci/python:3.6
+        environment:
+          TOXENV: py36-native-blockchain-berlin
   py36-native-blockchain-byzantium:
     <<: *common
     docker:

eth/tools/fixtures/helpers.py

@@ -46,6 +46,7 @@
     HomesteadVM as BaseHomesteadVM,
     SpuriousDragonVM,
     IstanbulVM,
+    BerlinVM,
 )
 
 
@@ -126,6 +127,10 @@ def chain_vm_configuration(fixture: Dict[str, Any]) -> Iterable[Tuple[int, Type[
         return (
             (0, IstanbulVM),
         )
+    elif network == 'Berlin':
+        return (
+            (0, BerlinVM),
+        )
     elif network == 'FrontierToHomesteadAt5':
         HomesteadVM = BaseHomesteadVM.configure(support_dao_fork=False)
         return (

eth/vm/forks/__init__.py

@@ -25,3 +25,6 @@
 from .muir_glacier import (  # noqa: F401
     MuirGlacierVM,
 )
+from .berlin import (  # noqa: F401
+    BerlinVM,
+)

fixtures

@@ -0,0 +1,3 @@
+Upgrade tests fixtures to v7.0.1, with Berlin tests (but not enabled in CI). Marked an Istanbul test
+as disabled, pending feedback from testing team. Skipped several slow tests in Istanbul. Added
+pytest-timeout to limit annoyance of new slow tests.

newsfragments/1971.internal.rst

@@ -4,6 +4,7 @@ python_paths= .
 xfail_strict=true
 log_format = %(levelname)8s  %(asctime)s  %(filename)20s  %(message)s
 log_date_format = %m-%d %H:%M:%S
+timeout = 300
 
 [pytest-watch]
 runner= pytest --failed-first --maxfail=1

pytest.ini

@@ -35,6 +35,7 @@
         "pytest>=5.1.3,<6",
         "pytest-asyncio>=0.10.0,<0.11",
         "pytest-cov==2.5.1",
+        "pytest-timeout>=1.4.2,<2",
         "pytest-watch>=4.1.0,<5",
         "pytest-xdist==1.31.0",
     ],

setup.py

@@ -141,6 +141,15 @@
     ('ValidBlocks/bcStateTests/randomStatetest94.json', 'randomStatetest94_ConstantinopleFix'),  # noqa: E501
     ('ValidBlocks/bcStateTests/randomStatetest94.json', 'randomStatetest94_Homestead'),  # noqa: E501
     ('ValidBlocks/bcStateTests/randomStatetest94.json', 'randomStatetest94_Istanbul'),  # noqa: E501
+    ('ValidBlocks/VMTests/vmPerformance/loop-add-10M.json', 'loop-add-10M_Istanbul'),
+    ('ValidBlocks/VMTests/vmPerformance/loop-divadd-10M.json', 'loop-divadd-10M_Istanbul'),
+    ('ValidBlocks/VMTests/vmPerformance/loop-divadd-unr100-10M.json', 'loop-divadd-unr100-10M_Istanbul'),  # noqa: E501
+    ('ValidBlocks/VMTests/vmPerformance/loop-exp-16b-100k.json', 'loop-exp-16b-100k_Istanbul'),
+    ('ValidBlocks/VMTests/vmPerformance/loop-exp-1b-1M.json', 'loop-exp-1b-1M_Istanbul'),
+    ('ValidBlocks/VMTests/vmPerformance/loop-exp-32b-100k.json', 'loop-exp-32b-100k_Istanbul'),
+    ('ValidBlocks/VMTests/vmPerformance/loop-exp-nop-1M.json', 'loop-exp-nop-1M_Istanbul'),
+    ('ValidBlocks/VMTests/vmPerformance/loop-mul.json', 'loop-mul_Istanbul'),
+    ('ValidBlocks/VMTests/vmPerformance/loop-mulmod-2M.json', 'loop-mulmod-2M_Istanbul'),
 }
 
 
@@ -181,12 +190,18 @@
     ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d0g0v0_Istanbul'),  # noqa: E501
     # Perhaps even stranger, d2 starts failing again after fixing a long-hidden consensus bug
     # but not in Constantinople, only in Istanbul.
-    ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d2g0v0_Istanbul'),  # noqa: E501
-    ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d1g0v0_Istanbul'),  # noqa: E501
+    ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d2g0v0_Istanbul'),
+    ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d1g0v0_Istanbul'),
     # The d2 variant started failing again after fixing a long-hidden consensus bug
     # but only in Istanbul, not in Constantinople.
-    ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d2g0v0_Istanbul'),  # noqa: E501
-    ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d3g0v0_Istanbul'),  # noqa: E501
+    ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d2g0v0_Istanbul'),
+    ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d3g0v0_Istanbul'),
+    # It's not clear how or why this test changed. It doesn't make sense that it only tests Istanbul
+    # either. See: https://github.com/ethereum/tests/issues/787
+    # The test seems to claim to test what happens if the uncle timestamp is the same as
+    # the block, but the RLP doesn't encode a matching timestamp.
+    ('InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp.json', 'incorrectUncleTimestamp_Istanbul'),  # noqa: E501
+    ('InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp.json', 'incorrectUncleTimestamp_Berlin'),  # noqa: E501
 }
 
 

tests/json-fixtures/test_blockchain.py

@@ -34,6 +34,7 @@ commands=
     native-blockchain-constantinople: pytest {posargs:tests/json-fixtures/test_blockchain.py --fork Constantinople}
     native-blockchain-petersburg: pytest {posargs:tests/json-fixtures/test_blockchain.py --fork ConstantinopleFix}
     native-blockchain-istanbul: pytest {posargs:tests/json-fixtures/test_blockchain.py --fork Istanbul}
+    native-blockchain-berlin: pytest {posargs:tests/json-fixtures/test_blockchain.py --fork Berlin}
     native-blockchain-metropolis: pytest {posargs:tests/json-fixtures/test_blockchain.py --fork Metropolis}
     native-blockchain-transition: pytest {posargs:tests/json-fixtures/test_blockchain.py -k BlockchainTests/TransitionTests}
     lint: flake8 {toxinidir}/eth {toxinidir}/tests {toxinidir}/scripts