Skip to content

Update geth test fixture to use v1.10.11 #2201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2021
Merged

Update geth test fixture to use v1.10.11 #2201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,23 +287,23 @@ jobs:
- image: circleci/python:3.6
environment:
TOXENV: py36-integration-goethereum-ipc
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

py36-integration-goethereum-http:
<<: *geth_steps
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-integration-goethereum-http
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

py36-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-integration-goethereum-ws
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

# py36-integration-parity-ipc:
# <<: *parity_steps
Expand Down Expand Up @@ -379,23 +379,23 @@ jobs:
- image: circleci/python:3.7
environment:
TOXENV: py37-integration-goethereum-ipc
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

py37-integration-goethereum-http:
<<: *geth_steps
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-integration-goethereum-http
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

py37-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-integration-goethereum-ws
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

# py37-integration-parity-ipc:
# <<: *parity_steps
Expand Down Expand Up @@ -476,23 +476,23 @@ jobs:
- image: circleci/python:3.8
environment:
TOXENV: py38-integration-goethereum-ipc
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

py38-integration-goethereum-http:
<<: *geth_steps
docker:
- image: circleci/python:3.8
environment:
TOXENV: py38-integration-goethereum-http
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

py38-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: circleci/python:3.8
environment:
TOXENV: py38-integration-goethereum-ws
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

# py38-integration-parity-ipc:
# <<: *parity_steps
Expand Down Expand Up @@ -568,23 +568,23 @@ jobs:
- image: circleci/python:3.9
environment:
TOXENV: py39-integration-goethereum-ipc
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

py39-integration-goethereum-http:
<<: *geth_steps
docker:
- image: circleci/python:3.9
environment:
TOXENV: py39-integration-goethereum-http
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

py39-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: circleci/python:3.9
environment:
TOXENV: py39-integration-goethereum-ws
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

# py39-integration-parity-ipc:
# <<: *parity_steps
Expand Down Expand Up @@ -634,7 +634,7 @@ jobs:
- image: circleci/python:3.9
environment:
TOXENV: benchmark
GETH_VERSION: v1.10.8
GETH_VERSION: v1.10.11

workflows:
version: 2.1
Expand Down
4 changes: 2 additions & 2 deletions docs/contributing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,13 +308,13 @@ Geth Fixtures

.. code:: sh

$ python -m geth.install v1.10.8
$ python -m geth.install v1.10.11

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.8/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.10.8-fixture
$ GETH_BINARY=~/.py-geth/geth-v1.10.11/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.10.11-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.
Expand Down
1 change: 1 addition & 0 deletions newsfragments/2201.misc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update geth test fixture to use geth version v1.10.11
Binary file added tests/integration/geth-1.10.11-fixture.zip
View file
Open in desktop
Binary file not shown.
Binary file removed tests/integration/geth-1.10.8-fixture.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/integration/go_ethereum/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

KEYFILE_PW = 'web3py-test'

GETH_FIXTURE_ZIP = 'geth-1.10.8-fixture.zip'
GETH_FIXTURE_ZIP = 'geth-1.10.11-fixture.zip'


@pytest.fixture(scope='module')
Expand Down
2 changes: 1 addition & 1 deletion web3/tools/benchmark/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
kill_proc_gracefully,
)

GETH_FIXTURE_ZIP = "geth-1.10.8-fixture.zip"
GETH_FIXTURE_ZIP = "geth-1.10.11-fixture.zip"


class GethBenchmarkFixture:
Expand Down