Skip to content

Commit 01793e5

Browse files
committed
Update README and CI workflow
1 parent 223d734 commit 01793e5

File tree

2 files changed

+3
-95
lines changed

2 files changed

+3
-95
lines changed

.circleci/config.yml

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,6 @@ commands:
4444
venv_name: v25-pyspec
4545
reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}
4646
venv_path: ./venv
47-
restore_deposit_contract_tester_cached_venv:
48-
description: "Restore the venv from cache for the deposit contract tester"
49-
steps:
50-
- restore_cached_venv:
51-
venv_name: v23-deposit-contract-tester
52-
reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}-{{ checksum "solidity_deposit_contract/web3_tester/requirements.txt" }}
53-
save_deposit_contract_tester_cached_venv:
54-
description: "Save the venv to cache for later use of the deposit contract tester"
55-
steps:
56-
- save_cached_venv:
57-
venv_name: v23-deposit-contract-tester
58-
reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}-{{ checksum "solidity_deposit_contract/web3_tester/requirements.txt" }}
59-
venv_path: ./solidity_deposit_contract/web3_tester/venv
6047
jobs:
6148
checkout_specs:
6249
docker:
@@ -226,71 +213,6 @@ jobs:
226213
- run:
227214
name: Run linter for test generators
228215
command: make lint_generators
229-
build_deposit_contract:
230-
docker:
231-
- image: ethereum/solc:0.6.11-alpine
232-
steps:
233-
- checkout
234-
- run:
235-
name: Install build essentials
236-
command: |
237-
apk update
238-
apk add git make
239-
- run:
240-
name: Compile the contract
241-
command: |
242-
make compile_deposit_contract
243-
git diff --color --exit-code
244-
- persist_to_workspace:
245-
root: .
246-
paths:
247-
- ./solidity_deposit_contract/deposit_contract.json
248-
- ./build/combined.json
249-
- ./solidity_deposit_contract/lib
250-
test_deposit_contract:
251-
docker:
252-
- image: nixorg/nix:circleci
253-
steps:
254-
- checkout
255-
- restore_cache:
256-
key: nix-store-test-v2
257-
- attach_workspace:
258-
at: /tmp/
259-
- run:
260-
name: Test the contract
261-
command: |
262-
mkdir build
263-
cp -r /tmp/build/* build
264-
cp -r /tmp/solidity_deposit_contract/lib/* ./solidity_deposit_contract/lib
265-
cp -r /tmp/solidity_deposit_contract/deposit_contract.json ./solidity_deposit_contract/deposit_contract.json
266-
nix-shell --command 'make test_deposit_contract' ./solidity_deposit_contract/shell.nix
267-
- save_cache:
268-
key: nix-store-test-v2
269-
paths:
270-
- /nix
271-
install_deposit_contract_web3_tester:
272-
docker:
273-
- image: cimg/python:3.12.4
274-
working_directory: ~/specs-repo
275-
steps:
276-
- restore_cache:
277-
key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
278-
- restore_deposit_contract_tester_cached_venv
279-
- run:
280-
name: Install deposit contract tester requirements
281-
command: make install_deposit_contract_web3_tester
282-
- save_deposit_contract_tester_cached_venv
283-
test_deposit_contract_web3_tests:
284-
docker:
285-
- image: cimg/python:3.12.4
286-
working_directory: ~/specs-repo
287-
steps:
288-
- restore_cache:
289-
key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
290-
- restore_deposit_contract_tester_cached_venv
291-
- run:
292-
name: Run deposit contract test with web3.py
293-
command: make test_deposit_contract_web3_tests
294216
workflows:
295217
version: 2.1
296218
test_spec:
@@ -328,17 +250,3 @@ workflows:
328250
- lint:
329251
requires:
330252
- install_pyspec_test
331-
# NOTE: Since phase 0 has been launched, we disabled the deposit contract tests.
332-
# - install_deposit_contract_web3_tester:
333-
# requires:
334-
# - checkout_specs
335-
# - test_deposit_contract_web3_tests:
336-
# requires:
337-
# - install_deposit_contract_web3_tester
338-
build_and_test_deposit_contract:
339-
jobs:
340-
- build_deposit_contract
341-
# NOTE: Since phase 0 has been launched, we disabled the deposit contract tests.
342-
# - test_deposit_contract:
343-
# requires:
344-
# - build_deposit_contract

solidity_deposit_contract/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ In August 2020, version `r2` was released with metadata modifications and relice
1313

1414
## Compiling solidity deposit contract
1515

16-
In the `eth2.0-specs` directory run:
16+
In this directory run:
1717
```sh
1818
make compile_deposit_contract
1919
```
@@ -31,8 +31,8 @@ solc --optimize --optimize-runs 5000000 --metadata-literal --bin deposit_contrac
3131

3232
## Running web3 tests
3333

34-
1. In the `eth2.0-specs` directory run `make install_deposit_contract_web3_tester` to install the tools needed (make sure to have Python 3.7 and pip installed).
35-
2. In the `eth2.0-specs` directory run `make test_deposit_contract_web3_tests` to execute the tests.
34+
1. In this directory run `make install_deposit_contract_web3_tester` to install the tools needed (make sure to have Python 3 and pip installed).
35+
2. In this directory run `make test_deposit_contract_web3_tests` to execute the tests.
3636

3737
## Running randomized `dapp` tests:
3838

0 commit comments

Comments
 (0)