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.

Sign up for GitHub

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

Move old shielder code to a legacy folder #41

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Move old shielder code to a legacy folder #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,33 @@ jobs:
run: rustup target add wasm32-unknown-unknown

- name: Run format check for `shielder/cli`
run: cd shielder/cli/ && cargo fmt --all --check
run: cd legacy-shielder/cli/ && cargo fmt --all --check

- name: Run clippy for `shielder/cli`
run: cd shielder/cli/ && cargo clippy --all-features -- --no-deps -D warnings
run: cd legacy-shielder/cli/ && cargo clippy --all-features -- --no-deps -D warnings

- name: Run tests for `shielder/cli`
run: cd shielder/cli/ && cargo test
run: cd legacy-shielder/cli/ && cargo test


- name: Run format check for `shielder/contract`
run: cd shielder/contract/ && cargo fmt --all --check
run: cd legacy-shielder/contract/ && cargo fmt --all --check

- name: Run clippy for `shielder/contract`
run: cd shielder/contract/ && cargo clippy --all-features -- --no-deps -D warnings
run: cd legacy-shielder/contract/ && cargo clippy --all-features -- --no-deps -D warnings

- name: Run tests for `shielder/contract`
run: cd shielder/contract/ && cargo test
run: cd legacy-shielder/contract/ && cargo test


- name: Run format check for `shielder/public_token`
run: cd shielder/public_token/ && cargo fmt --all --check
run: cd legacy-shielder/public_token/ && cargo fmt --all --check

- name: Run clippy for `shielder/public_token`
run: cd shielder/public_token/ && cargo clippy --all-features -- --no-deps -D warnings
run: cd legacy-shielder/public_token/ && cargo clippy --all-features -- --no-deps -D warnings

- name: Run tests for `shielder/public_token`
run: cd shielder/public_token/ && cargo test
run: cd legacy-shielder/public_token/ && cargo test

build-contracts:
runs-on: [self-hosted, Linux, X64, large]
Expand All @@ -73,12 +73,12 @@ jobs:
-v ${{ github.workspace }}:/code \
--platform linux/amd64 \
${{ env.DOCKER_IMAGE }} \
cargo contract build --manifest-path shielder/public_token/Cargo.toml
cargo contract build --manifest-path legacy-shielder/public_token/Cargo.toml

- name: Build shielder contract
run: |
docker run \
-v ${{ github.workspace }}:/code \
--platform linux/amd64 \
${{ env.DOCKER_IMAGE }} \
cargo contract build --manifest-path shielder/contract/Cargo.toml
cargo contract build --manifest-path legacy-shielder/contract/Cargo.toml
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This repository is a collection of smart-contract applications based on ZK-SNARK

Included:

- [shielder](shielder/) - shielding and unshielding PSP22 tokens
- [shielder](legacy-shielder/) - shielding and unshielding PSP22 tokens

## License

Expand Down
0 shielder/Makefile → legacy-shielder/Makefile
View file
Open in desktop
File renamed without changes.
0 shielder/README.md → legacy-shielder/README.md
View file
Open in desktop
File renamed without changes.
0 shielder/cli/Cargo.lock → legacy-shielder/cli/Cargo.lock
View file
Open in desktop
File renamed without changes.
0 shielder/cli/Cargo.toml → legacy-shielder/cli/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 shielder/cli/README.md → legacy-shielder/cli/README.md
View file
Open in desktop
File renamed without changes.
0 shielder/cli/src/app_state.rs → legacy-shielder/cli/src/app_state.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/src/config.rs → legacy-shielder/cli/src/config.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/src/contract.rs → legacy-shielder/cli/src/contract.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/src/deposit.rs → legacy-shielder/cli/src/deposit.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/src/ink_contract.rs → legacy-shielder/cli/src/ink_contract.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/src/lib.rs → legacy-shielder/cli/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/src/main.rs → legacy-shielder/cli/src/main.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/src/merge.rs → legacy-shielder/cli/src/merge.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/src/state_file.rs → legacy-shielder/cli/src/state_file.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/src/withdraw.rs → legacy-shielder/cli/src/withdraw.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/tests/integration_tests.rs → ...y-shielder/cli/tests/integration_tests.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/tests/psp22/mod.rs → legacy-shielder/cli/tests/psp22/mod.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/tests/setup_local.sh → legacy-shielder/cli/tests/setup_local.sh
View file
Open in desktop
File renamed without changes.
0 shielder/cli/tests/shielder_wrapper/mod.rs → ...hielder/cli/tests/shielder_wrapper/mod.rs
View file
Open in desktop
File renamed without changes.
0 shielder/cli/tests/utils/mod.rs → legacy-shielder/cli/tests/utils/mod.rs
View file
Open in desktop
File renamed without changes.
0 shielder/contract/Cargo.lock → legacy-shielder/contract/Cargo.lock
View file
Open in desktop
File renamed without changes.
0 shielder/contract/Cargo.toml → legacy-shielder/contract/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 shielder/contract/src/contract.rs → legacy-shielder/contract/src/contract.rs
View file
Open in desktop
File renamed without changes.
0 shielder/contract/src/error.rs → legacy-shielder/contract/src/error.rs
View file
Open in desktop
File renamed without changes.
0 shielder/contract/src/lib.rs → legacy-shielder/contract/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 shielder/deploy/deploy.sh → legacy-shielder/deploy/deploy.sh
View file
Open in desktop
File renamed without changes.
0 shielder/deploy/docker-compose.yml → legacy-shielder/deploy/docker-compose.yml
View file
Open in desktop
File renamed without changes.
0 shielder/public_token/Cargo.lock → legacy-shielder/public_token/Cargo.lock
View file
Open in desktop
File renamed without changes.
0 shielder/public_token/Cargo.toml → legacy-shielder/public_token/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 shielder/public_token/lib.rs → legacy-shielder/public_token/lib.rs
View file
Open in desktop
File renamed without changes.
Loading