From 7213f1dedba895cd3f13e963e4debeae4bc46e08 Mon Sep 17 00:00:00 2001 From: Chris Czub Date: Tue, 14 May 2024 13:08:30 -0700 Subject: [PATCH] Audit all Penumbra todo items (#27) --- crates/relayer-cli/src/commands/evidence.rs | 3 +- crates/relayer-cli/src/commands/keys/add.rs | 4 +- .../relayer-cli/src/commands/keys/balance.rs | 4 +- .../relayer-cli/src/commands/keys/delete.rs | 4 +- .../src/commands/query/packet/commitment.rs | 1 + crates/relayer-cli/src/commands/tx/client.rs | 5 ++- crates/relayer/src/chain/penumbra/chain.rs | 42 ++++++++++++------- .../src/bin/test_setup_with_binary_channel.rs | 2 +- ...t_setup_with_fee_enabled_binary_channel.rs | 2 +- .../bin/test_setup_with_ternary_channel.rs | 2 +- tools/integration-test/src/mbt/transfer.rs | 3 +- .../src/tests/async_icq/simple_query.rs | 2 +- .../src/tests/clear_packet.rs | 2 +- .../src/tests/client_expiration.rs | 2 +- .../src/tests/client_settings.rs | 12 +++++- .../src/tests/dynamic_gas_fee.rs | 8 +++- .../src/tests/fee/filter_fees.rs | 8 +++- tools/integration-test/src/tests/fee_grant.rs | 12 ++++-- tools/integration-test/src/tests/ica.rs | 12 +++++- tools/integration-test/src/tests/memo.rs | 4 +- .../src/tests/ordered_channel_clear.rs | 12 ++++-- tools/integration-test/src/tests/python.rs | 3 +- .../src/tests/sequence_filter.rs | 6 +-- .../src/tests/tendermint/sequential.rs | 4 +- .../src/util/interchain_security.rs | 3 +- 25 files changed, 108 insertions(+), 54 deletions(-) diff --git a/crates/relayer-cli/src/commands/evidence.rs b/crates/relayer-cli/src/commands/evidence.rs index e2adf4b9a1..c78d79613c 100644 --- a/crates/relayer-cli/src/commands/evidence.rs +++ b/crates/relayer-cli/src/commands/evidence.rs @@ -103,7 +103,8 @@ impl Runnable for EvidenceCmd { ChainConfig::CosmosSdk(ref _cfg) => { CosmosSdkChain::bootstrap(chain_config, rt.clone()).unwrap() } - ChainConfig::Penumbra(_) => todo!(), + // TODO: Will need to rewrite this function to work with non-cosmosSDK chains + ChainConfig::Penumbra(_) => todo!("current implementation expects a cosmosSDK chain"), }; let res = monitor_misbehaviours( diff --git a/crates/relayer-cli/src/commands/keys/add.rs b/crates/relayer-cli/src/commands/keys/add.rs index c11547fc01..2fada8be06 100644 --- a/crates/relayer-cli/src/commands/keys/add.rs +++ b/crates/relayer-cli/src/commands/keys/add.rs @@ -235,7 +235,7 @@ pub fn add_key( keyring.add_key(key_name, key_pair.clone())?; key_pair.into() } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => unimplemented!("no key storage support for penumbra"), }; Ok(key_pair) @@ -292,7 +292,7 @@ pub fn restore_key( keyring.add_key(key_name, key_pair.clone())?; key_pair.into() } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => unimplemented!("no key storage support for penumbra"), }; Ok(key_pair) diff --git a/crates/relayer-cli/src/commands/keys/balance.rs b/crates/relayer-cli/src/commands/keys/balance.rs index 8d59e35c7c..e971908ba5 100644 --- a/crates/relayer-cli/src/commands/keys/balance.rs +++ b/crates/relayer-cli/src/commands/keys/balance.rs @@ -78,7 +78,7 @@ fn get_balance(chain: impl ChainHandle, key_name: Option, denom: Option< match chain_config { ChainConfig::CosmosSdk(chain_config) => chain_config.key_name, ChainConfig::Astria(chain_config) => chain_config.key_name, - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => unimplemented!("no key support for penumbra"), } }); @@ -102,7 +102,7 @@ fn get_balances(chain: impl ChainHandle, key_name: Option) { match chain_config { ChainConfig::CosmosSdk(chain_config) => chain_config.key_name, ChainConfig::Astria(chain_config) => chain_config.key_name, - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => unimplemented!("no key support for penumbra"), } }); diff --git a/crates/relayer-cli/src/commands/keys/delete.rs b/crates/relayer-cli/src/commands/keys/delete.rs index 2279264dbe..db6789f726 100644 --- a/crates/relayer-cli/src/commands/keys/delete.rs +++ b/crates/relayer-cli/src/commands/keys/delete.rs @@ -129,7 +129,7 @@ pub fn delete_key(config: &ChainConfig, key_name: &str) -> eyre::Result<()> { )?; keyring.remove_key(key_name)?; } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => unimplemented!("no key support for penumbra"), } Ok(()) } @@ -160,7 +160,7 @@ pub fn delete_all_keys(config: &ChainConfig) -> eyre::Result<()> { keyring.remove_key(&key_name)?; } } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => unimplemented!("no key support for penumbra"), } Ok(()) } diff --git a/crates/relayer-cli/src/commands/query/packet/commitment.rs b/crates/relayer-cli/src/commands/query/packet/commitment.rs index f6d6a94b10..9481604131 100644 --- a/crates/relayer-cli/src/commands/query/packet/commitment.rs +++ b/crates/relayer-cli/src/commands/query/packet/commitment.rs @@ -19,6 +19,7 @@ use crate::{ prelude::*, }; +#[allow(dead_code)] #[derive(Serialize, Debug)] struct PacketSeqs { height: Height, diff --git a/crates/relayer-cli/src/commands/tx/client.rs b/crates/relayer-cli/src/commands/tx/client.rs index 1c813487a5..2bc8cb5be0 100644 --- a/crates/relayer-cli/src/commands/tx/client.rs +++ b/crates/relayer-cli/src/commands/tx/client.rs @@ -213,7 +213,10 @@ impl Runnable for TxUpdateClientCmd { ChainConfig::CosmosSdk(chain_config) | ChainConfig::Astria(chain_config) => { chain_config.genesis_restart = Some(restart_params) } - ChainConfig::Penumbra(_) => todo!(), + // TODO: Will probably need to support setting restart params on Penumbra somehow + ChainConfig::Penumbra(_) => { + todo!("penumbra doesn't support genesis restart params") + } }, None => { Output::error(format!( diff --git a/crates/relayer/src/chain/penumbra/chain.rs b/crates/relayer/src/chain/penumbra/chain.rs index cb09de0cc0..e269d71526 100644 --- a/crates/relayer/src/chain/penumbra/chain.rs +++ b/crates/relayer/src/chain/penumbra/chain.rs @@ -21,7 +21,7 @@ use tendermint_proto::Protobuf; use tracing::info; use crate::chain::client::ClientSettings; -use crate::chain::cosmos::query::{abci_query, QueryResponse}; +use crate::chain::cosmos::query::{abci_query, fetch_version_specs, QueryResponse}; use crate::chain::endpoint::ChainStatus; use crate::chain::requests::*; use crate::chain::tracking::TrackedMsgs; @@ -587,7 +587,11 @@ impl ChainEndpoint for PenumbraChain { } fn shutdown(self) -> Result<(), Error> { - todo!() + if let Some(monitor_tx) = self.tx_monitor_cmd { + monitor_tx.shutdown().map_err(Error::event_source)?; + } + + Ok(()) } fn health_check(&mut self) -> Result { @@ -626,11 +630,11 @@ impl ChainEndpoint for PenumbraChain { } fn keybase(&self) -> &KeyRing { - todo!() + unimplemented!("no key storage support for penumbra") } fn keybase_mut(&mut self) -> &mut KeyRing { - todo!() + unimplemented!("no key storage support for penumbra") } fn get_signer(&self) -> Result { @@ -642,7 +646,13 @@ impl ChainEndpoint for PenumbraChain { } fn version_specs(&self) -> Result { - todo!() + let version_specs = self.rt.block_on(fetch_version_specs( + self.id(), + &format!("{}", self.config.grpc_addr) + .parse::() + .map_err(|_| Error::config(ConfigError::wrong_type()))?, + ))?; + Ok(version_specs) } fn send_messages_and_wait_commit( @@ -731,11 +741,11 @@ impl ChainEndpoint for PenumbraChain { &self, _key_name: Option<&str>, ) -> Result, Error> { - todo!() + unimplemented!("cannot query balance of a shielded chain >:}}") } fn query_denom_trace(&self, _hash: String) -> Result { - todo!() + todo!("penumbra doesn't support denom trace querying yet") } fn query_commitment_prefix( @@ -913,14 +923,14 @@ impl ChainEndpoint for PenumbraChain { &self, _request: QueryUpgradedClientStateRequest, ) -> Result<(AnyClientState, MerkleProof), Error> { - todo!() + todo!("need to implement corresponding state query in penumbra") } fn query_upgraded_consensus_state( &self, _request: QueryUpgradedConsensusStateRequest, ) -> Result<(AnyConsensusState, MerkleProof), Error> { - todo!() + todo!("need to implement corresponding state query in penumbra") } fn query_connections( @@ -1445,7 +1455,7 @@ impl ChainEndpoint for PenumbraChain { &self, _request: QueryHostConsensusStateRequest, ) -> Result { - todo!() + todo!("need to implement corresponding state query on penumbra") } fn build_client_state( @@ -1510,7 +1520,9 @@ impl ChainEndpoint for PenumbraChain { _port_id: &ibc_relayer_types::core::ics24_host::identifier::PortId, _counterparty_payee: &ibc_relayer_types::signer::Signer, ) -> Result<(), Error> { - todo!() + // the payee is an optional payee to which reverse and timeout relayer packet + // fees will be paid out. + todo!("currently unimplemented in penumbra") } fn cross_chain_query( @@ -1520,18 +1532,20 @@ impl ChainEndpoint for PenumbraChain { Vec, Error, > { - todo!() + // https://github.com/cosmos/ibc/blob/main/spec/app/ics-031-crosschain-queries/README.md + todo!("not currently implemented in penumbra") } fn query_incentivized_packet( &self, _request: ibc_proto::ibc::apps::fee::v1::QueryIncentivizedPacketRequest, ) -> Result { - todo!() + // https://buf.build/cosmos/ibc/docs/e769eb46d1e742e8b0368510479161df:ibc.applications.fee.v1#ibc.applications.fee.v1.Query.IncentivizedPackets + todo!("not currently implemented in penumbra") } fn query_consumer_chains(&self) -> Result, Error> { - todo!() + todo!("not currently implemented in penumbra") } } diff --git a/tools/integration-test/src/bin/test_setup_with_binary_channel.rs b/tools/integration-test/src/bin/test_setup_with_binary_channel.rs index bfa71f8773..055b41fd8c 100644 --- a/tools/integration-test/src/bin/test_setup_with_binary_channel.rs +++ b/tools/integration-test/src/bin/test_setup_with_binary_channel.rs @@ -48,7 +48,7 @@ impl TestOverrides for Test { // with external relayer commands. chain_config.key_store_type = Store::Test; } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => {} } } } diff --git a/tools/integration-test/src/bin/test_setup_with_fee_enabled_binary_channel.rs b/tools/integration-test/src/bin/test_setup_with_fee_enabled_binary_channel.rs index 787b85e206..41aaf07c12 100644 --- a/tools/integration-test/src/bin/test_setup_with_fee_enabled_binary_channel.rs +++ b/tools/integration-test/src/bin/test_setup_with_fee_enabled_binary_channel.rs @@ -49,7 +49,7 @@ impl TestOverrides for Test { // with external relayer commands. chain_config.key_store_type = Store::Test; } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => {} } } } diff --git a/tools/integration-test/src/bin/test_setup_with_ternary_channel.rs b/tools/integration-test/src/bin/test_setup_with_ternary_channel.rs index de32105ba7..5fccf2562d 100644 --- a/tools/integration-test/src/bin/test_setup_with_ternary_channel.rs +++ b/tools/integration-test/src/bin/test_setup_with_ternary_channel.rs @@ -48,7 +48,7 @@ impl TestOverrides for Test { // with external relayer commands. chain_config.key_store_type = Store::Test; } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => {} } } } diff --git a/tools/integration-test/src/mbt/transfer.rs b/tools/integration-test/src/mbt/transfer.rs index 3acb8f6486..2c2e5038d1 100644 --- a/tools/integration-test/src/mbt/transfer.rs +++ b/tools/integration-test/src/mbt/transfer.rs @@ -164,7 +164,8 @@ impl TestOverrides for IbcTransferMBT { ChainConfig::CosmosSdk(chain_config) => { chain_config.trusting_period = Some(CLIENT_EXPIRY); } - ChainConfig::Penumbra(_) | ChainConfig::Astria(_) => todo!(), + ChainConfig::Penumbra(_chain_config) => {} + ChainConfig::Astria(_) => todo!(), } } } 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 97b29c6776..8403e3fce4 100644 --- a/tools/integration-test/src/tests/async_icq/simple_query.rs +++ b/tools/integration-test/src/tests/async_icq/simple_query.rs @@ -143,7 +143,7 @@ fn assert_eventual_async_icq_success( ) -> Result<(), Error> { let rpc_addr = match relayer.config.chains.first().unwrap() { ChainConfig::CosmosSdk(c) => c.rpc_addr.clone(), - ChainConfig::Penumbra(_c) => todo!(), + ChainConfig::Penumbra(c) => c.rpc_addr.clone(), ChainConfig::Astria(_c) => todo!(), }; diff --git a/tools/integration-test/src/tests/clear_packet.rs b/tools/integration-test/src/tests/clear_packet.rs index 6e036293e4..cfd78a182c 100644 --- a/tools/integration-test/src/tests/clear_packet.rs +++ b/tools/integration-test/src/tests/clear_packet.rs @@ -325,7 +325,7 @@ impl TestOverrides for ClearPacketOverrideTest { match chain_config { // Use a small clear interval in the chain configurations to override the global high interval ChainConfig::CosmosSdk(chain_config) => chain_config.clear_interval = Some(10), - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(chain_config) => chain_config.clear_interval = Some(10), ChainConfig::Astria(_) => todo!(), } } diff --git a/tools/integration-test/src/tests/client_expiration.rs b/tools/integration-test/src/tests/client_expiration.rs index 562e504b62..762af74c4c 100644 --- a/tools/integration-test/src/tests/client_expiration.rs +++ b/tools/integration-test/src/tests/client_expiration.rs @@ -123,7 +123,7 @@ impl TestOverrides for ExpirationTestOverrides { ChainConfig::CosmosSdk(chain_config) => { chain_config.trusting_period = Some(CLIENT_EXPIRY); } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => {} ChainConfig::Astria(_) => todo!(), } } diff --git a/tools/integration-test/src/tests/client_settings.rs b/tools/integration-test/src/tests/client_settings.rs index f4643af99f..05393f16f5 100644 --- a/tools/integration-test/src/tests/client_settings.rs +++ b/tools/integration-test/src/tests/client_settings.rs @@ -37,7 +37,11 @@ impl TestOverrides for ClientDefaultsTest { chain_config_a.trusting_period = Some(Duration::from_secs(120_000)); chain_config_a.trust_threshold = TrustThreshold::new(13, 23).unwrap(); } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(chain_config_a) => { + chain_config_a.clock_drift = Duration::from_secs(3); + chain_config_a.max_block_time = Duration::from_secs(5); + chain_config_a.trust_threshold = TrustThreshold::new(13, 23).unwrap(); + } ChainConfig::Astria(_) => todo!(), } @@ -48,7 +52,11 @@ impl TestOverrides for ClientDefaultsTest { chain_config_b.trusting_period = Some(Duration::from_secs(340_000)); chain_config_b.trust_threshold = TrustThreshold::TWO_THIRDS; } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(chain_config_b) => { + chain_config_b.clock_drift = Duration::from_secs(6); + chain_config_b.max_block_time = Duration::from_secs(15); + chain_config_b.trust_threshold = TrustThreshold::TWO_THIRDS; + } ChainConfig::Astria(_) => todo!(), } } diff --git a/tools/integration-test/src/tests/dynamic_gas_fee.rs b/tools/integration-test/src/tests/dynamic_gas_fee.rs index 32d223564b..3a9c2354f8 100644 --- a/tools/integration-test/src/tests/dynamic_gas_fee.rs +++ b/tools/integration-test/src/tests/dynamic_gas_fee.rs @@ -52,7 +52,9 @@ impl TestOverrides for DynamicGasTest { GasPrice::new(0.1, chain_config_a.gas_price.denom.clone()); chain_config_a.dynamic_gas_price = DynamicGasPrice::unsafe_new(false, 1.1, 0.6); } - ChainConfig::Penumbra(_chain_config_a) => todo!(), + ChainConfig::Penumbra(_chain_config_a) => { + todo!("need to implement gas support for penumbra chains") + } ChainConfig::Astria(_chain_config_a) => todo!(), } @@ -63,7 +65,9 @@ impl TestOverrides for DynamicGasTest { chain_config_b.dynamic_gas_price = DynamicGasPrice::unsafe_new(self.dynamic_gas_enabled, 1.1, 0.6); } - ChainConfig::Penumbra(_chain_config_b) => todo!(), + ChainConfig::Penumbra(_chain_config_a) => { + todo!("need to implement gas support for penumbra chains") + } ChainConfig::Astria(_chain_config_b) => todo!(), } } diff --git a/tools/integration-test/src/tests/fee/filter_fees.rs b/tools/integration-test/src/tests/fee/filter_fees.rs index 0eb322ecdb..ae62d5e164 100644 --- a/tools/integration-test/src/tests/fee/filter_fees.rs +++ b/tools/integration-test/src/tests/fee/filter_fees.rs @@ -33,7 +33,9 @@ impl TestOverrides for FilterIncentivizedFeesRelayerTest { ChainConfig::CosmosSdk(chain_config) => { chain_config.packet_filter = packet_filter.clone(); } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(chain_config) => { + chain_config.packet_filter = packet_filter.clone(); + } ChainConfig::Astria(_) => todo!(), } } @@ -204,7 +206,9 @@ impl TestOverrides for FilterByChannelIncentivizedFeesRelayerTest { ChainConfig::CosmosSdk(chain_config) => { chain_config.packet_filter = packet_filter.clone(); } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(chain_config) => { + chain_config.packet_filter = packet_filter.clone(); + } ChainConfig::Astria(_) => todo!(), } } diff --git a/tools/integration-test/src/tests/fee_grant.rs b/tools/integration-test/src/tests/fee_grant.rs index 77cf2354ed..ebabbc655a 100644 --- a/tools/integration-test/src/tests/fee_grant.rs +++ b/tools/integration-test/src/tests/fee_grant.rs @@ -81,7 +81,9 @@ impl BinaryChannelTest for FeeGrantTest { .ok_or_else(|| eyre!("chain configuration is empty"))? { ChainConfig::CosmosSdk(chain_config) => chain_config.gas_price.denom.clone(), - ChainConfig::Penumbra(_chain_config) => todo!(), + ChainConfig::Penumbra(_chain_config) => { + todo!("need to implement gas support for penumbra chains") + } ChainConfig::Astria(_chain_config) => todo!(), }; @@ -108,7 +110,9 @@ impl BinaryChannelTest for FeeGrantTest { ChainConfig::CosmosSdk(c) => { c.fee_granter = Some("user2".to_owned()); } - ChainConfig::Penumbra(_c) => todo!(), + ChainConfig::Penumbra(_chain_config) => { + todo!("need to implement gas support for penumbra chains") + } ChainConfig::Astria(_c) => todo!(), } } @@ -228,7 +232,9 @@ impl BinaryChannelTest for NoFeeGrantTest { .ok_or_else(|| eyre!("chain configuration is empty"))? { ChainConfig::CosmosSdk(chain_config) => chain_config.gas_price.denom.clone(), - ChainConfig::Penumbra(_chain_config) => todo!(), + ChainConfig::Penumbra(_chain_config) => { + todo!("need to implement gas support for penumbra chains") + } ChainConfig::Astria(_chain_config) => todo!(), }; diff --git a/tools/integration-test/src/tests/ica.rs b/tools/integration-test/src/tests/ica.rs index 11ac0ff0ba..15f989e552 100644 --- a/tools/integration-test/src/tests/ica.rs +++ b/tools/integration-test/src/tests/ica.rs @@ -69,7 +69,9 @@ impl TestOverrides for IcaFilterTestAllow { ChainConfig::CosmosSdk(chain_config) => { chain_config.packet_filter = self.packet_filter.clone(); } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(chain_config) => { + chain_config.packet_filter = self.packet_filter.clone(); + } ChainConfig::Astria(_) => todo!(), } } @@ -202,7 +204,13 @@ impl TestOverrides for IcaFilterTestDeny { FilterPattern::Wildcard("*".parse().unwrap()), )])); } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(chain_config) => { + chain_config.packet_filter.channel_policy = + ChannelPolicy::Deny(ChannelFilters::new(vec![( + FilterPattern::Wildcard("ica*".parse().unwrap()), + FilterPattern::Wildcard("*".parse().unwrap()), + )])); + } ChainConfig::Astria(_) => todo!(), } } diff --git a/tools/integration-test/src/tests/memo.rs b/tools/integration-test/src/tests/memo.rs index 446844e053..0d4e6a7bc8 100644 --- a/tools/integration-test/src/tests/memo.rs +++ b/tools/integration-test/src/tests/memo.rs @@ -38,7 +38,7 @@ impl TestOverrides for MemoTest { ChainConfig::CosmosSdk(chain_config) => { chain_config.memo_prefix = self.memo.clone(); } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => {} ChainConfig::Astria(_) => todo!(), } } @@ -105,7 +105,7 @@ impl TestOverrides for MemoOverwriteTest { chain_config.memo_overwrite = Some(Memo::new(OVERWRITE_MEMO).unwrap()) } ChainConfig::Astria(_) => todo!(), - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => {} } } } diff --git a/tools/integration-test/src/tests/ordered_channel_clear.rs b/tools/integration-test/src/tests/ordered_channel_clear.rs index 9a7de5ceb8..a51e5128d6 100644 --- a/tools/integration-test/src/tests/ordered_channel_clear.rs +++ b/tools/integration-test/src/tests/ordered_channel_clear.rs @@ -56,7 +56,8 @@ impl TestOverrides for OrderedChannelClearTest { ChainConfig::CosmosSdk(chain_config) => { chain_config.sequential_batch_tx = self.sequential_batch_tx; } - ChainConfig::Astria(_) | ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Astria(_) => todo!(), + ChainConfig::Penumbra(_) => {} } } @@ -65,7 +66,8 @@ impl TestOverrides for OrderedChannelClearTest { ChainConfig::CosmosSdk(chain_config) => { chain_config.sequential_batch_tx = self.sequential_batch_tx; } - ChainConfig::Astria(_) | ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Astria(_) => todo!(), + ChainConfig::Penumbra(_) => {} } } @@ -202,7 +204,8 @@ impl TestOverrides for OrderedChannelClearEqualCLITest { chain_config.sequential_batch_tx = true; chain_config.max_msg_num = MaxMsgNum::new(3).unwrap(); } - ChainConfig::Astria(_) | ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Astria(_) => todo!(), + ChainConfig::Penumbra(_) => {} } } @@ -212,7 +215,8 @@ impl TestOverrides for OrderedChannelClearEqualCLITest { chain_config.sequential_batch_tx = true; chain_config.max_msg_num = MaxMsgNum::new(3).unwrap(); } - ChainConfig::Astria(_) | ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Astria(_) => todo!(), + ChainConfig::Penumbra(_) => {} } } diff --git a/tools/integration-test/src/tests/python.rs b/tools/integration-test/src/tests/python.rs index 040b3ecd8c..355f3364ab 100644 --- a/tools/integration-test/src/tests/python.rs +++ b/tools/integration-test/src/tests/python.rs @@ -18,7 +18,8 @@ impl TestOverrides for PythonTest { // with external relayer commands. chain_config.key_store_type = Store::Test; } - ChainConfig::Penumbra(_) => todo!(), + // No key support for Penumbra + ChainConfig::Penumbra(_) => {} ChainConfig::Astria(_) => todo!(), } } diff --git a/tools/integration-test/src/tests/sequence_filter.rs b/tools/integration-test/src/tests/sequence_filter.rs index f4a5a0ad33..2c211cf724 100644 --- a/tools/integration-test/src/tests/sequence_filter.rs +++ b/tools/integration-test/src/tests/sequence_filter.rs @@ -55,7 +55,7 @@ impl TestOverrides for FilterClearOnStartTest { chain_config.excluded_sequences = excluded_sequences; } ChainConfig::Astria(_) => todo!(), - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => {} } config.mode.channels.enabled = true; @@ -94,7 +94,7 @@ impl TestOverrides for FilterClearIntervalTest { chain_config.excluded_sequences = excluded_sequences; } ChainConfig::Astria(_) => todo!(), - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => {} } config.mode.channels.enabled = true; @@ -255,7 +255,7 @@ impl TestOverrides for StandardRelayingNoFilterTest { chain_config.excluded_sequences = excluded_sequences; } ChainConfig::Astria(_) => todo!(), - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => {} } config.mode.packets.clear_on_start = true; config.mode.packets.clear_interval = 0; diff --git a/tools/integration-test/src/tests/tendermint/sequential.rs b/tools/integration-test/src/tests/tendermint/sequential.rs index ff3e72fc29..d8d39a8b31 100644 --- a/tools/integration-test/src/tests/tendermint/sequential.rs +++ b/tools/integration-test/src/tests/tendermint/sequential.rs @@ -37,7 +37,7 @@ impl TestOverrides for SequentialCommitTest { chain_config_a.max_msg_num = MaxMsgNum::new(MESSAGES_PER_BATCH).unwrap(); chain_config_a.sequential_batch_tx = true; } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => todo!("sequential batching unsupported in penumbra"), }; match &mut config.chains[1] { @@ -45,7 +45,7 @@ impl TestOverrides for SequentialCommitTest { chain_config_b.max_msg_num = MaxMsgNum::new(MESSAGES_PER_BATCH).unwrap(); chain_config_b.sequential_batch_tx = false; } - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::Penumbra(_) => todo!("sequential batching unsupported in penumbra"), }; } diff --git a/tools/test-framework/src/util/interchain_security.rs b/tools/test-framework/src/util/interchain_security.rs index 4db14f1b0d..590e53027b 100644 --- a/tools/test-framework/src/util/interchain_security.rs +++ b/tools/test-framework/src/util/interchain_security.rs @@ -33,8 +33,7 @@ pub fn update_relayer_config_for_consumer_chain(config: &mut Config) { chain_config.ccv_consumer_chain = true; chain_config.trusting_period = Some(Duration::from_secs(99)); } - ChainConfig::CosmosSdk(_) | ChainConfig::Astria(_) => {} - ChainConfig::Penumbra(_) => todo!(), + ChainConfig::CosmosSdk(_) | ChainConfig::Astria(_) | ChainConfig::Penumbra(_) => {} } } }