Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

Integration tests benchmarks #1615

Merged
merged 63 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
01893c4
move SCs directly under contracts dir & replace benchmarks SCs with a…
AronisAt79 Sep 19, 2023
bf234f9
add build-dependencies to Cargo
AronisAt79 Sep 19, 2023
25b62b7
create build script for SC compilation and generation of ruct contrac…
AronisAt79 Sep 19, 2023
d92a7af
update lib.rs
AronisAt79 Sep 19, 2023
da0d388
update Cargo dependenies
AronisAt79 Sep 19, 2023
4cad68e
remove compilation step, new deploy fn based on SC rust bindings, add…
AronisAt79 Sep 19, 2023
aaaef53
formatting
AronisAt79 Sep 19, 2023
1d32a9a
add git submodule update step in action workflow yml
AronisAt79 Sep 21, 2023
8642745
Update integration.yml
AronisAt79 Sep 21, 2023
6d20243
remove git submodule update step from run.sh >> now a step of workflo…
AronisAt79 Sep 21, 2023
a19b745
fix contract path/name
AronisAt79 Sep 21, 2023
c0c5118
add an entry in blocks hashmap for Deploy Greeter (to be consumend by…
AronisAt79 Sep 21, 2023
1fe5cac
add submodule update back in run.sh. otherwise tests do not run locally
AronisAt79 Sep 22, 2023
e37265e
formatting
AronisAt79 Sep 22, 2023
b61cfa7
Merge branch 'integration-tests-benchmarks' of https://github.com/pri…
AronisAt79 Sep 22, 2023
cb1f0f0
Merge branch 'main' into integration-tests-benchmarks
AronisAt79 Sep 22, 2023
6342b48
modify lints.yml workflow to run cargo build before fmt checks
AronisAt79 Sep 22, 2023
05611d1
lints.tml fix typos
AronisAt79 Sep 22, 2023
20382f0
typos lints.yml
AronisAt79 Sep 22, 2023
a0dffc1
Merge branch 'main' into integration-tests-benchmarks
ntampakas Sep 26, 2023
5284fff
Install solc
ntampakas Sep 26, 2023
db90c4a
Add sudo to command
ntampakas Sep 26, 2023
377faa2
Build bin gen_blockchain_data
ntampakas Sep 26, 2023
b68677d
Fix cargo args
ntampakas Sep 26, 2023
79ca544
fix clippy errors on build script
AronisAt79 Sep 27, 2023
093a955
Merge branch 'main' into integration-tests-benchmarks
AronisAt79 Sep 29, 2023
3b928d2
exclude generated code from cargo fmt checks
AronisAt79 Sep 29, 2023
481b533
Merge branch 'integration-tests-benchmarks' of https://github.com/pri…
AronisAt79 Sep 29, 2023
5e3dbf9
Merge branch 'main' into integration-tests-benchmarks
AronisAt79 Oct 5, 2023
6a9f10f
git ignore generated bindings and exclule from fmt check
AronisAt79 Oct 5, 2023
756fdcd
git ignore generated bindings
AronisAt79 Oct 5, 2023
cf3e5a0
fix clippy error: module inception
AronisAt79 Oct 5, 2023
0929b7c
add "install solc" and update erc20 submodule steps in wf main-tests
AronisAt79 Oct 5, 2023
fcd0d7c
remove incorrent line
AronisAt79 Oct 5, 2023
5be6c47
Update main-tests.yml
AronisAt79 Oct 5, 2023
8e224aa
indentation main-tests.yml
AronisAt79 Oct 5, 2023
323209f
move rustfmt.toml ignore block to project root
AronisAt79 Oct 5, 2023
2df88e9
Merge branch 'integration-tests-benchmarks' of https://github.com/pri…
AronisAt79 Oct 5, 2023
92c2457
add #[allow(clippy::all)] to lib.rs for generated modules
AronisAt79 Oct 5, 2023
ca1199f
remove --args from build command
AronisAt79 Oct 5, 2023
accd9e5
use EnumString macro from from strum_macros
AronisAt79 Oct 9, 2023
2ac1ff0
Merge branch 'integration-tests-benchmarks' of https://github.com/pri…
AronisAt79 Oct 9, 2023
cd607d7
allow unused function dump_tx_trace
AronisAt79 Oct 9, 2023
28f6ffc
Update integration-tests/src/bin/gen_blockchain_data.rs
AronisAt79 Oct 10, 2023
46137bd
Update integration-tests/build.rs
AronisAt79 Oct 10, 2023
758d9f8
Update integration-tests/src/bin/gen_blockchain_data.rs
AronisAt79 Oct 10, 2023
0982345
Update integration-tests/src/bin/gen_blockchain_data.rs
AronisAt79 Oct 10, 2023
6422b8c
Update build.rs fmt
AronisAt79 Oct 10, 2023
2c61487
error handling for build script
Oct 13, 2023
2dda504
remove necessary string argument from error types
AronisAt79 Nov 8, 2023
9bf9c1c
remove unnecessary string argument from build error
AronisAt79 Nov 8, 2023
43ee65c
remove unnecessary string argument from build error
AronisAt79 Nov 8, 2023
d80a1b4
modify BuildError variants when no need to return a string
AronisAt79 Nov 10, 2023
3a0a27f
replace ok_or_else() with ok_or() when first one not necessary
AronisAt79 Nov 10, 2023
954ef89
fmt
AronisAt79 Nov 10, 2023
325d1a1
Merge branch 'main' into integration-tests-benchmarks
AronisAt79 Nov 10, 2023
64785e1
fix cargo.lock parsing error: remove duplicate pkg declarations for n…
AronisAt79 Nov 10, 2023
8b9fe66
declare path to solidity file as and catch conversion error
AronisAt79 Nov 10, 2023
ec58e85
simplify compilation error check as per review proposal
AronisAt79 Nov 10, 2023
62ff0cd
add error msg to .expect blocks
AronisAt79 Nov 10, 2023
8c61fd3
use PathBuff methods to derive solidity file base
AronisAt79 Nov 10, 2023
a286505
install openssl on runner
AronisAt79 Nov 10, 2023
1181ccd
Update integration.yml libssl-dev
AronisAt79 Nov 10, 2023
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
4 changes: 4 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ jobs:
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Update git submodule
run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts
- name: Install openssl
run: sudo apt-get install -y pkg-config libssl-dev
# Run an initial build in a separate step to split the build time from execution time
- name: Build bins
run: cargo build --bin gen_blockchain_data
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ jobs:
target/
key: lint-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

- name: Install solc
run: |
sudo wget -O /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-static-linux
sudo chmod +x /usr/bin/solc
- name: Update ERC20 git submodule
run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts
- name: Cargo build
uses: actions-rs/cargo@v1
with:
command: build
- name: Check code format
uses: actions-rs/cargo@v1
with:
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/main-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ jobs:
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Install solc
run: |
sudo wget -O /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-static-linux
sudo chmod +x /usr/bin/solc
- name: Update ERC20 git submodule
run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts
- name: Run light tests # light tests are run in parallel
uses: actions-rs/cargo@v1
with:
Expand Down Expand Up @@ -121,6 +127,12 @@ jobs:
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Install solc
run: |
sudo wget -O /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-static-linux
sudo chmod +x /usr/bin/solc
- name: Update ERC20 git submodule
run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts
- name: Run heavy tests # heavy tests are run serially to avoid OOM
uses: actions-rs/cargo@v1
with:
Expand Down Expand Up @@ -163,6 +175,12 @@ jobs:
~/.cargo/git/db/
target/
key: build-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Install solc
run: |
sudo wget -O /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-static-linux
sudo chmod +x /usr/bin/solc
- name: Update ERC20 git submodule
run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts
- name: cargo build
uses: actions-rs/cargo@v1
with:
Expand Down
59 changes: 55 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions integration-tests/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
gendata_output.json
src/bindings_benchmarks.rs
src/bindings_greeter.rs
src/bindings_openzeppelinerc20testtoken.rs
13 changes: 13 additions & 0 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ paste = "1.0"
rand_xorshift = "0.3.0"
rand_core = "0.6.4"
mock = { path = "../mock" }
this = "0.3.0"
error = "0.1.9"

[dev-dependencies]
pretty_assertions = "1.0.0"
Expand All @@ -35,3 +37,14 @@ rpc = []
circuit_input_builder = []
circuits = []
mock_prover = []

[build-dependencies]
env = "0.0.0"
ethers = "2.0.7"
ethers-contract-abigen = "2.0.8"
glob = "0.3.1"
log = "0.4.14"
serde = "1.0.130"
serde_json = "1.0.66"
uneval = "0.2.4"
thiserror = "1.0.49"
Loading
Loading