From 3be1556ae3802f0811b3801db8c31ce909286253 Mon Sep 17 00:00:00 2001 From: yito88 Date: Thu, 29 Aug 2024 13:56:00 +0200 Subject: [PATCH] fix for Hermes 1.10.2 --- .github/workflows/namada.yaml | 20 +++++++++---------- .../src/tests/async_icq/simple_query.rs | 6 +++--- tools/integration-test/src/tests/ica.rs | 2 +- .../ica_ordered_channel.rs | 2 +- .../tests/interchain_security/ica_transfer.rs | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/namada.yaml b/.github/workflows/namada.yaml index e6f71f3888..1ff7b18457 100644 --- a/.github/workflows/namada.yaml +++ b/.github/workflows/namada.yaml @@ -90,11 +90,11 @@ jobs: release_url=$(curl -s "https://api.github.com/repos/anoma/namada/releases/170839589" | grep "browser_download_url" | cut -d '"' -f 4 | grep "$OPERATING_SYSTEM") wget "$release_url" tar -xzvf namada*.tar.gz - cp ./namada*/namadac ~/local/bin/namadac - cp ./namada*/namadan ~/local/bin/namadan - cp ./namada*/namadaw ~/local/bin/namadaw - cp ./namada*/namada ~/local/bin/namada - cp ./namada*/wasm/* $NAMADA_REPO_PATH/wasm + cp ./namada-*/namadac ~/local/bin/namadac + cp ./namada-*/namadan ~/local/bin/namadan + cp ./namada-*/namadaw ~/local/bin/namadaw + cp ./namada-*/namada ~/local/bin/namada + cp ./namada-*/wasm/*.wasm $NAMADA_REPO_PATH/wasm - name: Update environment path run: | echo "${HOME}/local/bin" >> $GITHUB_PATH @@ -164,11 +164,11 @@ jobs: release_url=$(curl -s "https://api.github.com/repos/anoma/namada/releases/170839589" | grep "browser_download_url" | cut -d '"' -f 4 | grep "$OPERATING_SYSTEM") wget "$release_url" tar -xzvf namada*.tar.gz - cp ./namada*/namadac ~/local/bin/namadac - cp ./namada*/namadan ~/local/bin/namadan - cp ./namada*/namadaw ~/local/bin/namadaw - cp ./namada*/namada ~/local/bin/namada - cp ./namada*/wasm/* $NAMADA_REPO_PATH/wasm + cp ./namada-*/namadac ~/local/bin/namadac + cp ./namada-*/namadan ~/local/bin/namadan + cp ./namada-*/namadaw ~/local/bin/namadaw + cp ./namada-*/namada ~/local/bin/namada + cp ./namada-*/wasm/* $NAMADA_REPO_PATH/wasm - name: Update environment path run: | echo "${HOME}/local/bin" >> $GITHUB_PATH diff --git a/tools/integration-test/src/tests/async_icq/simple_query.rs b/tools/integration-test/src/tests/async_icq/simple_query.rs index e63a7c88f0..bce4a2c69b 100644 --- a/tools/integration-test/src/tests/async_icq/simple_query.rs +++ b/tools/integration-test/src/tests/async_icq/simple_query.rs @@ -2,7 +2,7 @@ use std::env; use ibc_relayer::channel::version::Version; use ibc_relayer::config::ChainConfig; -use ibc_test_framework::chain::config::{ +use ibc_test_framework::chain::config::cosmos::{ add_allow_message_interchainquery, set_floor_gas_price, set_max_deposit_period, set_min_deposit_amount, set_voting_period, }; @@ -217,7 +217,7 @@ impl BinaryConnectionTest for FailedAsyncIcqTest { connection: ConnectedConnection, ) -> Result<(), Error> { let fee_denom_b: MonoTagged = - MonoTagged::new(Denom::base(config.native_token(1))); + MonoTagged::new(Denom::base(config.native_token(1), config.native_token(1))); let port_a = DualTagged::new(PortId::oracle()); let port_b = DualTagged::new(PortId::icqhost()); let (channel_id_b, channel_id_a) = init_channel_version( @@ -371,7 +371,7 @@ fn assert_eventual_async_icq_error( relayer: &RelayerDriver, ) -> Result<(), Error> { let rpc_addr = match relayer.config.chains.first().unwrap() { - ChainConfig::CosmosSdk(c) => c.rpc_addr.clone(), + ChainConfig::CosmosSdk(c) | ChainConfig::Namada(c) => c.rpc_addr.clone(), }; let mut rpc_client = HttpClient::new(rpc_addr).unwrap(); diff --git a/tools/integration-test/src/tests/ica.rs b/tools/integration-test/src/tests/ica.rs index 60d4b6c730..a6fb40408f 100644 --- a/tools/integration-test/src/tests/ica.rs +++ b/tools/integration-test/src/tests/ica.rs @@ -17,7 +17,7 @@ use ibc_relayer_types::timestamp::Timestamp; use ibc_relayer_types::tx_msg::Msg; use ibc_test_framework::chain::{ - config::add_allow_message_interchainaccounts, + config::cosmos::add_allow_message_interchainaccounts, ext::ica::{register_ordered_interchain_account, register_unordered_interchain_account}, }; use ibc_test_framework::prelude::*; diff --git a/tools/integration-test/src/tests/interchain_security/ica_ordered_channel.rs b/tools/integration-test/src/tests/interchain_security/ica_ordered_channel.rs index c79722d45c..651a96f404 100644 --- a/tools/integration-test/src/tests/interchain_security/ica_ordered_channel.rs +++ b/tools/integration-test/src/tests/interchain_security/ica_ordered_channel.rs @@ -17,7 +17,7 @@ use ibc_relayer_types::bigint::U256; use ibc_relayer_types::signer::Signer; use ibc_relayer_types::timestamp::Timestamp; use ibc_relayer_types::tx_msg::Msg; -use ibc_test_framework::chain::config::add_allow_message_interchainaccounts; +use ibc_test_framework::chain::config::cosmos::add_allow_message_interchainaccounts; use ibc_test_framework::chain::ext::ica::register_ordered_interchain_account; use ibc_test_framework::framework::binary::channel::run_binary_interchain_security_channel_test; use ibc_test_framework::prelude::*; diff --git a/tools/integration-test/src/tests/interchain_security/ica_transfer.rs b/tools/integration-test/src/tests/interchain_security/ica_transfer.rs index 0fe38af5f0..dfedfc9951 100644 --- a/tools/integration-test/src/tests/interchain_security/ica_transfer.rs +++ b/tools/integration-test/src/tests/interchain_security/ica_transfer.rs @@ -11,7 +11,7 @@ use ibc_relayer_types::bigint::U256; use ibc_relayer_types::signer::Signer; use ibc_relayer_types::timestamp::Timestamp; use ibc_relayer_types::tx_msg::Msg; -use ibc_test_framework::chain::config::add_allow_message_interchainaccounts; +use ibc_test_framework::chain::config::cosmos::add_allow_message_interchainaccounts; use ibc_test_framework::chain::ext::ica::register_unordered_interchain_account; use ibc_test_framework::framework::binary::channel::run_binary_interchain_security_channel_test; use ibc_test_framework::prelude::*;