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

Move the testing library to rust-SCs repository #122

Merged
merged 1 commit into from
Sep 18, 2023
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
40 changes: 5 additions & 35 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ on:
- synchronize
- ready_for_review
paths:
- cargo-concordium/**/*
- concordium-smart-contract-testing/**/*
- rustfmt.toml
- concordium-base
- 'cargo-concordium/**/*.rs'
- 'cargo-concordium/**/*.toml'
- 'rustfmt.toml'
- 'concordium-base'

workflow_dispatch: # allows manual trigger

Expand All @@ -38,7 +38,6 @@ jobs:
matrix:
build-dir:
- 'cargo-concordium'
- 'concordium-smart-contract-testing'
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -54,33 +53,6 @@ jobs:
run: |
cargo fmt -- --color=always --check

"lint_clippy_libraries":
name: ${{ matrix.build-dir }} lint:clippy
# Don't run on draft pull requests
if: ${{ !github.event.pull_request.draft }}
runs-on: ubuntu-latest
strategy:
matrix:
build-dir:
- 'concordium-smart-contract-testing'
steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: recursive
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.RUST_CLIPPY }}
override: true
components: clippy
- name: Clippy
working-directory: ${{ matrix.build-dir }}
run: |
git config --global url."https://github.com/".insteadOf "[email protected]:"
cargo clippy --color=always --tests --benches -- -Dclippy::all

# For binaries we additionally commit the lock file. And we want to ensure
# that the file is up-to-date.
"lint_clippy_binaries":
Expand Down Expand Up @@ -120,7 +92,6 @@ jobs:
matrix:
build-dir:
- 'cargo-concordium'
- 'concordium-smart-contract-testing'
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -146,7 +117,6 @@ jobs:
matrix:
build-dir:
- 'cargo-concordium'
- 'concordium-smart-contract-testing'
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -160,4 +130,4 @@ jobs:
override: true
- name: Test
working-directory: ${{ matrix.build-dir }}
run: cargo test -- --skip io_tests # Skip the I/O tests in the testing library.
run: cargo test
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "concordium-rust-sdk"]
path = concordium-rust-sdk
url = [email protected]:Concordium/concordium-rust-sdk.git
[submodule "concordium-base"]
path = concordium-base
url = [email protected]:Concordium/concordium-base.git
6 changes: 3 additions & 3 deletions cargo-concordium/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ rand = { version = "=0.7", features = ["small_rng"] }
cargo_metadata = "0.15"

[dependencies.concordium-wasm]
path = "../concordium-rust-sdk/concordium-base/smart-contracts/wasm-transform"
path = "../concordium-base/smart-contracts/wasm-transform"
version = "3.0"

[dependencies.concordium-smart-contract-engine]
version = "3.0"
path = "../concordium-rust-sdk/concordium-base/smart-contracts/wasm-chain-integration/"
path = "../concordium-base/smart-contracts/wasm-chain-integration/"
features = ["display-state"]

[dependencies.concordium-contracts-common]
version = "8.0"
path = "../concordium-rust-sdk/concordium-base/concordium-contracts-common/concordium-contracts-common"
path = "../concordium-base/concordium-contracts-common/concordium-contracts-common"
features = ["derive-serde", "std"]
1 change: 1 addition & 0 deletions concordium-base
Submodule concordium-base added at 90c37d
1 change: 0 additions & 1 deletion concordium-rust-sdk
Submodule concordium-rust-sdk deleted from 0173cb
1 change: 0 additions & 1 deletion concordium-smart-contract-testing/.gitignore

This file was deleted.

47 changes: 0 additions & 47 deletions concordium-smart-contract-testing/CHANGELOG.md

This file was deleted.

28 changes: 0 additions & 28 deletions concordium-smart-contract-testing/Cargo.toml

This file was deleted.

17 changes: 0 additions & 17 deletions concordium-smart-contract-testing/README.md

This file was deleted.

49 changes: 0 additions & 49 deletions concordium-smart-contract-testing/src/constants.rs

This file was deleted.

Loading