Skip to content
Merged

fix #463

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
28 changes: 12 additions & 16 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -283,19 +283,18 @@ jobs:
with:
submodules: recursive

- name: Install nightly toolchain with check available
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly
target: wasm32-unknown-unknown
- name: Install nightly toolchain
run: |
rustup install nightly
rustup +nightly target add wasm32-unknown-unknown

- name: Run no-std build concordium-std
working-directory: concordium-std
run: cargo build --target wasm32-unknown-unknown --no-default-features --features bump_alloc
run: cargo +nightly build --target wasm32-unknown-unknown --no-default-features --features bump_alloc

- name: Run no-std build concordium-cis2
working-directory: concordium-cis2
run: cargo build --target wasm32-unknown-unknown --no-default-features --features concordium-std/bump_alloc
run: cargo +nightly build --target wasm32-unknown-unknown --no-default-features --features concordium-std/bump_alloc

check-no-std-examples:
name: Build on nightly,
Expand Down Expand Up @@ -328,17 +327,14 @@ jobs:
with:
submodules: recursive

- name: Install nightly toolchain with check available
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly
target: ${{ matrix.target }}
- name: Install nightly toolchain
run: |
rustup install nightly
rustup +nightly target add wasm32-unknown-unknown

- name: Run cargo check with no-std
uses: actions-rs/cargo@v1
with:
command: build
args: --manifest-path ${{ matrix.crates }} --target=${{ matrix.target }} --no-default-features --features=${{ matrix.features }} --features bump_alloc
run: |
cargo +nightly build --manifest-path ${{ matrix.crates }} --target=${{ matrix.target }} --no-default-features --features=${{ matrix.features }} --features bump_alloc

check-crypto-examples:
name: Check crypto examples
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ Cargo.lock
# Nix artifacts
**/*.nix
**/flake.lock

.idea
6 changes: 6 additions & 0 deletions contract-testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,11 @@ thiserror = "1.0"
num-bigint = "0.4"
num-integer = "0.1"

# Pin versions to be compatible with 1.73. Remove pins when MSRV is pumped
rayon = ">=1.0, <1.11"
rayon-core = ">=1.0, <1.13"
serde_with = ">=3.0, <3.13"
ed25519-dalek = ">=2.0, <2.2.0"

[dev-dependencies]
rand = "0.8"
6 changes: 3 additions & 3 deletions contract-testing/src/impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ impl ChainBuilder {
/// [`micro_ccd_per_euro`][Self::micro_ccd_per_euro].
///
/// # Example
/// ```
/// ```no_run
/// # use concordium_smart_contract_testing::*;
/// let chain = ChainBuilder::new()
/// .external_node_connection(Endpoint::from_static("http://node.testnet.concordium.com:20000"))
Expand All @@ -257,7 +257,7 @@ impl ChainBuilder {
/// [`euro_per_energy`][Self::euro_per_energy].
///
/// # Example
/// ```
/// ```no_run
/// # use concordium_smart_contract_testing::*;
/// let chain = ChainBuilder::new()
/// .external_node_connection(Endpoint::from_static("http://node.testnet.concordium.com:20000"))
Expand Down Expand Up @@ -298,7 +298,7 @@ impl ChainBuilder {
/// [`block_time`][Self::block_time].
///
/// # Example
/// ```
/// ```no_run
/// # use concordium_smart_contract_testing::*;
/// let chain = ChainBuilder::new()
/// .external_node_connection(Endpoint::from_static("http://node.testnet.concordium.com:20000"))
Expand Down
Loading