Skip to content

Commit

Permalink
fix tests between gaia and namada
Browse files Browse the repository at this point in the history
  • Loading branch information
@yito88
yito88 committed Jul 9, 2024
1 parent 6899c72 commit 7688fc4
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 24 deletions.
8 changes: 4 additions & 4 deletions tools/integration-test/src/tests/clear_packet.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ impl BinaryChannelTest for ClearPacketTest {
sleep(Duration::from_secs(1));

let amount_b = amount2.transfer(
&chains.node_b.chain_driver().value().chain_type,
&chains.node_a.chain_driver().value().chain_type,
&channel.port_b.as_ref(),
&channel.channel_id_b.as_ref(),
)?;
Expand Down Expand Up @@ -187,7 +187,7 @@ impl BinaryChannelTest for ClearPacketRecoveryTest {
)?;

let denom_b2 = derive_ibc_denom(
&chains.node_b.chain_driver().value().chain_type,
&chains.node_a.chain_driver().value().chain_type,
&channel.port_b.as_ref(),
&channel.channel_id_b.as_ref(),
&denom_a,
Expand Down Expand Up @@ -255,7 +255,7 @@ impl BinaryChannelTest for ClearPacketNoScanTest {
)?;

let denom_b2 = derive_ibc_denom(
&chains.node_b.chain_driver().value().chain_type,
&chains.node_a.chain_driver().value().chain_type,
&channel.port_b.as_ref(),
&channel.channel_id_b.as_ref(),
&denom_a,
Expand Down Expand Up @@ -381,7 +381,7 @@ impl BinaryChannelTest for ClearPacketOverrideTest {
)?;

let denom_b2 = derive_ibc_denom(
&chains.node_b.chain_driver().value().chain_type,
&chains.node_a.chain_driver().value().chain_type,
&channel.port_b.as_ref(),
&channel.channel_id_b.as_ref(),
&denom_a,
Expand Down
2 changes: 1 addition & 1 deletion tools/integration-test/src/tests/client_expiration.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ impl BinaryChainTest for ChannelExpirationTest {
},
// From simapp version v7.1.0 if `ConnOpenInit` is sent while the client
// is expired, an error will be returned.
Err(e) => match chains.node_a.chain_driver().value().chain_type {
Err(e) => match chains.node_b.chain_driver().value().chain_type {
ChainType::Namada => {
// See https://github.com/cosmos/ibc-rs/blob/v0.53.0/ibc-core/ics02-client/types/src/error.rs#L22
assert!(e.to_string().contains("client is not active. Status=`Expired`"))
Expand Down
2 changes: 1 addition & 1 deletion tools/integration-test/src/tests/denom_trace.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl BinaryChannelTest for IbcDenomTraceTest {
)?;

let denom_b = derive_ibc_denom(
&chains.node_b.chain_driver().value().chain_type,
&chains.node_a.chain_driver().value().chain_type,
&channel.port_b.as_ref(),
&channel.channel_id_b.as_ref(),
&denom_a,
Expand Down
4 changes: 2 additions & 2 deletions tools/integration-test/src/tests/memo.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ impl BinaryChannelTest for MemoTest {
)?;

let denom_b = derive_ibc_denom(
&chains.node_b.chain_driver().value().chain_type,
&chains.node_a.chain_driver().value().chain_type,
&channel.port_b.as_ref(),
&channel.channel_id_b.as_ref(),
&denom_a,
Expand Down Expand Up @@ -130,7 +130,7 @@ impl BinaryChannelTest for MemoOverwriteTest {
)?;

let denom_b = derive_ibc_denom(
&chains.node_b.chain_driver().value().chain_type,
&chains.node_a.chain_driver().value().chain_type,
&channel.port_b.as_ref(),
&channel.channel_id_b.as_ref(),
&denom_a,
Expand Down
4 changes: 2 additions & 2 deletions tools/integration-test/src/tests/supervisor.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ impl BinaryChainTest for SupervisorTest {
let denom_a = chains.node_a.denom();

let denom_b = derive_ibc_denom(
&chains.node_b.chain_driver().value().chain_type,
&chains.node_a.chain_driver().value().chain_type,
&port_b.as_ref(),
&channel_id_b.as_ref(),
&denom_a,
Expand Down Expand Up @@ -210,7 +210,7 @@ impl BinaryChannelTest for SupervisorScanTest {
));

let denom_b = derive_ibc_denom(
&chains.node_b.chain_driver().value().chain_type,
&chains.node_a.chain_driver().value().chain_type,
&channels.port_b.as_ref(),
&channels.channel_id_b.as_ref(),
&denom_a,
Expand Down
39 changes: 28 additions & 11 deletions tools/integration-test/src/tests/tendermint/sequential.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::time::Instant;
use ibc_relayer::chain::tracking::TrackedMsgs;
use ibc_relayer::config::types::max_msg_num::MaxMsgNum;
use ibc_relayer::config::ChainConfig;
use ibc_test_framework::chain::chain_type::ChainType;
use ibc_test_framework::chain::config;
use ibc_test_framework::prelude::*;
use ibc_test_framework::relayer::transfer::build_transfer_message;
Expand Down Expand Up @@ -104,16 +105,28 @@ impl BinaryChannelTest for SequentialCommitTest {
TOTAL_MESSAGES, duration
);

// Time taken for submitting sequential batches should be around number of transactions * block time

assert!(
duration
> Duration::from_millis((BLOCK_TIME_MILLIS * TOTAL_TRANSACTIONS as u64) - 1000)
);
assert!(
duration
< Duration::from_millis((BLOCK_TIME_MILLIS * TOTAL_TRANSACTIONS as u64) + 1000)
);
let (min_duration, max_duration) = match chains.node_a.chain_driver().value().chain_type
{
ChainType::Namada => (
Duration::from_millis((BLOCK_TIME_MILLIS * TOTAL_TRANSACTIONS as u64) - 1000),
Duration::from_millis(
(BLOCK_TIME_MILLIS * TOTAL_TRANSACTIONS as u64) * 2 + 1000,
),
),
_ => {
// Time taken for submitting sequential batches should be around number of transactions * block time
(
Duration::from_millis(
(BLOCK_TIME_MILLIS * TOTAL_TRANSACTIONS as u64) - 1000,
),
Duration::from_millis(
(BLOCK_TIME_MILLIS * TOTAL_TRANSACTIONS as u64) + 1000,
),
)
}
};
assert!(duration > min_duration);
assert!(duration < max_duration);
}

{
Expand Down Expand Up @@ -150,7 +163,11 @@ impl BinaryChannelTest for SequentialCommitTest {
TOTAL_MESSAGES, duration
);

assert!(duration < Duration::from_millis(BLOCK_TIME_MILLIS * 3));
let max_duration = match chains.node_b.chain_driver().value().chain_type {
ChainType::Namada => Duration::from_millis(BLOCK_TIME_MILLIS * 2 * 2),
_ => Duration::from_millis(BLOCK_TIME_MILLIS * 2),
};
assert!(duration < max_duration);
}

Ok(())
Expand Down
6 changes: 3 additions & 3 deletions tools/integration-test/src/tests/ternary_transfer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ impl NaryChannelTest<3> for TernaryIbcTransferTest {
)?;

let denom_a_to_b = derive_ibc_denom(
&node_b.chain_driver().value().chain_type,
&node_a.chain_driver().value().chain_type,
&channel_a_to_b.port_b.as_ref(),
&channel_a_to_b.channel_id_b.as_ref(),
&denom_a,
Expand Down Expand Up @@ -98,7 +98,7 @@ impl NaryChannelTest<3> for TernaryIbcTransferTest {
let channel_b_to_c = channels.channel_at::<1, 2>()?;

let denom_a_to_c = derive_ibc_denom(
&node_c.chain_driver().value().chain_type,
&node_a.chain_driver().value().chain_type,
&channel_b_to_c.port_b.as_ref(),
&channel_b_to_c.channel_id_b.as_ref(),
&denom_a_to_b.as_ref(),
Expand Down Expand Up @@ -136,7 +136,7 @@ impl NaryChannelTest<3> for TernaryIbcTransferTest {
let channel_c_to_a = channels.channel_at::<2, 0>()?;

let denom_a_to_c_to_a = derive_ibc_denom(
&node_b.chain_driver().value().chain_type,
&node_a.chain_driver().value().chain_type,
&channel_c_to_a.port_b.as_ref(),
&channel_c_to_a.channel_id_b.as_ref(),
&denom_a_to_c.as_ref(),
Expand Down

0 comments on commit 7688fc4

Please sign in to comment.