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

test: Remove zk-tests in favor of cargo tests #556

Merged
merged 3 commits into from
Sep 5, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/secret_scanner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
path: ./
base: ${{ github.event.repository.default_branch }}
head: HEAD
extra_args: --debug --only-verified --exclude-globs=zk-tests/src/Cheatcodes.t.sol # TODO: Remove this file once merged
extra_args: --debug --only-verified
47 changes: 0 additions & 47 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,32 +89,6 @@ jobs:
cache-on-failure: true
- name: cargo hack
run: cargo hack check

# TODO: This test currently hangs in the CI
# zk-test:
# name: zk-test
# runs-on: ubuntu-22.04-github-hosted-16core
# steps:
# - uses: actions/checkout@v4
# with:
# submodules: recursive
# ref: ${{ github.event.pull_request.head.sha }}

# - name: Install Rust
# uses: actions-rust-lang/setup-rust-toolchain@v1
# with:
# toolchain: nightly-2024-04-28


# - name: Get solc
# run: |
# mkdir /tmp/solc-bin
# wget https://github.com/ethereum/solidity/releases/download/v0.8.24/solc-static-linux -qO /tmp/solc-bin/solc
# chmod +x /tmp/solc-bin/solc
# echo "/tmp/solc-bin" >> $GITHUB_PATH

# - name: Test ZK VM
# run: RUST_LOG=1 cargo test --package forge --test it --jobs=1 -- zk

zk-cargo-test:
name: zk-cargo-test
Expand Down Expand Up @@ -147,27 +121,6 @@ jobs:
RUST_BACKTRACE: full
TEST_MAINNET_URL: http://localhost:8011
run: cargo test zk

zk-smoke-test:
name: zk-smoke-test
runs-on: ubuntu-22.04-github-hosted-16core

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
ref: ${{ github.event.pull_request.head.sha }}

- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2024-04-28

- name: Run smoke-test
env:
RUST_BACKTRACE: full
run: cd zk-tests && ./test.sh

check-ci-install:
name: CI install
Expand Down
12 changes: 0 additions & 12 deletions .gitmodules

This file was deleted.

10 changes: 0 additions & 10 deletions zk-tests/.gitignore

This file was deleted.

22 changes: 0 additions & 22 deletions zk-tests/foundry.toml

This file was deleted.

1 change: 0 additions & 1 deletion zk-tests/lib/ds-test
Submodule ds-test deleted from e28215
1 change: 0 additions & 1 deletion zk-tests/lib/forge-std
Submodule forge-std deleted from 2f6762
1 change: 0 additions & 1 deletion zk-tests/lib/openzeppelin-contracts
Submodule openzeppelin-contracts deleted from dbb610
1 change: 0 additions & 1 deletion zk-tests/lib/solmate
Submodule solmate deleted from c89230
32 changes: 0 additions & 32 deletions zk-tests/script/Deploy.s.sol

This file was deleted.

72 changes: 0 additions & 72 deletions zk-tests/script/Factory.s.sol

This file was deleted.

72 changes: 0 additions & 72 deletions zk-tests/script/NFT.s.sol

This file was deleted.

30 changes: 0 additions & 30 deletions zk-tests/script/Proxy.s.sol

This file was deleted.

Loading