From 70e148b3ed61c87de1da54eae7a694bbb8ebc782 Mon Sep 17 00:00:00 2001 From: Drazen Urch Date: Wed, 8 Dec 2021 16:15:18 +0100 Subject: [PATCH] Run CI for all contracts in one workflow (#948) * Run CI for all contracts in one workflow * Rename * Fix vesting tests --- .../{mixnet_contract.yml => contracts.yml} | 12 ++-- .github/workflows/erc20_bridge_contract.yml | 58 ------------------- ...let-publish.yml => nym-wallet-publish.yml} | 2 +- ...-wallet-types.yml => nym-wallet-types.yml} | 0 contracts/vesting/src/vesting/mod.rs | 6 ++ 5 files changed, 13 insertions(+), 65 deletions(-) rename .github/workflows/{mixnet_contract.yml => contracts.yml} (82%) delete mode 100644 .github/workflows/erc20_bridge_contract.yml rename .github/workflows/{tauri-wallet-publish.yml => nym-wallet-publish.yml} (85%) rename .github/workflows/{tauri-wallet-types.yml => nym-wallet-types.yml} (100%) diff --git a/.github/workflows/mixnet_contract.yml b/.github/workflows/contracts.yml similarity index 82% rename from .github/workflows/mixnet_contract.yml rename to .github/workflows/contracts.yml index c2c57057c1..c347a76e86 100644 --- a/.github/workflows/mixnet_contract.yml +++ b/.github/workflows/contracts.yml @@ -1,4 +1,4 @@ -name: Mixnet Contract +name: Contracts on: push: @@ -21,7 +21,7 @@ jobs: with: inputFile: '.github/workflows/contract_matrix_includes.json' filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]' - mixnet-contract: + contracts: # since it's going to be compiled into wasm, there's absolutely # no point in running CI on different OS-es runs-on: ubuntu-latest @@ -45,20 +45,20 @@ jobs: RUSTFLAGS: '-C link-arg=-s' with: command: build - args: --manifest-path contracts/mixnet/Cargo.toml --target wasm32-unknown-unknown + args: --manifest-path contracts/Cargo.toml --target wasm32-unknown-unknown - uses: actions-rs/cargo@v1 with: command: test - args: --manifest-path contracts/mixnet/Cargo.toml + args: --manifest-path contracts/Cargo.toml - uses: actions-rs/cargo@v1 with: command: fmt - args: --manifest-path contracts/mixnet/Cargo.toml -- --check + args: --manifest-path contracts/Cargo.toml -- --check - uses: actions-rs/cargo@v1 if: ${{ matrix.rust != 'nightly' }} with: command: clippy - args: --manifest-path contracts/mixnet/Cargo.toml -- -D warnings \ No newline at end of file + args: --manifest-path contracts/Cargo.toml -- -D warnings \ No newline at end of file diff --git a/.github/workflows/erc20_bridge_contract.yml b/.github/workflows/erc20_bridge_contract.yml deleted file mode 100644 index 9046fda870..0000000000 --- a/.github/workflows/erc20_bridge_contract.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: ERC20 Bridge Contract - -on: [ push, pull_request ] - -jobs: - matrix_prep: - runs-on: ubuntu-latest - outputs: - matrix: ${{ steps.set-matrix.outputs.matrix }} - steps: - # creates the matrix strategy from build_matrix_includes.json - - uses: actions/checkout@v2 - - id: set-matrix - uses: JoshuaTheMiller/conditional-build-matrix@main - with: - inputFile: '.github/workflows/contract_matrix_includes.json' - filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]' - erc20-bridge-contract: - needs: matrix_prep - strategy: - matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}} - # since it's going to be compiled into wasm, there's absolutely - # no point in running CI on different OS-es - runs-on: ubuntu-latest - continue-on-error: ${{ matrix.rust == 'nightly' }} - steps: - - uses: actions/checkout@v2 - - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - target: wasm32-unknown-unknown - override: true - components: rustfmt, clippy - - - uses: actions-rs/cargo@v1 - env: - RUSTFLAGS: '-C link-arg=-s' - with: - command: build - args: --manifest-path contracts/erc20-bridge/Cargo.toml --target wasm32-unknown-unknown - - - uses: actions-rs/cargo@v1 - with: - command: test - args: --manifest-path contracts/erc20-bridge/Cargo.toml - - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --manifest-path contracts/erc20-bridge/Cargo.toml -- --check - - - uses: actions-rs/cargo@v1 - if: ${{ matrix.rust != 'nightly' }} - with: - command: clippy - args: --manifest-path contracts/erc20-bridge/Cargo.toml -- -D warnings diff --git a/.github/workflows/tauri-wallet-publish.yml b/.github/workflows/nym-wallet-publish.yml similarity index 85% rename from .github/workflows/tauri-wallet-publish.yml rename to .github/workflows/nym-wallet-publish.yml index 09a5b6b055..95544979af 100644 --- a/.github/workflows/tauri-wallet-publish.yml +++ b/.github/workflows/nym-wallet-publish.yml @@ -1,4 +1,4 @@ -name: Publish Tauri Wallet +name: Publish Nym Wallet on: push: tags: diff --git a/.github/workflows/tauri-wallet-types.yml b/.github/workflows/nym-wallet-types.yml similarity index 100% rename from .github/workflows/tauri-wallet-types.yml rename to .github/workflows/nym-wallet-types.yml diff --git a/contracts/vesting/src/vesting/mod.rs b/contracts/vesting/src/vesting/mod.rs index 0e30ba5e1a..1680b12658 100644 --- a/contracts/vesting/src/vesting/mod.rs +++ b/contracts/vesting/src/vesting/mod.rs @@ -252,6 +252,7 @@ mod tests { // Try delegating too much let err = account.try_bond_mixnode( mix_node.clone(), + "alice".to_string(), Coin { amount: Uint128::new(1_000_000_000_001), denom: DENOM.to_string(), @@ -263,6 +264,7 @@ mod tests { let ok = account.try_bond_mixnode( mix_node.clone(), + "alice".to_string(), Coin { amount: Uint128::new(500_000_000_000), denom: DENOM.to_string(), @@ -278,6 +280,7 @@ mod tests { // Try delegating too much again let err = account.try_bond_mixnode( mix_node, + "alice".to_string(), Coin { amount: Uint128::new(500_000_000_001), denom: DENOM.to_string(), @@ -362,6 +365,7 @@ mod tests { // Try delegating too much let err = account.try_bond_gateway( gateway.clone(), + "alice".to_string(), Coin { amount: Uint128::new(1_000_000_000_001), denom: DENOM.to_string(), @@ -373,6 +377,7 @@ mod tests { let ok = account.try_bond_gateway( gateway.clone(), + "alice".to_string(), Coin { amount: Uint128::new(500_000_000_000), denom: DENOM.to_string(), @@ -388,6 +393,7 @@ mod tests { // Try delegating too much again let err = account.try_bond_gateway( gateway, + "alice".to_string(), Coin { amount: Uint128::new(500_000_000_001), denom: DENOM.to_string(),