Skip to content

Commit 1e5bcd3

Browse files
fselmofselmo
committed
Update integration test fixture to use geth v1.10.23
1 parent e430928 commit 1e5bcd3

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed

‎.circleci/config.yml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -254,55 +254,55 @@ jobs:
254254
- image: cimg/python:3.7
255255
environment:
256256
TOXENV: py37-integration-goethereum-ipc_eth
257-
GETH_VERSION: v1.10.17
257+
GETH_VERSION: v1.10.23
258258

259259
py37-integration-goethereum-ipc_non_eth:
260260
<<: *geth_steps
261261
docker:
262262
- image: cimg/python:3.7
263263
environment:
264264
TOXENV: py37-integration-goethereum-ipc_non_eth
265-
GETH_VERSION: v1.10.17
265+
GETH_VERSION: v1.10.23
266266

267267
py37-integration-goethereum-http_eth:
268268
<<: *geth_steps
269269
docker:
270270
- image: cimg/python:3.7
271271
environment:
272272
TOXENV: py37-integration-goethereum-http_eth
273-
GETH_VERSION: v1.10.17
273+
GETH_VERSION: v1.10.23
274274

275275
py37-integration-goethereum-http_non_eth:
276276
<<: *geth_steps
277277
docker:
278278
- image: cimg/python:3.7
279279
environment:
280280
TOXENV: py37-integration-goethereum-http_non_eth
281-
GETH_VERSION: v1.10.17
281+
GETH_VERSION: v1.10.23
282282

283283
py37-integration-goethereum-http_async:
284284
<<: *geth_steps
285285
docker:
286286
- image: cimg/python:3.7
287287
environment:
288288
TOXENV: py37-integration-goethereum-http_async
289-
GETH_VERSION: v1.10.17
289+
GETH_VERSION: v1.10.23
290290

291291
py37-integration-goethereum-ws_eth:
292292
<<: *geth_steps
293293
docker:
294294
- image: cimg/python:3.7
295295
environment:
296296
TOXENV: py37-integration-goethereum-ws_eth
297-
GETH_VERSION: v1.10.17
297+
GETH_VERSION: v1.10.23
298298

299299
py37-integration-goethereum-ws_non_eth:
300300
<<: *geth_steps
301301
docker:
302302
- image: cimg/python:3.7
303303
environment:
304304
TOXENV: py37-integration-goethereum-ws_non_eth
305-
GETH_VERSION: v1.10.17
305+
GETH_VERSION: v1.10.23
306306

307307
py37-integration-ethtester-pyevm:
308308
<<: *common
@@ -356,55 +356,55 @@ jobs:
356356
- image: cimg/python:3.8
357357
environment:
358358
TOXENV: py38-integration-goethereum-ipc_eth
359-
GETH_VERSION: v1.10.17
359+
GETH_VERSION: v1.10.23
360360

361361
py38-integration-goethereum-ipc_non_eth:
362362
<<: *geth_steps
363363
docker:
364364
- image: cimg/python:3.8
365365
environment:
366366
TOXENV: py38-integration-goethereum-ipc_non_eth
367-
GETH_VERSION: v1.10.17
367+
GETH_VERSION: v1.10.23
368368

369369
py38-integration-goethereum-http_eth:
370370
<<: *geth_steps
371371
docker:
372372
- image: cimg/python:3.8
373373
environment:
374374
TOXENV: py38-integration-goethereum-http_eth
375-
GETH_VERSION: v1.10.17
375+
GETH_VERSION: v1.10.23
376376

377377
py38-integration-goethereum-http_non_eth:
378378
<<: *geth_steps
379379
docker:
380380
- image: cimg/python:3.8
381381
environment:
382382
TOXENV: py38-integration-goethereum-http_non_eth
383-
GETH_VERSION: v1.10.17
383+
GETH_VERSION: v1.10.23
384384

385385
py38-integration-goethereum-http_async:
386386
<<: *geth_steps
387387
docker:
388388
- image: cimg/python:3.8
389389
environment:
390390
TOXENV: py38-integration-goethereum-http_async
391-
GETH_VERSION: v1.10.17
391+
GETH_VERSION: v1.10.23
392392

393393
py38-integration-goethereum-ws_eth:
394394
<<: *geth_steps
395395
docker:
396396
- image: cimg/python:3.8
397397
environment:
398398
TOXENV: py38-integration-goethereum-ws_eth
399-
GETH_VERSION: v1.10.17
399+
GETH_VERSION: v1.10.23
400400

401401
py38-integration-goethereum-ws_non_eth:
402402
<<: *geth_steps
403403
docker:
404404
- image: cimg/python:3.8
405405
environment:
406406
TOXENV: py38-integration-goethereum-ws_non_eth
407-
GETH_VERSION: v1.10.17
407+
GETH_VERSION: v1.10.23
408408

409409
py38-integration-ethtester-pyevm:
410410
<<: *common
@@ -453,55 +453,55 @@ jobs:
453453
- image: cimg/python:3.9
454454
environment:
455455
TOXENV: py39-integration-goethereum-ipc_eth
456-
GETH_VERSION: v1.10.17
456+
GETH_VERSION: v1.10.23
457457

458458
py39-integration-goethereum-ipc_non_eth:
459459
<<: *geth_steps
460460
docker:
461461
- image: cimg/python:3.9
462462
environment:
463463
TOXENV: py39-integration-goethereum-ipc_non_eth
464-
GETH_VERSION: v1.10.17
464+
GETH_VERSION: v1.10.23
465465

466466
py39-integration-goethereum-http_eth:
467467
<<: *geth_steps
468468
docker:
469469
- image: cimg/python:3.9
470470
environment:
471471
TOXENV: py39-integration-goethereum-http_eth
472-
GETH_VERSION: v1.10.17
472+
GETH_VERSION: v1.10.23
473473

474474
py39-integration-goethereum-http_non_eth:
475475
<<: *geth_steps
476476
docker:
477477
- image: cimg/python:3.9
478478
environment:
479479
TOXENV: py39-integration-goethereum-http_non_eth
480-
GETH_VERSION: v1.10.17
480+
GETH_VERSION: v1.10.23
481481

482482
py39-integration-goethereum-http_async:
483483
<<: *geth_steps
484484
docker:
485485
- image: cimg/python:3.9
486486
environment:
487487
TOXENV: py39-integration-goethereum-http_async
488-
GETH_VERSION: v1.10.17
488+
GETH_VERSION: v1.10.23
489489

490490
py39-integration-goethereum-ws_eth:
491491
<<: *geth_steps
492492
docker:
493493
- image: cimg/python:3.9
494494
environment:
495495
TOXENV: py39-integration-goethereum-ws_eth
496-
GETH_VERSION: v1.10.17
496+
GETH_VERSION: v1.10.23
497497

498498
py39-integration-goethereum-ws_non_eth:
499499
<<: *geth_steps
500500
docker:
501501
- image: cimg/python:3.9
502502
environment:
503503
TOXENV: py39-integration-goethereum-ws_non_eth
504-
GETH_VERSION: v1.10.17
504+
GETH_VERSION: v1.10.23
505505

506506
py39-integration-ethtester-pyevm:
507507
<<: *common
@@ -550,55 +550,55 @@ jobs:
550550
- image: cimg/python:3.10
551551
environment:
552552
TOXENV: py310-integration-goethereum-ipc_eth
553-
GETH_VERSION: v1.10.17
553+
GETH_VERSION: v1.10.23
554554

555555
py310-integration-goethereum-ipc_non_eth:
556556
<<: *geth_steps
557557
docker:
558558
- image: cimg/python:3.10
559559
environment:
560560
TOXENV: py310-integration-goethereum-ipc_non_eth
561-
GETH_VERSION: v1.10.17
561+
GETH_VERSION: v1.10.23
562562

563563
py310-integration-goethereum-http_eth:
564564
<<: *geth_steps
565565
docker:
566566
- image: cimg/python:3.10
567567
environment:
568568
TOXENV: py310-integration-goethereum-http_eth
569-
GETH_VERSION: v1.10.17
569+
GETH_VERSION: v1.10.23
570570

571571
py310-integration-goethereum-http_non_eth:
572572
<<: *geth_steps
573573
docker:
574574
- image: cimg/python:3.10
575575
environment:
576576
TOXENV: py310-integration-goethereum-http_non_eth
577-
GETH_VERSION: v1.10.17
577+
GETH_VERSION: v1.10.23
578578

579579
py310-integration-goethereum-http_async:
580580
<<: *geth_steps
581581
docker:
582582
- image: cimg/python:3.10
583583
environment:
584584
TOXENV: py310-integration-goethereum-http_async
585-
GETH_VERSION: v1.10.17
585+
GETH_VERSION: v1.10.23
586586

587587
py310-integration-goethereum-ws_eth:
588588
<<: *geth_steps
589589
docker:
590590
- image: cimg/python:3.10
591591
environment:
592592
TOXENV: py310-integration-goethereum-ws_eth
593-
GETH_VERSION: v1.10.17
593+
GETH_VERSION: v1.10.23
594594

595595
py310-integration-goethereum-ws_non_eth:
596596
<<: *geth_steps
597597
docker:
598598
- image: cimg/python:3.10
599599
environment:
600600
TOXENV: py310-integration-goethereum-ws_non_eth
601-
GETH_VERSION: v1.10.17
601+
GETH_VERSION: v1.10.23
602602

603603
py310-integration-ethtester-pyevm:
604604
<<: *common
@@ -621,7 +621,7 @@ jobs:
621621
- image: cimg/python:3.10
622622
environment:
623623
TOXENV: benchmark
624-
GETH_VERSION: v1.10.17
624+
GETH_VERSION: v1.10.23
625625

626626
workflows:
627627
version: 2.1

‎docs/contributing.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,13 +315,13 @@ Geth Fixtures
315315

316316
.. code:: sh
317317
318-
$ python -m geth.install v1.10.17
318+
$ python -m geth.install v1.10.23
319319
320320
2. Specify the Geth binary and run the fixture creation script (from within the web3.py directory):
321321

322322
.. code:: sh
323323
324-
$ 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
324+
$ 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
325325
326326
3. The output of this script is your fixture, a zip file, which is now stored in ``/tests/integration/``.
327327
Update the ``/tests/integration/go_ethereum/conftest.py`` file to point to this new fixture. Delete the old fixture.

‎setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
extras_require = {
88
"tester": [
99
"eth-tester[py-evm]==v0.6.0-beta.5",
10-
"py-geth>=3.8.0,<4",
10+
"py-geth>=3.9.1,<4",
1111
],
1212
"linter": [
1313
"black>=22.1.0,<23.0",
@@ -24,7 +24,7 @@
2424
"click>=5.1",
2525
"configparser==3.5.0",
2626
"contextlib2>=0.5.4",
27-
"py-geth>=3.8.0,<4",
27+
"py-geth>=3.9.1,<4",
2828
"py-solc>=0.4.0",
2929
"pytest>=6.2.5,<7",
3030
"sphinx>=4.2.0,<5",

‎tests/integration/geth-1.10.17-fixture.zip‎

-47.6 KB
Binary file not shown.

‎tests/integration/geth-1.10.23-fixture.zip‎

50.3 KB
Binary file not shown.

‎tests/integration/go_ethereum/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
KEYFILE_PW = "web3py-test"
2121

22-
GETH_FIXTURE_ZIP = "geth-1.10.17-fixture.zip"
22+
GETH_FIXTURE_ZIP = "geth-1.10.23-fixture.zip"
2323

2424

2525
@pytest.fixture(scope="module")

‎web3/tools/benchmark/node.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
kill_proc_gracefully,
2525
)
2626

27-
GETH_FIXTURE_ZIP = "geth-1.10.17-fixture.zip"
27+
GETH_FIXTURE_ZIP = "geth-1.10.23-fixture.zip"
2828

2929

3030
class GethBenchmarkFixture:

0 commit comments

Comments
 (0)