Clean code

crates/chain-registry/Cargo.toml

@@ -13,7 +13,7 @@ description  = """
 
 [dependencies]
 ibc-proto         = { version = "0.31.0-alpha.2" }
-ibc-relayer-types = { version = "0.24.0", path = "../relayer-types", features = ["std"] }
+ibc-relayer-types = { version = "0.24.0", path = "../relayer-types" }
 tendermint-rpc    = { version = "0.32.0", features = ["http-client", "websocket-client"] }
 
 async-trait = "0.1.67"

crates/relayer-cli/Cargo.toml

@@ -25,7 +25,7 @@ telemetry   = ["ibc-relayer/telemetry", "ibc-telemetry"]
 rest-server = ["ibc-relayer-rest"]
 
 [dependencies]
-ibc-relayer-types  = { version = "0.24.0", path = "../relayer-types", features = ["std", "clock"] }
+ibc-relayer-types  = { version = "0.24.0", path = "../relayer-types" }
 ibc-relayer        = { version = "0.24.0", path = "../relayer" }
 ibc-telemetry      = { version = "0.24.0", path = "../telemetry", optional = true }
 ibc-relayer-rest   = { version = "0.24.0", path = "../relayer-rest", optional = true }

crates/relayer-cli/src/commands/config/auto.rs

@@ -94,7 +94,7 @@ impl Runnable for AutoCmd {
                     .iter_mut()
                     .zip(names_and_keys.iter().map(|n| &n.1).cloned());
 
-                for (mut chain_config, key_option) in configs_and_keys {
+                for (chain_config, key_option) in configs_and_keys {
                     // If a key is provided, use it
                     if let Some(key_name) = key_option {
                         info!("{}: uses key \"{}\"", &chain_config.id, &key_name);

crates/relayer-types/Cargo.toml

@@ -17,17 +17,14 @@ description  = """
 all-features = true
 
 [features]
-default = ["std"]
-std = ["flex-error/std", "flex-error/eyre_tracer", "ibc-proto/std", "clock"]
-clock = ["tendermint/clock", "time/std"]
-
+clock = []
 # This feature grants access to development-time mocking libraries, such as `MockContext` or `MockHeader`.
 # Depends on the `testgen` suite for generating Tendermint light blocks.
-mocks = ["tendermint-testgen", "clock", "std"]
+mocks = ["tendermint-testgen", "clock"]
 
 [dependencies]
 # Proto definitions for all IBC-related interfaces, e.g., connections or channels.
-ibc-proto = { version = "0.31.0-alpha.2", features = ["std"] }
+ibc-proto = { version = "0.31.0-alpha.2" }
 ics23 = { version = "0.10.1", features = ["std", "host-functions"] }
 time = { version = ">=0.3.0, <0.3.21" }
 serde_derive = { version = "1.0.104" }
@@ -39,15 +36,16 @@ bytes = { version = "1.4.0" }
 safe-regex = { version = "0.2.5" }
 subtle-encoding = { version = "0.5" }
 flex-error = { version = "0.4.4" }
-derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
+derive_more = { version = "0.99.17", features = ["from", "into", "display"] }
 uint = { version = "0.9" }
 itertools = { version = "0.10.3" }
-primitive-types = { version = "0.12.1", default-features = false, features = ["serde_no_std"] }
+primitive-types = { version = "0.12.1", features = ["serde_no_std"] }
 dyn-clone = "1.0.8"
 num-rational = "0.4.1"
 
 [dependencies.tendermint]
 version = "0.32.0"
+features = ["clock"]
 
 [dependencies.tendermint-proto]
 version = "0.32.0"

crates/relayer-types/src/applications/ics29_fee/error.rs

@@ -4,7 +4,6 @@ use prost::EncodeError;
 use crate::applications::transfer::error::Error as TransferError;
 use crate::core::ics04_channel::error::Error as ChannelError;
 use crate::core::ics24_host::error::ValidationError;
-use crate::prelude::*;
 use crate::signer::SignerError;
 
 define_error! {

crates/relayer-types/src/applications/ics29_fee/events.rs

@@ -1,15 +1,15 @@
-use core::fmt::Display;
-use core::str::FromStr;
 use itertools::Itertools;
 use serde_derive::{Deserialize, Serialize};
+use std::fmt::Display;
+use std::str::FromStr;
 use tendermint::abci;
 
 use super::error::Error;
 use crate::applications::transfer::coin::RawCoin;
 use crate::core::ics04_channel::packet::Sequence;
 use crate::core::ics24_host::identifier::{ChannelId, PortId};
 use crate::events::IbcEventType;
-use crate::prelude::*;
+
 use crate::signer::Signer;
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]

crates/relayer-types/src/applications/ics29_fee/msgs/pay_packet.rs

@@ -4,7 +4,7 @@ use ibc_proto::ibc::applications::fee::v1::{Fee as ProtoFee, MsgPayPacketFee};
 use crate::applications::ics29_fee::error::Error;
 use crate::applications::transfer::coin::RawCoin;
 use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::prelude::*;
+
 use crate::signer::Signer;
 use crate::tx_msg::encode_message;
 

crates/relayer-types/src/applications/ics29_fee/msgs/pay_packet_async.rs

@@ -8,7 +8,7 @@ use crate::applications::ics29_fee::error::Error;
 use crate::applications::transfer::coin::RawCoin;
 use crate::core::ics04_channel::packet::Sequence;
 use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::prelude::*;
+
 use crate::signer::Signer;
 use crate::tx_msg::encode_message;
 

crates/relayer-types/src/applications/ics29_fee/msgs/register_payee.rs

@@ -3,7 +3,7 @@ use ibc_proto::ibc::applications::fee::v1::{MsgRegisterCounterpartyPayee, MsgReg
 
 use crate::applications::ics29_fee::error::Error;
 use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::prelude::*;
+
 use crate::signer::Signer;
 use crate::tx_msg::encode_message;
 

crates/relayer-types/src/applications/ics29_fee/packet_fee.rs

@@ -1,14 +1,14 @@
-use core::str::FromStr;
 use ibc_proto::cosmos::base::v1beta1::Coin as ProtoCoin;
 use ibc_proto::ibc::applications::fee::v1::{
     Fee as ProtoFee, IdentifiedPacketFees as ProtoIdentifiedPacketFees, PacketFee as ProtoPacketFee,
 };
+use std::str::FromStr;
 
 use super::error::Error;
 use crate::applications::transfer::amount::Amount;
 use crate::applications::transfer::coin::RawCoin;
 use crate::core::ics04_channel::packet_id::PacketId;
-use crate::prelude::*;
+
 use crate::signer::Signer;
 
 /// The core type that encodes the different fees that are redeemable by relayers for relaying

crates/relayer-types/src/applications/ics31_icq/error.rs

@@ -1,7 +1,6 @@
 use crate::core::ics24_host::error::ValidationError as Ics24ValidationError;
 use tendermint::error::Error as TendermintError;
 
-use crate::prelude::*;
 use flex_error::define_error;
 
 define_error! {

crates/relayer-types/src/applications/ics31_icq/events.rs

@@ -1,12 +1,11 @@
-use alloc::collections::BTreeMap;
-use core::str::FromStr;
+use std::collections::BTreeMap;
+use std::str::FromStr;
 
 use serde::{Deserialize, Serialize};
 use tendermint::{abci, block::Height};
 
 use crate::core::ics24_host::identifier::{ChainId, ConnectionId};
 use crate::events::IbcEvent;
-use crate::prelude::*;
 
 use super::error::Error;