diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b8d50be..b9a4b91 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -51,26 +51,12 @@ jobs: path: | ./contracts/*.wasm ./contracts/*.contract - build-test-runner: - runs-on: ubuntu-22.04 - steps: - - name: get jq - run: | - sudo apt-get update - sudo apt-get install jq -y - - name: build runner - run: cp "$(cargo test --no-run --message-format=json | jq -r "select(.profile.test == true) | .filenames[]")" ./test-binary - working-directory: subxt-tests - - uses: actions/upload-artifact@v3 - with: - name: test-runner - path: ./subxt-tests/test-binary integration-tests-generic-clients: runs-on: ubuntu-22.04 needs: - build-solidity - build-ink - - build-test-runner + # - build-test-runner steps: - uses: actions/checkout@v3 - name: Login to GAR @@ -87,21 +73,16 @@ jobs: with: name: ink path: ./contracts/ - - uses: actions/download-artifact@v3 - with: - name: test-runner - path: ./subxt-tests/test-binary - name: start laguna-chain:devnet - run: docker run -d -p 9944:9944 us-docker.pkg.dev/laguna-chain/laguna-chain/laguna-chain:0.1.2_evm_compat --dev --ws-external + run: docker run -d -p 9944:9944 us-docker.pkg.dev/laguna-chain/laguna-chain/laguna-chain:0.1.4 --dev --ws-external - name: Run tests - run: ./test-binary generic_client --test-threads=1 + run: cargo test generic_client -- --test-threads=1 working-directory: subxt-tests integration-tests-eth-clients: runs-on: ubuntu-22.04 needs: - build-solidity - build-ink - - build-test-runner steps: - uses: actions/checkout@v3 - name: Login to GAR @@ -118,12 +99,8 @@ jobs: with: name: ink path: ./contracts/ - - uses: actions/download-artifact@v3 - with: - name: test-runner - path: ./subxt-tests/test-binary - name: start laguna-chain:devnet - run: docker run -d -p 9944:9944 us-docker.pkg.dev/laguna-chain/laguna-chain/laguna-chain:0.1.2_evm_compat --dev --ws-external + run: docker run -d -p 9944:9944 us-docker.pkg.dev/laguna-chain/laguna-chain/laguna-chain:0.1.4 --dev --ws-external - name: Run tests - run: ./test-binary eth_client --test-threads=1 + run: cargo test eth_client -- --test-threads=1 working-directory: subxt-tests diff --git a/subxt-tests/laguna-dev.scale b/subxt-tests/laguna-dev.scale deleted file mode 100644 index 8ccec0b..0000000 Binary files a/subxt-tests/laguna-dev.scale and /dev/null differ diff --git a/subxt-tests/laguna.scale b/subxt-tests/laguna.scale index 8ccec0b..c412b92 100644 Binary files a/subxt-tests/laguna.scale and b/subxt-tests/laguna.scale differ diff --git a/subxt-tests/src/eth_client/cases/issue666.rs b/subxt-tests/src/eth_client/cases/issue666.rs index f577fca..d8e14c8 100644 --- a/subxt-tests/src/eth_client/cases/issue666.rs +++ b/subxt-tests/src/eth_client/cases/issue666.rs @@ -48,17 +48,17 @@ async fn case() -> anyhow::Result<()> { .await?; } + let nonce = eth_client_wrapper + .get_transaction_counts(eth_alice, None) + .await?; + let mut create_payload = TxWrapper::::create( 0_u32.into(), code.into(), selector.into(), - Bytes::from(vec![]), + Bytes::from(vec![nonce.as_u128() as u8]), ); - let nonce = eth_client_wrapper - .get_transaction_counts(eth_alice, None) - .await?; - create_payload.chain_id.replace(1000); create_payload.nonce = nonce; create_payload.gas_limit = U256::from(10_u32).pow(18_u32.into()); @@ -71,5 +71,7 @@ async fn case() -> anyhow::Result<()> { let tx_id = eth_client_wrapper.send_raw_transaction(raw.into()).await?; + dbg!(tx_id); + Ok(()) }