Update integration test fixture to use geth v1.10.23

fselmo · fselmo · commit 58bfa06c8819 · 2022-09-06T14:53:20.000-06:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -254,55 +254,55 @@ jobs:
       - image: cimg/python:3.7
     environment:
       TOXENV: py37-integration-goethereum-ipc_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py37-integration-goethereum-ipc_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.7
     environment:
       TOXENV: py37-integration-goethereum-ipc_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py37-integration-goethereum-http_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.7
     environment:
       TOXENV: py37-integration-goethereum-http_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py37-integration-goethereum-http_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.7
     environment:
       TOXENV: py37-integration-goethereum-http_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py37-integration-goethereum-http_async:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.7
     environment:
       TOXENV: py37-integration-goethereum-http_async
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py37-integration-goethereum-ws_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.7
     environment:
       TOXENV: py37-integration-goethereum-ws_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py37-integration-goethereum-ws_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.7
     environment:
       TOXENV: py37-integration-goethereum-ws_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py37-integration-ethtester-pyevm:
     <<: *common
@@ -356,55 +356,55 @@ jobs:
       - image: cimg/python:3.8
     environment:
       TOXENV: py38-integration-goethereum-ipc_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py38-integration-goethereum-ipc_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.8
     environment:
       TOXENV: py38-integration-goethereum-ipc_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py38-integration-goethereum-http_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.8
     environment:
       TOXENV: py38-integration-goethereum-http_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py38-integration-goethereum-http_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.8
     environment:
       TOXENV: py38-integration-goethereum-http_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py38-integration-goethereum-http_async:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.8
     environment:
       TOXENV: py38-integration-goethereum-http_async
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py38-integration-goethereum-ws_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.8
     environment:
       TOXENV: py38-integration-goethereum-ws_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py38-integration-goethereum-ws_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.8
     environment:
       TOXENV: py38-integration-goethereum-ws_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py38-integration-ethtester-pyevm:
     <<: *common
@@ -453,55 +453,55 @@ jobs:
       - image: cimg/python:3.9
     environment:
       TOXENV: py39-integration-goethereum-ipc_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py39-integration-goethereum-ipc_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.9
     environment:
       TOXENV: py39-integration-goethereum-ipc_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py39-integration-goethereum-http_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.9
     environment:
       TOXENV: py39-integration-goethereum-http_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py39-integration-goethereum-http_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.9
     environment:
       TOXENV: py39-integration-goethereum-http_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py39-integration-goethereum-http_async:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.9
     environment:
       TOXENV: py39-integration-goethereum-http_async
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py39-integration-goethereum-ws_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.9
     environment:
       TOXENV: py39-integration-goethereum-ws_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py39-integration-goethereum-ws_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.9
     environment:
       TOXENV: py39-integration-goethereum-ws_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py39-integration-ethtester-pyevm:
     <<: *common
@@ -550,55 +550,55 @@ jobs:
       - image: cimg/python:3.10
     environment:
       TOXENV: py310-integration-goethereum-ipc_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py310-integration-goethereum-ipc_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.10
     environment:
       TOXENV: py310-integration-goethereum-ipc_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py310-integration-goethereum-http_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.10
     environment:
       TOXENV: py310-integration-goethereum-http_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py310-integration-goethereum-http_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.10
     environment:
       TOXENV: py310-integration-goethereum-http_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py310-integration-goethereum-http_async:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.10
     environment:
       TOXENV: py310-integration-goethereum-http_async
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py310-integration-goethereum-ws_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.10
     environment:
       TOXENV: py310-integration-goethereum-ws_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py310-integration-goethereum-ws_non_eth:
     <<: *geth_steps
     docker:
       - image: cimg/python:3.10
     environment:
       TOXENV: py310-integration-goethereum-ws_non_eth
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
   py310-integration-ethtester-pyevm:
     <<: *common
@@ -621,7 +621,7 @@ jobs:
       - image: cimg/python:3.10
     environment:
       TOXENV: benchmark
-      GETH_VERSION: v1.10.17
+      GETH_VERSION: v1.10.23
 
 workflows:
   version: 2.1
diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -315,13 +315,13 @@ Geth Fixtures
 
    .. code:: sh
 
-       $ python -m geth.install v1.10.17
+       $ python -m geth.install v1.10.23
 
 2. Specify the Geth binary and run the fixture creation script (from within the web3.py directory):
 
    .. code:: sh
 
-       $ GETH_BINARY=~/.py-geth/geth-v1.10.17/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.10.17-fixture
+       $ GETH_BINARY=~/.py-geth/geth-v1.10.23/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.10.23-fixture
 
 3. The output of this script is your fixture, a zip file, which is now stored in ``/tests/integration/``.
    Update the ``/tests/integration/go_ethereum/conftest.py`` file to point to this new fixture. Delete the old fixture.
diff --git a/newsfragments/2630.misc.rst b/newsfragments/2630.misc.rst
@@ -0,0 +1 @@
+Update integration test fixture to test against geth version ``v1.10.23``
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 extras_require = {
     "tester": [
         "eth-tester[py-evm]==v0.6.0-beta.5",
-        "py-geth>=3.8.0,<4",
+        "py-geth>=3.9.1,<4",
     ],
     "linter": [
         "black>=22.1.0,<23.0",
@@ -24,7 +24,7 @@
         "click>=5.1",
         "configparser==3.5.0",
         "contextlib2>=0.5.4",
-        "py-geth>=3.8.0,<4",
+        "py-geth>=3.9.1,<4",
         "py-solc>=0.4.0",
         "pytest>=6.2.5,<7",
         "sphinx>=4.2.0,<5",
diff --git a/tests/integration/geth-1.10.17-fixture.zip b/tests/integration/geth-1.10.17-fixture.zip
diff --git a/tests/integration/geth-1.10.23-fixture.zip b/tests/integration/geth-1.10.23-fixture.zip
diff --git a/tests/integration/go_ethereum/conftest.py b/tests/integration/go_ethereum/conftest.py
@@ -19,7 +19,7 @@
 
 KEYFILE_PW = "web3py-test"
 
-GETH_FIXTURE_ZIP = "geth-1.10.17-fixture.zip"
+GETH_FIXTURE_ZIP = "geth-1.10.23-fixture.zip"
 
 
 @pytest.fixture(scope="module")
diff --git a/web3/tools/benchmark/node.py b/web3/tools/benchmark/node.py
@@ -24,7 +24,7 @@
     kill_proc_gracefully,
 )
 
-GETH_FIXTURE_ZIP = "geth-1.10.17-fixture.zip"
+GETH_FIXTURE_ZIP = "geth-1.10.23-fixture.zip"
 
 
 class GethBenchmarkFixture:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Update integration test fixture to test against geth version ``v1.10.23``
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`kill_proc_gracefully,`
`25`	`25`	`)`
`26`	`26`
`27`		`-GETH_FIXTURE_ZIP = "geth-1.10.17-fixture.zip"`
	`27`	`+GETH_FIXTURE_ZIP = "geth-1.10.23-fixture.zip"`
`28`	`28`
`29`	`29`
`30`	`30`	`class GethBenchmarkFixture:`