Skip to content

Commit

Permalink
Fix some test imports
Browse files Browse the repository at this point in the history
  • Loading branch information
zbuc committed Mar 1, 2024
1 parent 1a91a28 commit 0ba1056
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 12 deletions.
7 changes: 4 additions & 3 deletions crates/relayer/src/chain/penumbra/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1553,10 +1553,11 @@ fn client_id_suffix(client_id: &ClientId) -> Option<u64> {

fn decode_merkle_proof(proof_bytes: Vec<u8>) -> Result<MerkleProof, Error> {
let proof_bytes = CommitmentProofBytes::try_from(proof_bytes).map_err(|e| {
Error::temp_penumbra_error(format!("couldnt decode CommitmentProofBytes: {}", e))
Error::temp_penumbra_error(format!("couldn't decode CommitmentProofBytes: {}", e))
})?;
let raw_proof: RawMerkleProof = RawMerkleProof::try_from(proof_bytes).map_err(|e| {
Error::temp_penumbra_error(format!("couldn't decode RawMerkleProof: {}", e))
})?;
let raw_proof: RawMerkleProof = RawMerkleProof::try_from(proof_bytes)
.map_err(|e| Error::temp_penumbra_error(format!("couldnt decode RawMerkleProof: {}", e)))?;

let proof = MerkleProof::from(raw_proof);

Expand Down
36 changes: 27 additions & 9 deletions tools/integration-test/src/tests/ica.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
use std::{collections::HashMap, str::FromStr};

use ibc_test_framework::{
chain::ext::ica::register_interchain_account,
ibc::denom::Denom,
prelude::*,
relayer::channel::{
assert_eventually_channel_closed, assert_eventually_channel_established, query_channel_end,
},
use std::collections::HashMap;
use std::str::FromStr;

use ibc_relayer::chain::handle::ChainHandle;
use ibc_relayer::chain::tracking::TrackedMsgs;
use ibc_relayer::config::{
filter::{ChannelFilters, ChannelPolicy, FilterPattern},
ChainConfig, PacketFilter,
};
use ibc_relayer::event::IbcEventWithHeight;
use ibc_relayer_types::applications::ics27_ica::msgs::send_tx::MsgSendTx;
use ibc_relayer_types::applications::ics27_ica::packet_data::InterchainAccountPacketData;
use ibc_relayer_types::applications::{
ics27_ica::cosmos_tx::CosmosTx,
transfer::{msgs::send::MsgSend, Amount, Coin},
};
use ibc_relayer_types::bigint::U256;
use ibc_relayer_types::core::ics04_channel::channel::State;
use ibc_relayer_types::signer::Signer;
use ibc_relayer_types::timestamp::Timestamp;
use ibc_relayer_types::tx_msg::Msg;

use ibc_test_framework::chain::ext::ica::register_interchain_account;
use ibc_test_framework::ibc::denom::Denom;
use ibc_test_framework::prelude::*;
use ibc_test_framework::relayer::channel::{
assert_eventually_channel_closed, assert_eventually_channel_established, query_channel_end,
};

#[test]
Expand Down

0 comments on commit 0ba1056

Please sign in to comment.