Skip to content

Commit a7b3497

Browse files
committed
circleci: revive/rework enabling Constantinople runs on CI.
This used to be a commit by @cburgdorf, but it got eaten in the rebase (as it had most of the conflicts).
1 parent 6124909 commit a7b3497

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

Diff for: .circleci/config.yml

+21
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@ jobs:
108108
- image: circleci/python:3.5
109109
environment:
110110
TOXENV: py35-native-blockchain-byzantium
111+
py35-native-blockchain-constantinople:
112+
<<: *common
113+
docker:
114+
- image: circleci/python:3.5
115+
environment:
116+
TOXENV: py35-native-blockchain-constantinople
111117
py35-native-blockchain-frontier:
112118
<<: *common
113119
docker:
@@ -175,6 +181,12 @@ jobs:
175181
- image: circleci/python:3.6
176182
environment:
177183
TOXENV: py36-native-blockchain-byzantium
184+
py36-native-blockchain-constantinople:
185+
<<: *common
186+
docker:
187+
- image: circleci/python:3.6
188+
environment:
189+
TOXENV: py36-native-blockchain-constantinople
178190
py36-native-blockchain-frontier:
179191
<<: *common
180192
docker:
@@ -211,6 +223,12 @@ jobs:
211223
- image: circleci/python:3.6
212224
environment:
213225
TOXENV: py36-rpc-state-byzantium
226+
py36-rpc-state-constantinople:
227+
<<: *common
228+
docker:
229+
- image: circleci/python:3.6
230+
environment:
231+
TOXENV: py36-rpc-state-constantinople
214232
py36-rpc-state-frontier:
215233
<<: *common
216234
docker:
@@ -340,12 +358,14 @@ workflows:
340358
- py37-beacon
341359

342360
- py36-native-blockchain-byzantium
361+
- py36-native-blockchain-constantinople
343362
- py36-native-blockchain-frontier
344363
- py36-native-blockchain-homestead
345364
- py36-native-blockchain-eip150
346365
- py36-native-blockchain-eip158
347366
- py36-native-blockchain-transition
348367
- py36-rpc-state-byzantium
368+
- py36-rpc-state-constantinople
349369
- py36-rpc-state-frontier
350370
- py36-rpc-state-homestead
351371
- py36-rpc-state-eip150
@@ -364,6 +384,7 @@ workflows:
364384
- py36-beacon
365385

366386
- py35-native-blockchain-byzantium
387+
- py35-native-blockchain-constantinople
367388
- py35-native-blockchain-frontier
368389
- py35-native-blockchain-homestead
369390
- py35-native-blockchain-eip150

Diff for: tox.ini

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ envlist=
33
py{35,36}-{core,database,transactions,vm}
44
py{36}-{benchmark,p2p,trinity,lightchain_integration,beacon}
55
py{36}-rpc-blockchain
6-
py{36}-rpc-state-{frontier,homestead,eip150,eip158,byzantium,quadratic}
6+
py{36}-rpc-state-{frontier,homestead,eip150,eip158,byzantium,constantinople,quadratic}
77
py{35,36}-native-blockchain-{frontier,homestead,eip150,eip158,byzantium,constantinople,metropolis,transition}
88
py37-{core,trinity,trinity-integration,beacon}
99
py{35,36}-lint
@@ -32,6 +32,8 @@ commands=
3232
beacon: pytest {posargs:tests/beacon/}
3333
# The following test seems to consume a lot of memory. Restricting to 3 processes reduces crashes
3434
rpc-state-byzantium: pytest -n3 {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Byzantium'}
35+
# Uncomment the next line + modify test_rpc_fixtures.py when Constantinople is included in the mainnet config
36+
rpc-state-constantinople: pytest -n3 {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Constantinople'}
3537
rpc-state-quadratic: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and stQuadraticComplexityTest'}
3638
transactions: pytest {posargs:tests/json-fixtures/test_transactions.py}
3739
vm: pytest {posargs:tests/json-fixtures/test_virtual_machine.py}

0 commit comments

Comments
 (0)