Skip to content

Commit

Permalink
Fix clippy failures
Browse files Browse the repository at this point in the history
  • Loading branch information
@zbuc
zbuc committed Apr 5, 2024
1 parent eb25832 commit cc42e0b
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 21 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[![Integration tests][test-image]][test-link]
[![Apache 2.0 Licensed][license-image]][license-link]
![Rust Stable][rustc-image]
![Rust 1.71.1+][rustc-version]
![Rust 1.77.1+][rustc-version]

Rust implementation of an Inter-Blockchain Communication (IBC) relayer.

Expand Down Expand Up @@ -48,7 +48,7 @@ The repository also includes [TLA+ specifications](docs/spec).

## Requirements

The crates in this project require Rust `1.71.1`.
The crates in this project require Rust `1.77.1`.

## Hermes Guide

Expand Down Expand Up @@ -123,7 +123,7 @@ Unless required by applicable law or agreed to in writing, software distributed
[license-image]: https://img.shields.io/badge/license-Apache_2.0-blue.svg
[license-link]: https://github.com/informalsystems/hermes/blob/master/LICENSE
[rustc-image]: https://img.shields.io/badge/rustc-stable-blue.svg
[rustc-version]: https://img.shields.io/badge/rustc-1.71.1+-blue.svg
[rustc-version]: https://img.shields.io/badge/rustc-1.77.1+-blue.svg
[cosmos-shield]: https://img.shields.io/static/v1?label=&labelColor=1B1E36&color=1B1E36&message=cosmos%20ecosystem&style=for-the-badge&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjMuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCAyNTAwIDI1MDAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDI1MDAgMjUwMDsiIHhtbDpzcGFjZT0icHJlc2VydmUiPgo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLnN0MHtmaWxsOiM2RjczOTA7fQoJLnN0MXtmaWxsOiNCN0I5Qzg7fQo8L3N0eWxlPgo8cGF0aCBjbGFzcz0ic3QwIiBkPSJNMTI1Mi42LDE1OS41Yy0xMzQuOSwwLTI0NC4zLDQ4OS40LTI0NC4zLDEwOTMuMXMxMDkuNCwxMDkzLjEsMjQ0LjMsMTA5My4xczI0NC4zLTQ4OS40LDI0NC4zLTEwOTMuMQoJUzEzODcuNSwxNTkuNSwxMjUyLjYsMTU5LjV6IE0xMjY5LjQsMjI4NGMtMTUuNCwyMC42LTMwLjksNS4xLTMwLjksNS4xYy02Mi4xLTcyLTkzLjItMjA1LjgtOTMuMi0yMDUuOAoJYy0xMDguNy0zNDkuOC04Mi44LTExMDAuOC04Mi44LTExMDAuOGM1MS4xLTU5Ni4yLDE0NC03MzcuMSwxNzUuNi03NjguNGM2LjctNi42LDE3LjEtNy40LDI0LjctMmM0NS45LDMyLjUsODQuNCwxNjguNSw4NC40LDE2OC41CgljMTEzLjYsNDIxLjgsMTAzLjMsODE3LjksMTAzLjMsODE3LjljMTAuMywzNDQuNy01Ni45LDczMC41LTU2LjksNzMwLjVDMTM0MS45LDIyMjIuMiwxMjY5LjQsMjI4NCwxMjY5LjQsMjI4NHoiLz4KPHBhdGggY2xhc3M9InN0MCIgZD0iTTIyMDAuNyw3MDguNmMtNjcuMi0xMTcuMS01NDYuMSwzMS42LTEwNzAsMzMycy04OTMuNSw2MzguOS04MjYuMyw3NTUuOXM1NDYuMS0zMS42LDEwNzAtMzMyCglTMjI2Ny44LDgyNS42LDIyMDAuNyw3MDguNkwyMjAwLjcsNzA4LjZ6IE0zNjYuNCwxNzgwLjRjLTI1LjctMy4yLTE5LjktMjQuNC0xOS45LTI0LjRjMzEuNi04OS43LDEzMi0xODMuMiwxMzItMTgzLjIKCWMyNDkuNC0yNjguNCw5MTMuOC02MTkuNyw5MTMuOC02MTkuN2M1NDIuNS0yNTIuNCw3MTEuMS0yNDEuOCw3NTMuOC0yMzBjOS4xLDIuNSwxNSwxMS4yLDE0LDIwLjZjLTUuMSw1Ni0xMDQuMiwxNTctMTA0LjIsMTU3CgljLTMwOS4xLDMwOC42LTY1Ny44LDQ5Ni44LTY1Ny44LDQ5Ni44Yy0yOTMuOCwxODAuNS02NjEuOSwzMTQuMS02NjEuOSwzMTQuMUM0NTYsMTgxMi42LDM2Ni40LDE3ODAuNCwzNjYuNCwxNzgwLjRMMzY2LjQsMTc4MC40CglMMzY2LjQsMTc4MC40eiIvPgo8cGF0aCBjbGFzcz0ic3QwIiBkPSJNMjE5OC40LDE4MDAuNGM2Ny43LTExNi44LTMwMC45LTQ1Ni44LTgyMy03NTkuNVMzNzQuNCw1ODcuOCwzMDYuOCw3MDQuN3MzMDAuOSw0NTYuOCw4MjMuMyw3NTkuNQoJUzIxMzAuNywxOTE3LjQsMjE5OC40LDE4MDAuNHogTTM1MS42LDc0OS44Yy0xMC0yMy43LDExLjEtMjkuNCwxMS4xLTI5LjRjOTMuNS0xNy42LDIyNC43LDIyLjYsMjI0LjcsMjIuNgoJYzM1Ny4yLDgxLjMsOTk0LDQ4MC4yLDk5NCw0ODAuMmM0OTAuMywzNDMuMSw1NjUuNSw0OTQuMiw1NzYuOCw1MzcuMWMyLjQsOS4xLTIuMiwxOC42LTEwLjcsMjIuNGMtNTEuMSwyMy40LTE4OC4xLTExLjUtMTg4LjEtMTEuNQoJYy00MjIuMS0xMTMuMi03NTkuNi0zMjAuNS03NTkuNi0zMjAuNWMtMzAzLjMtMTYzLjYtNjAzLjItNDE1LjMtNjAzLjItNDE1LjNjLTIyNy45LTE5MS45LTI0NS0yODUuNC0yNDUtMjg1LjRMMzUxLjYsNzQ5Ljh6Ii8+CjxjaXJjbGUgY2xhc3M9InN0MSIgY3g9IjEyNTAiIGN5PSIxMjUwIiByPSIxMjguNiIvPgo8ZWxsaXBzZSBjbGFzcz0ic3QxIiBjeD0iMTc3Ny4zIiBjeT0iNzU2LjIiIHJ4PSI3NC42IiByeT0iNzcuMiIvPgo8ZWxsaXBzZSBjbGFzcz0ic3QxIiBjeD0iNTUzIiBjeT0iMTAxOC41IiByeD0iNzQuNiIgcnk9Ijc3LjIiLz4KPGVsbGlwc2UgY2xhc3M9InN0MSIgY3g9IjEwOTguMiIgY3k9IjE5NjUiIHJ4PSI3NC42IiByeT0iNzcuMiIvPgo8L3N2Zz4K
[cosmos-link]: https://cosmos.network

2 changes: 1 addition & 1 deletion tools/integration-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "ibc-integration-test"
version = "0.27.2"
edition = "2021"
rust-version = "1.71.1"
rust-version = "1.77.1"
license = "Apache-2.0"
readme = "README.md"
keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
Expand Down
1 change: 1 addition & 0 deletions tools/integration-test/src/mbt/transfer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ impl TestOverrides for IbcTransferMBT {
ChainConfig::CosmosSdk(chain_config) => {
chain_config.trusting_period = Some(CLIENT_EXPIRY);
}
ChainConfig::Penumbra(_) | ChainConfig::Astria(_) => todo!(),
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions tools/integration-test/src/tests/async_icq/simple_query.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ fn assert_eventual_async_icq_success<ChainA: ChainHandle, ChainB: ChainHandle>(
) -> Result<(), Error> {
let rpc_addr = match relayer.config.chains.first().unwrap() {
ChainConfig::CosmosSdk(c) => c.rpc_addr.clone(),
ChainConfig::Penumbra(c) => todo!(),
ChainConfig::Astria(c) => todo!(),
ChainConfig::Penumbra(_c) => todo!(),
ChainConfig::Astria(_c) => todo!(),
};

let mut rpc_client = HttpClient::new(rpc_addr).unwrap();
Expand Down
8 changes: 4 additions & 4 deletions tools/integration-test/src/tests/dynamic_gas_fee.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ 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::Astria(chain_config_a) => todo!(),
ChainConfig::Penumbra(_chain_config_a) => todo!(),
ChainConfig::Astria(_chain_config_a) => todo!(),
}

match &mut config.chains[1] {
Expand All @@ -63,8 +63,8 @@ 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::Astria(chain_config_b) => todo!(),
ChainConfig::Penumbra(_chain_config_b) => todo!(),
ChainConfig::Astria(_chain_config_b) => todo!(),
}
}

Expand Down
12 changes: 6 additions & 6 deletions tools/integration-test/src/tests/fee_grant.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ 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::Astria(chain_config) => todo!(),
ChainConfig::Penumbra(_chain_config) => todo!(),
ChainConfig::Astria(_chain_config) => todo!(),
};

let gas_denom: MonoTagged<ChainA, Denom> = MonoTagged::new(Denom::Base(gas_denom_str));
Expand All @@ -108,8 +108,8 @@ impl BinaryChannelTest for FeeGrantTest {
ChainConfig::CosmosSdk(c) => {
c.fee_granter = Some("user2".to_owned());
}
ChainConfig::Penumbra(c) => todo!(),
ChainConfig::Astria(c) => todo!(),
ChainConfig::Penumbra(_c) => todo!(),
ChainConfig::Astria(_c) => todo!(),
}
}
});
Expand Down Expand Up @@ -228,8 +228,8 @@ 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::Astria(chain_config) => todo!(),
ChainConfig::Penumbra(_chain_config) => todo!(),
ChainConfig::Astria(_chain_config) => todo!(),
};

let gas_denom: MonoTagged<ChainA, Denom> = MonoTagged::new(Denom::Base(gas_denom_str));
Expand Down
8 changes: 3 additions & 5 deletions tools/integration-test/src/tests/interchain_security/ica_transfer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
//! the second chain a Consumer chain.
use std::str::FromStr;

use ibc_relayer::{chain::tracking::TrackedMsgs, event::IbcEventWithHeight};
use ibc_relayer_types::{
applications::{
ics27_ica::{
cosmos_tx::CosmosTx, msgs::send_tx::MsgSendTx, packet_data::InterchainAccountPacketData,
},
ics27_ica::{cosmos_tx::CosmosTx, packet_data::InterchainAccountPacketData},
transfer::{msgs::send::MsgSend, Amount, Coin},
},
bigint::U256,
Expand All @@ -22,7 +19,8 @@ use ibc_test_framework::{
prelude::*,
relayer::channel::assert_eventually_channel_established,
util::interchain_security::{
update_genesis_for_consumer_chain, update_relayer_config_for_consumer_chain,
interchain_send_tx, update_genesis_for_consumer_chain,
update_relayer_config_for_consumer_chain,
},
};

Expand Down
1 change: 1 addition & 0 deletions tools/integration-test/src/tests/manual/simulation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ impl TestOverrides for SimulationTest {
ChainConfig::CosmosSdk(chain_config) => {
chain_config.max_msg_num = MaxMsgNum::new(MAX_MSGS).unwrap();
}
ChainConfig::Penumbra(_) | ChainConfig::Astria(_) => todo!(),
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions tools/integration-test/src/tests/ordered_channel_clear.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ impl TestOverrides for OrderedChannelClearTest {
ChainConfig::CosmosSdk(chain_config) => {
chain_config.sequential_batch_tx = self.sequential_batch_tx;
}
ChainConfig::Astria(_) | ChainConfig::Penumbra(_) => todo!(),
}
}

Expand All @@ -64,6 +65,7 @@ impl TestOverrides for OrderedChannelClearTest {
ChainConfig::CosmosSdk(chain_config) => {
chain_config.sequential_batch_tx = self.sequential_batch_tx;
}
ChainConfig::Astria(_) | ChainConfig::Penumbra(_) => todo!(),
}
}

Expand Down Expand Up @@ -200,6 +202,7 @@ impl TestOverrides for OrderedChannelClearEqualCLITest {
chain_config.sequential_batch_tx = true;
chain_config.max_msg_num = MaxMsgNum::new(3).unwrap();
}
ChainConfig::Astria(_) | ChainConfig::Penumbra(_) => todo!(),
}
}

Expand All @@ -209,6 +212,7 @@ impl TestOverrides for OrderedChannelClearEqualCLITest {
chain_config.sequential_batch_tx = true;
chain_config.max_msg_num = MaxMsgNum::new(3).unwrap();
}
ChainConfig::Astria(_) | ChainConfig::Penumbra(_) => todo!(),
}
}

Expand Down

0 comments on commit cc42e0b

Please sign in to comment.