Skip to content
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.

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

Update test fixture to use geth v1.11.2 #2841

Merged
merged 3 commits into from
Feb 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
82 changes: 41 additions & 41 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ geth_steps: &geth_steps
name: build geth if missing
command: |
mkdir -p $HOME/.ethash
pip install --user py-geth>=3.6.0
pip install --user py-geth>=3.11.0
export GOROOT=/usr/local/go
echo $GETH_VERSION
export GETH_BINARY="$HOME/.py-geth/geth-$GETH_VERSION/bin/geth"
if [ ! -e "$GETH_BINARY" ]; then
curl -O https://storage.googleapis.com/golang/go1.18.1.linux-amd64.tar.gz
tar xvf go1.18.1.linux-amd64.tar.gz
curl -O https://storage.googleapis.com/golang/go1.20.1.linux-amd64.tar.gz
tar xvf go1.20.1.linux-amd64.tar.gz
sudo chown -R root:root ./go
sudo mv go /usr/local
sudo ln -s /usr/local/go/bin/go /usr/local/bin/go
Expand Down Expand Up @@ -122,8 +122,8 @@ geth_custom_steps: &geth_custom_steps
echo $GETH_VERSION
export GETH_BINARY="./custom_geth"
echo 'export GETH_BINARY="./custom_geth"' >> $BASH_ENV
curl -O https://storage.googleapis.com/golang/go1.18.1.linux-amd64.tar.gz
tar xvf go1.18.1.linux-amd64.tar.gz
curl -O https://storage.googleapis.com/golang/go1.20.1.linux-amd64.tar.gz
tar xvf go1.20.1.linux-amd64.tar.gz
sudo chown -R root:root ./go
sudo mv go /usr/local
sudo ln -s /usr/local/go/bin/go /usr/local/bin/go
Expand Down Expand Up @@ -247,55 +247,55 @@ jobs:
- image: cimg/python:3.7
environment:
TOXENV: py37-integration-goethereum-ipc
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py37-integration-goethereum-ipc_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.7
environment:
TOXENV: py37-integration-goethereum-ipc_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py37-integration-goethereum-http:
<<: *geth_steps
docker:
- image: cimg/python:3.7
environment:
TOXENV: py37-integration-goethereum-http
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py37-integration-goethereum-http_async:
<<: *geth_steps
docker:
- image: cimg/python:3.7
environment:
TOXENV: py37-integration-goethereum-http_async
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py37-integration-goethereum-http_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.7
environment:
TOXENV: py37-integration-goethereum-http_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py37-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: cimg/python:3.7
environment:
TOXENV: py37-integration-goethereum-ws
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py37-integration-goethereum-ws_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.7
environment:
TOXENV: py37-integration-goethereum-ws_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py37-integration-ethtester-pyevm:
<<: *common
Expand Down Expand Up @@ -356,55 +356,55 @@ jobs:
- image: cimg/python:3.8
environment:
TOXENV: py38-integration-goethereum-ipc
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py38-integration-goethereum-ipc_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.8
environment:
TOXENV: py38-integration-goethereum-ipc_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py38-integration-goethereum-http:
<<: *geth_steps
docker:
- image: cimg/python:3.8
environment:
TOXENV: py38-integration-goethereum-http
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py38-integration-goethereum-http_async:
<<: *geth_steps
docker:
- image: cimg/python:3.8
environment:
TOXENV: py38-integration-goethereum-http_async
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py38-integration-goethereum-http_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.8
environment:
TOXENV: py38-integration-goethereum-http_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py38-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: cimg/python:3.8
environment:
TOXENV: py38-integration-goethereum-ws
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py38-integration-goethereum-ws_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.8
environment:
TOXENV: py38-integration-goethereum-ws_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py38-integration-ethtester-pyevm:
<<: *common
Expand Down Expand Up @@ -460,55 +460,55 @@ jobs:
- image: cimg/python:3.9
environment:
TOXENV: py39-integration-goethereum-ipc
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py39-integration-goethereum-ipc_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.9
environment:
TOXENV: py39-integration-goethereum-ipc_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py39-integration-goethereum-http:
<<: *geth_steps
docker:
- image: cimg/python:3.9
environment:
TOXENV: py39-integration-goethereum-http
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py39-integration-goethereum-http_async:
<<: *geth_steps
docker:
- image: cimg/python:3.9
environment:
TOXENV: py39-integration-goethereum-http_async
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py39-integration-goethereum-http_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.9
environment:
TOXENV: py39-integration-goethereum-http_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py39-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: cimg/python:3.9
environment:
TOXENV: py39-integration-goethereum-ws
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py39-integration-goethereum-ws_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.9
environment:
TOXENV: py39-integration-goethereum-ws_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py39-integration-ethtester-pyevm:
<<: *common
Expand Down Expand Up @@ -564,55 +564,55 @@ jobs:
- image: cimg/python:3.10
environment:
TOXENV: py310-integration-goethereum-ipc
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py310-integration-goethereum-ipc_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.10
environment:
TOXENV: py310-integration-goethereum-ipc_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py310-integration-goethereum-http:
<<: *geth_steps
docker:
- image: cimg/python:3.10
environment:
TOXENV: py310-integration-goethereum-http
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py310-integration-goethereum-http_async:
<<: *geth_steps
docker:
- image: cimg/python:3.10
environment:
TOXENV: py310-integration-goethereum-http_async
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py310-integration-goethereum-http_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.10
environment:
TOXENV: py310-integration-goethereum-http_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py310-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: cimg/python:3.10
environment:
TOXENV: py310-integration-goethereum-ws
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py310-integration-goethereum-ws_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.10
environment:
TOXENV: py310-integration-goethereum-ws_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py310-integration-ethtester-pyevm:
<<: *common
Expand Down Expand Up @@ -668,55 +668,55 @@ jobs:
- image: cimg/python:3.11
environment:
TOXENV: py311-integration-goethereum-ipc
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py311-integration-goethereum-ipc_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.11
environment:
TOXENV: py311-integration-goethereum-ipc_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py311-integration-goethereum-http:
<<: *geth_steps
docker:
- image: cimg/python:3.11
environment:
TOXENV: py311-integration-goethereum-http
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py311-integration-goethereum-http_async:
<<: *geth_steps
docker:
- image: cimg/python:3.11
environment:
TOXENV: py311-integration-goethereum-http_async
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py311-integration-goethereum-http_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.11
environment:
TOXENV: py311-integration-goethereum-http_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py311-integration-goethereum-ws:
<<: *geth_steps
docker:
- image: cimg/python:3.11
environment:
TOXENV: py311-integration-goethereum-ws
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py311-integration-goethereum-ws_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.11
environment:
TOXENV: py311-integration-goethereum-ws_flaky
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

py311-integration-ethtester-pyevm:
<<: *common
Expand All @@ -739,7 +739,7 @@ jobs:
- image: cimg/python:3.10
environment:
TOXENV: benchmark
GETH_VERSION: v1.10.25
GETH_VERSION: v1.11.2

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

.. code:: sh

$ python -m geth.install v1.10.25
$ python -m geth.install v1.11.2

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.25/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.10.25-fixture
$ GETH_BINARY=~/.py-geth/geth-v1.11.2/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.11.2-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/2841.internal.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update ``py-geth`` version and re-generate integration test fixture with geth ``v1.11.2``.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
extras_require = {
"tester": [
"eth-tester[py-evm]==v0.8.0-b.3",
"py-geth>=3.10.0",
"py-geth>=3.11.0",
],
"linter": [
"black>=22.1.0",
Expand All @@ -23,7 +23,7 @@
"click>=5.1",
"configparser==3.5.0",
"contextlib2>=0.5.4",
"py-geth>=3.9.1",
"py-geth>=3.11.0",
"py-solc-x>=1.1.1",
"pytest>=6.2.5",
"sphinx>=4.2.0",
Expand Down
3 changes: 3 additions & 0 deletions tests/integration/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
Web3,
)

# use same coinbase value as in `web3.py/tests/integration/generate_fixtures/common.py`
COINBASE = "0xdc544d1aa88ff8bbd2f2aec754b1f1e99e1812fd"


class MiscWebsocketTest:
def test_websocket_max_size_error(self, w3, endpoint_uri):
Expand Down
Loading