diff --git a/Cargo.lock b/Cargo.lock index c8da97c9d6..212e3ce044 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1360,6 +1360,7 @@ dependencies = [ "hermes-cosmos-chain-preset", "hermes-encoding-components", "hermes-error", + "hermes-prelude", "hermes-protobuf-encoding-components", "hermes-relayer-components", "ibc", @@ -1377,6 +1378,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", + "hermes-prelude", "hermes-runtime-components", ] @@ -1396,6 +1398,7 @@ dependencies = [ "hermes-error", "hermes-ibc-test-suite", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-relayer-components-extra", "hermes-runtime", @@ -1420,6 +1423,7 @@ dependencies = [ "hermes-chain-type-components", "hermes-core", "hermes-cosmos-test-components", + "hermes-prelude", "hermes-relayer-components", "hermes-runtime-components", "hermes-test-components", @@ -1435,6 +1439,7 @@ dependencies = [ "cgp", "hermes-chain-type-components", "hermes-encoding-components", + "hermes-prelude", "hermes-runtime-components", ] @@ -1443,6 +1448,7 @@ name = "hermes-chain-type-components" version = "0.1.0" dependencies = [ "cgp", + "hermes-prelude", ] [[package]] @@ -1460,6 +1466,7 @@ dependencies = [ "hermes-cli-framework", "hermes-core", "hermes-cosmos-core", + "hermes-prelude", "http 1.3.1", "humantime", "prost", @@ -1477,6 +1484,7 @@ dependencies = [ "cgp", "clap", "hermes-core", + "hermes-prelude", "http 1.3.1", "humantime", "ibc", @@ -1493,6 +1501,7 @@ dependencies = [ "eyre", "hermes-cosmos-relayer", "hermes-error", + "hermes-prelude", "hermes-runtime", "serde", "serde_json", @@ -1508,6 +1517,7 @@ version = "0.1.0" dependencies = [ "cgp", "hermes-chain-type-components", + "hermes-prelude", ] [[package]] @@ -1520,6 +1530,7 @@ dependencies = [ "hermes-chain-type-components", "hermes-comet-light-client-components", "hermes-error", + "hermes-prelude", "tendermint", "tendermint-light-client-verifier", "tendermint-rpc", @@ -1534,6 +1545,7 @@ dependencies = [ "hermes-chain-type-components", "hermes-encoding-components", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-relayer-components-extra", "hermes-runtime-components", @@ -1558,6 +1570,7 @@ dependencies = [ "hermes-core", "hermes-cosmos-encoding-components", "hermes-error", + "hermes-prelude", "hermes-protobuf-encoding-components", "http 1.3.1", "ibc", @@ -1595,6 +1608,7 @@ dependencies = [ "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-test-components", + "hermes-prelude", ] [[package]] @@ -1631,6 +1645,7 @@ version = "0.1.0" dependencies = [ "cgp", "hermes-core", + "hermes-prelude", "hermes-protobuf-encoding-components", "ibc", "ibc-proto", @@ -1651,6 +1666,7 @@ dependencies = [ "hermes-cosmos-test-components", "hermes-error", "hermes-ibc-test-suite", + "hermes-prelude", "hermes-runtime", "hermes-tracing-logging-components", "hermes-wasm-test-components", @@ -1681,6 +1697,7 @@ dependencies = [ "hermes-cosmos-chain-preset", "hermes-cosmos-test-components", "hermes-error", + "hermes-prelude", "hermes-protobuf-encoding-components", "hermes-runtime", "hermes-tracing-logging-components", @@ -1716,6 +1733,7 @@ dependencies = [ "hdpath", "hermes-core", "hermes-cosmos-chain-components", + "hermes-prelude", "hermes-runtime", "http 1.3.1", "ibc", @@ -1748,6 +1766,7 @@ dependencies = [ "hermes-cosmos-relayer", "hermes-cosmos-test-components", "hermes-error", + "hermes-prelude", "hermes-protobuf-encoding-components", "hermes-runtime", "hermes-tracing-logging-components", @@ -1780,6 +1799,7 @@ name = "hermes-encoding-components" version = "0.1.0" dependencies = [ "cgp", + "hermes-prelude", ] [[package]] @@ -1789,6 +1809,7 @@ dependencies = [ "cgp", "eyre", "hermes-core", + "hermes-prelude", "hermes-relayer-components", ] @@ -1799,6 +1820,7 @@ dependencies = [ "cgp", "hermes-chain-type-components", "hermes-encoding-components", + "hermes-prelude", ] [[package]] @@ -1811,6 +1833,7 @@ dependencies = [ "hermes-encoding-components", "hermes-ibc-components", "hermes-ibc-token-transfer-components", + "hermes-prelude", ] [[package]] @@ -1822,6 +1845,7 @@ dependencies = [ "hermes-chain-type-components", "hermes-core", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-test-components", ] @@ -1834,6 +1858,7 @@ dependencies = [ "hermes-chain-type-components", "hermes-encoding-components", "hermes-ibc-components", + "hermes-prelude", ] [[package]] @@ -1841,6 +1866,7 @@ name = "hermes-logging-components" version = "0.1.0" dependencies = [ "cgp", + "hermes-prelude", ] [[package]] @@ -1854,6 +1880,7 @@ dependencies = [ "hermes-core", "hermes-cosmos-chain-components", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-runtime", "hermes-runtime-components", @@ -1861,12 +1888,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "hermes-prelude" +version = "0.1.0" +dependencies = [ + "cgp", + "cgp-async", +] + [[package]] name = "hermes-protobuf-encoding-components" version = "0.1.0" dependencies = [ "cgp", "hermes-encoding-components", + "hermes-prelude", "prost", "prost-types", ] @@ -1881,6 +1917,7 @@ dependencies = [ "hermes-chain-type-components", "hermes-encoding-components", "hermes-logging-components", + "hermes-prelude", "hermes-runtime-components", ] @@ -1892,6 +1929,7 @@ dependencies = [ "futures", "hermes-chain-type-components", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-runtime-components", ] @@ -1903,6 +1941,7 @@ dependencies = [ "cgp", "hermes-async-runtime-components", "hermes-logging-components", + "hermes-prelude", "hermes-runtime-components", "hermes-tokio-runtime-components", "hermes-tracing-logging-components", @@ -1914,6 +1953,7 @@ name = "hermes-runtime-components" version = "0.1.0" dependencies = [ "cgp", + "hermes-prelude", ] [[package]] @@ -1932,6 +1972,7 @@ dependencies = [ "hermes-cosmos-relayer", "hermes-encoding-components", "hermes-error", + "hermes-prelude", "hermes-protobuf-encoding-components", "hermes-relayer-components", "hermes-relayer-components-extra", @@ -1967,6 +2008,7 @@ dependencies = [ "hermes-encoding-components", "hermes-error", "hermes-logging-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "hermes-relayer-components", "hermes-relayer-components-extra", @@ -1994,6 +2036,7 @@ dependencies = [ "cgp", "hermes-chain-type-components", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-relayer-components-extra", "hermes-runtime-components", @@ -2007,6 +2050,7 @@ dependencies = [ "futures", "hermes-async-runtime-components", "hermes-logging-components", + "hermes-prelude", "hermes-runtime-components", "itertools", "rand", @@ -2021,6 +2065,7 @@ dependencies = [ "cgp", "hermes-core", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-relayer-components-extra", "tracing", @@ -2037,6 +2082,7 @@ dependencies = [ "hermes-cosmos-chain-preset", "hermes-cosmos-encoding-components", "hermes-error", + "hermes-prelude", "hermes-protobuf-encoding-components", "hermes-wasm-encoding-components", "ibc", @@ -2052,6 +2098,7 @@ dependencies = [ "cgp", "hermes-core", "hermes-cosmos-encoding-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "ibc", "prost", @@ -2066,6 +2113,7 @@ dependencies = [ "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-test-components", + "hermes-prelude", "ibc", "ibc-proto", "prost", diff --git a/Cargo.toml b/Cargo.toml index b15dac7196..bacfa9902a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ resolver = "2" members = [ + "crates/prelude", "crates/core", "crates/chain/chain-components", @@ -89,6 +90,7 @@ tendermint-light-client = { version = "0.40" } basecoin = { version = "0.2.0" } bitcoin = { version = "0.31.2" } cgp = { version = "0.4.0", default-features = false } +cgp-async = { version = "0.4.0" } clap = { version = "4.5.20" } dirs-next = { version = "2.0.0" } num-bigint = { version = "0.4" } @@ -127,7 +129,8 @@ sha2 = { version = "0.10.8" } secp256k1 = { version = "0.28.2" } ics23 = { version = "0.12" } -hermes-core = { version = "0.1.0" } +hermes-core = { version = "0.1.0" } +hermes-prelude = { version = "0.1.0" } hermes-runtime-components = { version = "0.1.0" } hermes-async-runtime-components = { version = "0.1.0" } @@ -200,7 +203,8 @@ cgp-runtime = { git = "https://github.com/contextgeneric/cgp.git" } cgp-sync = { git = "https://github.com/contextgeneric/cgp.git" } cgp-inner = { git = "https://github.com/contextgeneric/cgp.git" } -hermes-core = { path = "./crates/core" } +hermes-core = { path = "./crates/core" } +hermes-prelude = { path = "./crates/prelude" } hermes-chain-components = { path = "./crates/chain/chain-components" } hermes-chain-type-components = { path = "./crates/chain/chain-type-components" } diff --git a/crates/any/any-counterparty/Cargo.toml b/crates/any/any-counterparty/Cargo.toml index a988cbd48e..7ab5b24de0 100644 --- a/crates/any/any-counterparty/Cargo.toml +++ b/crates/any/any-counterparty/Cargo.toml @@ -22,6 +22,7 @@ hermes-cosmos-chain-preset = { workspace = true } hermes-encoding-components = { workspace = true } hermes-protobuf-encoding-components = { workspace = true } -cgp = { workspace = true } -ibc = { workspace = true } -serde = { workspace = true, features = [ "derive" ] } +cgp = { workspace = true } +hermes-prelude = { workspace = true } +ibc = { workspace = true } +serde = { workspace = true, features = [ "derive" ] } diff --git a/crates/any/any-counterparty/src/contexts/any_counterparty.rs b/crates/any/any-counterparty/src/contexts/any_counterparty.rs index f4a33e6589..c46969a002 100644 --- a/crates/any/any-counterparty/src/contexts/any_counterparty.rs +++ b/crates/any/any-counterparty/src/contexts/any_counterparty.rs @@ -1,6 +1,5 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_cosmos_chain_components::encoding::CosmosClientEncodingComponents; use hermes_cosmos_chain_components::impls::ProvideCosmosChainTypes; use hermes_cosmos_chain_components::types::TendermintClientState; @@ -16,6 +15,7 @@ pub use hermes_encoding_components::traits::{SchemaGetterComponent, SchemaTypeCo use hermes_encoding_components::types::AsBytes; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; +use hermes_prelude::*; use hermes_protobuf_encoding_components::traits::EncodedLengthGetterComponent; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; diff --git a/crates/any/any-counterparty/src/impls/encoding/client_state.rs b/crates/any/any-counterparty/src/impls/encoding/client_state.rs index 32cb4b83c0..889d2897cc 100644 --- a/crates/any/any-counterparty/src/impls/encoding/client_state.rs +++ b/crates/any/any-counterparty/src/impls/encoding/client_state.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cosmos_chain_components::types::TendermintClientState; use hermes_encoding_components::traits::{ CanDecode, Converter, ConverterComponent, Decoder, DecoderComponent, HasEncodedType, HasSchema, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use hermes_protobuf_encoding_components::vendor::HasSchemaType; diff --git a/crates/any/any-counterparty/src/impls/encoding/consensus_state.rs b/crates/any/any-counterparty/src/impls/encoding/consensus_state.rs index 9e15658ce9..bacfcbf683 100644 --- a/crates/any/any-counterparty/src/impls/encoding/consensus_state.rs +++ b/crates/any/any-counterparty/src/impls/encoding/consensus_state.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cosmos_chain_components::types::TendermintConsensusState; use hermes_encoding_components::traits::{ CanDecode, Converter, ConverterComponent, Decoder, DecoderComponent, HasEncodedType, HasSchema, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use hermes_protobuf_encoding_components::vendor::HasSchemaType; diff --git a/crates/any/any-counterparty/src/impls/encoding/convert.rs b/crates/any/any-counterparty/src/impls/encoding/convert.rs index 6c5f66a763..ece28a8f95 100644 --- a/crates/any/any-counterparty/src/impls/encoding/convert.rs +++ b/crates/any/any-counterparty/src/impls/encoding/convert.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::encoding::CosmosClientEncodingComponents; use hermes_cosmos_chain_components::types::{ ProtoTendermintClientState, ProtoTendermintConsensusState, TendermintClientState, TendermintConsensusState, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::any::Any; use crate::impls::{EncodeAnyClientState, EncodeAnyConsensusState}; diff --git a/crates/any/any-counterparty/src/impls/encoding/encode.rs b/crates/any/any-counterparty/src/impls/encoding/encode.rs index 6f71d7e94d..3429a1951a 100644 --- a/crates/any/any-counterparty/src/impls/encoding/encode.rs +++ b/crates/any/any-counterparty/src/impls/encoding/encode.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::encoding::CosmosClientEncodingComponents; use hermes_cosmos_chain_components::types::{ ProtoTendermintClientState, ProtoTendermintConsensusState, TendermintClientState, TendermintConsensusState, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; diff --git a/crates/any/any-counterparty/src/impls/types/client_state.rs b/crates/any/any-counterparty/src/impls/types/client_state.rs index 9474a98d75..8491659d3e 100644 --- a/crates/any/any-counterparty/src/impls/types/client_state.rs +++ b/crates/any/any-counterparty/src/impls/types/client_state.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ ClientStateFieldsComponent, ClientStateFieldsGetter, ClientStateTypeComponent, HasChainIdType, HasClientStateType, HasHeightType, ProvideClientStateType, diff --git a/crates/any/any-counterparty/src/impls/types/consensus_state.rs b/crates/any/any-counterparty/src/impls/types/consensus_state.rs index 72f6307a5a..9baa822e9d 100644 --- a/crates/any/any-counterparty/src/impls/types/consensus_state.rs +++ b/crates/any/any-counterparty/src/impls/types/consensus_state.rs @@ -1,6 +1,6 @@ use cgp::core::Async; -use cgp::prelude::*; use hermes_cosmos_chain_components::types::Time; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ ConsensusStateFieldComponent, ConsensusStateFieldGetter, ConsensusStateTypeComponent, HasConsensusStateType, HasTimeType, ProvideConsensusStateType, diff --git a/crates/celestia/celestia-integration-tests/Cargo.toml b/crates/celestia/celestia-integration-tests/Cargo.toml index f86c57979f..999d71e113 100644 --- a/crates/celestia/celestia-integration-tests/Cargo.toml +++ b/crates/celestia/celestia-integration-tests/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime-components = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } diff --git a/crates/celestia/celestia-integration-tests/src/contexts/bootstrap.rs b/crates/celestia/celestia-integration-tests/src/contexts/bootstrap.rs index 115b70d933..059948363a 100644 --- a/crates/celestia/celestia-integration-tests/src/contexts/bootstrap.rs +++ b/crates/celestia/celestia-integration-tests/src/contexts/bootstrap.rs @@ -3,7 +3,6 @@ use std::path::PathBuf; use std::sync::OnceLock; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_celestia_test_components::bootstrap::components::CelestiaBootstrapComponents as BaseCelestiaBootstrapComponents; use hermes_celestia_test_components::bootstrap::traits::bootstrap_bridge::BridgeBootstrapperComponent; use hermes_celestia_test_components::bootstrap::traits::bridge_auth_token::BridgeAuthTokenGeneratorComponent; @@ -48,6 +47,7 @@ use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::types::HermesError; use hermes_logging_components::traits::LoggerComponent; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_test_components::bootstrap::traits::ChainBootstrapperComponent; diff --git a/crates/celestia/celestia-integration-tests/src/contexts/bridge_driver.rs b/crates/celestia/celestia-integration-tests/src/contexts/bridge_driver.rs index d16105e7ae..7c9be0f0ce 100644 --- a/crates/celestia/celestia-integration-tests/src/contexts/bridge_driver.rs +++ b/crates/celestia/celestia-integration-tests/src/contexts/bridge_driver.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_celestia_test_components::bridge_driver::traits::bridge_auth_token::{ BridgeAuthTokenGetter, BridgeAuthTokenGetterComponent, BridgeAuthTokenTypeComponent, ProvideBridgeAuthTokenType, @@ -7,6 +6,7 @@ use hermes_celestia_test_components::bridge_driver::traits::bridge_rpc_port::{ BridgeRpcPortGetter, BridgeRpcPortGetterComponent, }; use hermes_celestia_test_components::types::bridge_config::CelestiaBridgeConfig; +use hermes_prelude::*; use tokio::process::Child; #[cgp_context(CelestiaBridgeDriverComponents)] diff --git a/crates/celestia/celestia-test-components/Cargo.toml b/crates/celestia/celestia-test-components/Cargo.toml index 25d458cd2c..ce7ca6f1d3 100644 --- a/crates/celestia/celestia-test-components/Cargo.toml +++ b/crates/celestia/celestia-test-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime-components = { workspace = true } hermes-chain-type-components = { workspace = true } hermes-relayer-components = { workspace = true } diff --git a/crates/celestia/celestia-test-components/src/bootstrap/components.rs b/crates/celestia/celestia-test-components/src/bootstrap/components.rs index 292adbeb3d..4e22fc2715 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/components.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/components.rs @@ -1,7 +1,7 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; use hermes_cosmos_test_components::bootstrap::traits::WalletConfigGeneratorComponent; + use hermes_prelude::*; use crate::bootstrap::impls::bootstrap_bridge::BootstrapCelestiaBridge; use crate::bootstrap::impls::bridge_auth_token::GenerateBridgeJwtToken; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/impls/bootstrap_bridge.rs b/crates/celestia/celestia-test-components/src/bootstrap/impls/bootstrap_bridge.rs index b899cb36f4..3dc7ad0442 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/impls/bootstrap_bridge.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/impls/bootstrap_bridge.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasChainId; use hermes_runtime_components::traits::{ CanGenerateRandom, HasChildProcessType, HasFilePathType, HasRuntime, diff --git a/crates/celestia/celestia-test-components/src/bootstrap/impls/bridge_auth_token.rs b/crates/celestia/celestia-test-components/src/bootstrap/impls/bridge_auth_token.rs index 8912666cbb..468c25c95b 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/impls/bridge_auth_token.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/impls/bridge_auth_token.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasChainIdType; use hermes_runtime_components::traits::{CanExecCommandWithEnvs, HasRuntime}; use hermes_test_components::chain_driver::traits::HasChainType; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/impls/copy_bridge_key.rs b/crates/celestia/celestia-test-components/src/bootstrap/impls/copy_bridge_key.rs index ef30662476..a51a708d09 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/impls/copy_bridge_key.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/impls/copy_bridge_key.rs @@ -1,7 +1,7 @@ use std::io::Error as IoError; use std::path::PathBuf; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasChainId; use hermes_runtime_components::traits::{CanCopyFile, HasFilePathType, HasRuntime}; use hermes_test_components::chain_driver::traits::{HasChain, HasChainHomeDir}; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/impls/generate_wallet_config.rs b/crates/celestia/celestia-test-components/src/bootstrap/impls/generate_wallet_config.rs index 54ad4a963f..923820939f 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/impls/generate_wallet_config.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/impls/generate_wallet_config.rs @@ -1,7 +1,6 @@ use alloc::collections::BTreeMap; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasDenomType; use hermes_cosmos_test_components::bootstrap::traits::{ DenomForStaking, DenomForTransfer, HasChainGenesisConfigType, HasGenesisDenom, @@ -9,6 +8,7 @@ use hermes_cosmos_test_components::bootstrap::traits::{ }; use hermes_cosmos_test_components::bootstrap::types::CosmosWalletConfig; use hermes_cosmos_test_components::chain::types::{Amount, Denom}; +use hermes_prelude::*; use hermes_test_components::chain_driver::traits::HasChainType; #[cgp_new_provider(WalletConfigGeneratorComponent)] diff --git a/crates/celestia/celestia-test-components/src/bootstrap/impls/init_bridge_data.rs b/crates/celestia/celestia-test-components/src/bootstrap/impls/init_bridge_data.rs index 50e87381a4..990d2ac409 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/impls/init_bridge_data.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/impls/init_bridge_data.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasChainIdType; use hermes_runtime_components::traits::{ CanCreateDir, CanExecCommandWithEnvs, HasFilePathType, HasRuntime, diff --git a/crates/celestia/celestia-test-components/src/bootstrap/impls/start_bridge.rs b/crates/celestia/celestia-test-components/src/bootstrap/impls/start_bridge.rs index a8e370a052..3b89c032b5 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/impls/start_bridge.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/impls/start_bridge.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasChainId; use hermes_runtime_components::traits::{ CanSleep, CanStartChildProcess, HasFilePathType, HasRuntime, diff --git a/crates/celestia/celestia-test-components/src/bootstrap/impls/types/bridge_config.rs b/crates/celestia/celestia-test-components/src/bootstrap/impls/types/bridge_config.rs index 092cf33924..b57871ac71 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/impls/types/bridge_config.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/impls/types/bridge_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::bootstrap::traits::types::bridge_config::{ BridgeConfigTypeComponent, ProvideBridgeConfigType, diff --git a/crates/celestia/celestia-test-components/src/bootstrap/impls/update_bridge_config.rs b/crates/celestia/celestia-test-components/src/bootstrap/impls/update_bridge_config.rs index 8303cd3314..f4161cb407 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/impls/update_bridge_config.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/impls/update_bridge_config.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cosmos_test_components::chain_driver::traits::{HasGrpcPort, HasRpcPort}; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ CanQueryBlock, HasBlockHash, HasChainId, HasGenesisHeight, }; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/traits/bootstrap_bridge.rs b/crates/celestia/celestia-test-components/src/bootstrap/traits/bootstrap_bridge.rs index 892805695a..7d1b503967 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/traits/bootstrap_bridge.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/traits/bootstrap_bridge.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::HasRuntime; use hermes_test_components::driver::traits::HasChainDriverType; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/traits/bridge_auth_token.rs b/crates/celestia/celestia-test-components/src/bootstrap/traits/bridge_auth_token.rs index a4894d00d4..de28693794 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/traits/bridge_auth_token.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/traits/bridge_auth_token.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasChainIdType; use hermes_relayer_components::chain::types::aliases::ChainIdOf; use hermes_runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntimeType}; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/traits/bridge_store_dir.rs b/crates/celestia/celestia-test-components/src/bootstrap/traits/bridge_store_dir.rs index a3482e656e..7a3ed0eb8c 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/traits/bridge_store_dir.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/traits/bridge_store_dir.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; #[cgp_component { diff --git a/crates/celestia/celestia-test-components/src/bootstrap/traits/build_bridge_driver.rs b/crates/celestia/celestia-test-components/src/bootstrap/traits/build_bridge_driver.rs index b44901ab92..9f92510e7d 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/traits/build_bridge_driver.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/traits/build_bridge_driver.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{ChildProcessOf, HasChildProcessType, HasRuntimeType}; use crate::bootstrap::traits::types::bridge_config::HasBridgeConfigType; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/traits/import_bridge_key.rs b/crates/celestia/celestia-test-components/src/bootstrap/traits/import_bridge_key.rs index d5e44a558f..7b9d6c80b1 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/traits/import_bridge_key.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/traits/import_bridge_key.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; use hermes_test_components::driver::traits::HasChainDriverType; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/traits/init_bridge_config.rs b/crates/celestia/celestia-test-components/src/bootstrap/traits/init_bridge_config.rs index 1c17c1feb0..b1a02da52a 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/traits/init_bridge_config.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/traits/init_bridge_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntimeType}; use hermes_test_components::driver::traits::HasChainDriverType; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/traits/init_bridge_data.rs b/crates/celestia/celestia-test-components/src/bootstrap/traits/init_bridge_data.rs index 2be43c44ba..0ee26a98bd 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/traits/init_bridge_data.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/traits/init_bridge_data.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasChainIdType; use hermes_relayer_components::chain::types::aliases::ChainIdOf; use hermes_runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/traits/start_bridge.rs b/crates/celestia/celestia-test-components/src/bootstrap/traits/start_bridge.rs index 2462f09e04..69ba6eb69c 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/traits/start_bridge.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/traits/start_bridge.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{ ChildProcessOf, FilePathOf, HasChildProcessType, HasFilePathType, HasRuntimeType, }; diff --git a/crates/celestia/celestia-test-components/src/bootstrap/traits/types/bridge_config.rs b/crates/celestia/celestia-test-components/src/bootstrap/traits/types/bridge_config.rs index b5b19f1245..727e78902b 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/traits/types/bridge_config.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/traits/types/bridge_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: BridgeConfigTypeComponent, diff --git a/crates/celestia/celestia-test-components/src/bootstrap/traits/types/bridge_driver.rs b/crates/celestia/celestia-test-components/src/bootstrap/traits/types/bridge_driver.rs index d076553723..94f4086dc9 100644 --- a/crates/celestia/celestia-test-components/src/bootstrap/traits/types/bridge_driver.rs +++ b/crates/celestia/celestia-test-components/src/bootstrap/traits/types/bridge_driver.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: BridgeDriverTypeComponent, diff --git a/crates/celestia/celestia-test-components/src/bridge_driver/traits/bridge_auth_token.rs b/crates/celestia/celestia-test-components/src/bridge_driver/traits/bridge_auth_token.rs index 66e736310e..c2e2b32bb6 100644 --- a/crates/celestia/celestia-test-components/src/bridge_driver/traits/bridge_auth_token.rs +++ b/crates/celestia/celestia-test-components/src/bridge_driver/traits/bridge_auth_token.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: BridgeAuthTokenTypeComponent, diff --git a/crates/celestia/celestia-test-components/src/bridge_driver/traits/bridge_rpc_port.rs b/crates/celestia/celestia-test-components/src/bridge_driver/traits/bridge_rpc_port.rs index e0c8cbf994..1bf497a9ed 100644 --- a/crates/celestia/celestia-test-components/src/bridge_driver/traits/bridge_rpc_port.rs +++ b/crates/celestia/celestia-test-components/src/bridge_driver/traits/bridge_rpc_port.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: BridgeRpcPortGetter, diff --git a/crates/chain/chain-components/Cargo.toml b/crates/chain/chain-components/Cargo.toml index 22314ff654..ad7c7089f5 100644 --- a/crates/chain/chain-components/Cargo.toml +++ b/crates/chain/chain-components/Cargo.toml @@ -12,7 +12,8 @@ description = """ """ [dependencies] -cgp = { workspace = true, features = [ "full" ] } +cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime-components = { workspace = true } hermes-encoding-components = { workspace = true } hermes-chain-type-components = { workspace = true } diff --git a/crates/chain/chain-components/src/impls/payload_builders/channel.rs b/crates/chain/chain-components/src/impls/payload_builders/channel.rs index ac8d6eb8ca..41c46279a7 100644 --- a/crates/chain/chain-components/src/impls/payload_builders/channel.rs +++ b/crates/chain/chain-components/src/impls/payload_builders/channel.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{ HasChannelIdType, HasConnectionIdType, HasHeightType, HasPortIdType, }; +use hermes_prelude::*; use crate::traits::{ CanQueryChannelEndWithProofs, CanQueryCounterpartyConnectionId, ChannelOpenAckPayloadBuilder, diff --git a/crates/chain/chain-components/src/impls/payload_builders/connection.rs b/crates/chain/chain-components/src/impls/payload_builders/connection.rs index 116f156fbd..94fde3ff8d 100644 --- a/crates/chain/chain-components/src/impls/payload_builders/connection.rs +++ b/crates/chain/chain-components/src/impls/payload_builders/connection.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasClientIdType, HasConnectionIdType, HasHeightType}; +use hermes_prelude::*; use crate::traits::{ CanQueryClientStateWithProofs, CanQueryConnectionEndWithProofs, diff --git a/crates/chain/chain-components/src/impls/payload_builders/packet.rs b/crates/chain/chain-components/src/impls/payload_builders/packet.rs index 23e599665c..04c4c13bd4 100644 --- a/crates/chain/chain-components/src/impls/payload_builders/packet.rs +++ b/crates/chain/chain-components/src/impls/payload_builders/packet.rs @@ -1,9 +1,9 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_chain_type_components::traits::{ CanIncrementHeight, HasHeightType, HasOutgoingPacketType, }; +use hermes_prelude::*; use crate::traits::{ AckPacketPayloadBuilder, AckPacketPayloadBuilderComponent, CanQueryPacketAckCommitment, diff --git a/crates/chain/chain-components/src/impls/queries/block_events.rs b/crates/chain/chain-components/src/impls/queries/block_events.rs index e6b092899e..2bd87e1628 100644 --- a/crates/chain/chain-components/src/impls/queries/block_events.rs +++ b/crates/chain/chain-components/src/impls/queries/block_events.rs @@ -2,8 +2,8 @@ use alloc::vec::Vec; use core::marker::PhantomData; use core::time::Duration; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasEventType, HasHeightType}; +use hermes_prelude::*; use hermes_runtime_components::traits::{CanSleep, HasRuntime}; use crate::traits::{ diff --git a/crates/chain/chain-components/src/impls/queries/consensus_state_height.rs b/crates/chain/chain-components/src/impls/queries/consensus_state_height.rs index 9f798714af..6a3914394f 100644 --- a/crates/chain/chain-components/src/impls/queries/consensus_state_height.rs +++ b/crates/chain/chain-components/src/impls/queries/consensus_state_height.rs @@ -1,7 +1,7 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasClientIdType; +use hermes_prelude::*; use crate::traits::{ CanQueryConsensusStateHeights, ConsensusStateHeightQuerier, diff --git a/crates/chain/chain-components/src/impls/queries/consensus_state_heights.rs b/crates/chain/chain-components/src/impls/queries/consensus_state_heights.rs index fbe81851d8..4f5ab272df 100644 --- a/crates/chain/chain-components/src/impls/queries/consensus_state_heights.rs +++ b/crates/chain/chain-components/src/impls/queries/consensus_state_heights.rs @@ -2,8 +2,8 @@ use alloc::vec; use alloc::vec::Vec; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; +use hermes_prelude::*; use crate::traits::{ CanQueryClientStateWithLatestHeight, ConsensusStateHeightsQuerier, diff --git a/crates/chain/chain-components/src/impls/queries/packet_is_cleared.rs b/crates/chain/chain-components/src/impls/queries/packet_is_cleared.rs index 41f1468077..058a846597 100644 --- a/crates/chain/chain-components/src/impls/queries/packet_is_cleared.rs +++ b/crates/chain/chain-components/src/impls/queries/packet_is_cleared.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ CanQueryChainHeight, CanQueryPacketCommitment, PacketIsClearedQuerier, diff --git a/crates/chain/chain-components/src/impls/queries/query_and_convert_client_state.rs b/crates/chain/chain-components/src/impls/queries/query_and_convert_client_state.rs index 6de95a87d4..e7be0b5aec 100644 --- a/crates/chain/chain-components/src/impls/queries/query_and_convert_client_state.rs +++ b/crates/chain/chain-components/src/impls/queries/query_and_convert_client_state.rs @@ -1,9 +1,9 @@ use alloc::vec::Vec; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{CanConvert, HasDefaultEncoding}; use hermes_encoding_components::types::AsBytes; +use hermes_prelude::*; use crate::traits::{ AllClientStatesQuerier, AllClientStatesQuerierComponent, CanQueryAllRawClientStates, diff --git a/crates/chain/chain-components/src/impls/queries/query_and_convert_consensus_state.rs b/crates/chain/chain-components/src/impls/queries/query_and_convert_consensus_state.rs index 6e636f03a6..70ff0723a0 100644 --- a/crates/chain/chain-components/src/impls/queries/query_and_convert_consensus_state.rs +++ b/crates/chain/chain-components/src/impls/queries/query_and_convert_consensus_state.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{CanConvert, HasDefaultEncoding}; use hermes_encoding_components::types::AsBytes; +use hermes_prelude::*; use crate::traits::{ CanQueryRawConsensusState, CanQueryRawConsensusStateWithProofs, ConsensusStateQuerier, diff --git a/crates/chain/chain-components/src/impls/queries/query_and_decode_consensus_state.rs b/crates/chain/chain-components/src/impls/queries/query_and_decode_consensus_state.rs index b18514cc97..ae00a92ef6 100644 --- a/crates/chain/chain-components/src/impls/queries/query_and_decode_consensus_state.rs +++ b/crates/chain/chain-components/src/impls/queries/query_and_decode_consensus_state.rs @@ -1,9 +1,9 @@ use alloc::vec::Vec; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; use hermes_encoding_components::types::AsBytes; +use hermes_prelude::*; use crate::traits::{ CanQueryRawConsensusState, ConsensusStateQuerier, ConsensusStateQuerierComponent, diff --git a/crates/chain/chain-components/src/impls/types/commitment.rs b/crates/chain/chain-components/src/impls/types/commitment.rs index 4bbbfddecc..53e315e684 100644 --- a/crates/chain/chain-components/src/impls/types/commitment.rs +++ b/crates/chain/chain-components/src/impls/types/commitment.rs @@ -1,6 +1,6 @@ use alloc::vec::Vec; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{PacketCommitmentTypeComponent, ProvidePacketCommitmentType}; diff --git a/crates/chain/chain-components/src/impls/types/commitment_prefix.rs b/crates/chain/chain-components/src/impls/types/commitment_prefix.rs index 035c1cdb07..016e95b567 100644 --- a/crates/chain/chain-components/src/impls/types/commitment_prefix.rs +++ b/crates/chain/chain-components/src/impls/types/commitment_prefix.rs @@ -1,7 +1,7 @@ use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_type_components::traits::CommitmentPrefixTypeComponent; +use hermes_prelude::*; use crate::traits::ProvideCommitmentPrefixType; diff --git a/crates/chain/chain-components/src/impls/types/payloads/channel.rs b/crates/chain/chain-components/src/impls/types/payloads/channel.rs index d9e148829e..18b35133d9 100644 --- a/crates/chain/chain-components/src/impls/types/payloads/channel.rs +++ b/crates/chain/chain-components/src/impls/types/payloads/channel.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasConnectionIdType; +use hermes_prelude::*; use crate::traits::{ ChannelOpenAckPayloadTypeComponent, ChannelOpenConfirmPayloadTypeComponent, diff --git a/crates/chain/chain-components/src/impls/types/payloads/connection.rs b/crates/chain/chain-components/src/impls/types/payloads/connection.rs index bff5e96a20..29fc3405d2 100644 --- a/crates/chain/chain-components/src/impls/types/payloads/connection.rs +++ b/crates/chain/chain-components/src/impls/types/payloads/connection.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ ConnectionOpenAckPayloadTypeComponent, ConnectionOpenConfirmPayloadTypeComponent, diff --git a/crates/chain/chain-components/src/impls/types/payloads/packet.rs b/crates/chain/chain-components/src/impls/types/payloads/packet.rs index c88ae57813..ad9f622d46 100644 --- a/crates/chain/chain-components/src/impls/types/payloads/packet.rs +++ b/crates/chain/chain-components/src/impls/types/payloads/packet.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ AckPacketPayloadTypeProvider, AckPacketPayloadTypeProviderComponent, HasAcknowledgementType, diff --git a/crates/chain/chain-components/src/impls/types/poll_interval.rs b/crates/chain/chain-components/src/impls/types/poll_interval.rs index a3c8329ac6..93c2d6fe68 100644 --- a/crates/chain/chain-components/src/impls/types/poll_interval.rs +++ b/crates/chain/chain-components/src/impls/types/poll_interval.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{PollIntervalGetter, PollIntervalGetterComponent}; diff --git a/crates/chain/chain-components/src/impls/types/receipt.rs b/crates/chain/chain-components/src/impls/types/receipt.rs index 5cc0b193b8..d06a223b84 100644 --- a/crates/chain/chain-components/src/impls/types/receipt.rs +++ b/crates/chain/chain-components/src/impls/types/receipt.rs @@ -1,6 +1,6 @@ use alloc::vec::Vec; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{PacketReceiptTypeComponent, ProvidePacketReceiptType}; diff --git a/crates/chain/chain-components/src/impls/wait_chain_reach_height.rs b/crates/chain/chain-components/src/impls/wait_chain_reach_height.rs index 54ddef647f..2ea8365970 100644 --- a/crates/chain/chain-components/src/impls/wait_chain_reach_height.rs +++ b/crates/chain/chain-components/src/impls/wait_chain_reach_height.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{CanSleep, HasRuntime}; use crate::traits::{CanQueryChainHeight, HasHeightType}; diff --git a/crates/chain/chain-components/src/traits/commitment_prefix.rs b/crates/chain/chain-components/src/traits/commitment_prefix.rs index 1284bf5d04..308d07bfba 100644 --- a/crates/chain/chain-components/src/traits/commitment_prefix.rs +++ b/crates/chain/chain-components/src/traits/commitment_prefix.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; pub use hermes_chain_type_components::traits::*; +use hermes_prelude::*; #[cgp_component { provider: IbcCommitmentPrefixGetter, diff --git a/crates/chain/chain-components/src/traits/extract_data.rs b/crates/chain/chain-components/src/traits/extract_data.rs index f05d257f38..ddae595c70 100644 --- a/crates/chain/chain-components/src/traits/extract_data.rs +++ b/crates/chain/chain-components/src/traits/extract_data.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::{ HasEventType, HasMessageResponseEvents, HasMessageResponseType, }; +use hermes_prelude::*; #[cgp_component { provider: MessageResponseExtractor, diff --git a/crates/chain/chain-components/src/traits/message_builders/ack_packet.rs b/crates/chain/chain-components/src/traits/message_builders/ack_packet.rs index 5f6980ebd4..7f8527ca21 100644 --- a/crates/chain/chain-components/src/traits/message_builders/ack_packet.rs +++ b/crates/chain/chain-components/src/traits/message_builders/ack_packet.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasOutgoingPacketType; +use hermes_prelude::*; use crate::traits::{HasAckPacketPayloadType, HasMessageType}; diff --git a/crates/chain/chain-components/src/traits/message_builders/channel_handshake.rs b/crates/chain/chain-components/src/traits/message_builders/channel_handshake.rs index 0231fcf0c0..5265f695bf 100644 --- a/crates/chain/chain-components/src/traits/message_builders/channel_handshake.rs +++ b/crates/chain/chain-components/src/traits/message_builders/channel_handshake.rs @@ -1,8 +1,8 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::{ CanUseCounterparty, HasChannelIdType, HasMessageType, HasPortIdType, }; +use hermes_prelude::*; use crate::traits::{ ChannelOpenAckPayloadOf, ChannelOpenConfirmPayloadOf, ChannelOpenTryPayloadOf, diff --git a/crates/chain/chain-components/src/traits/message_builders/connection_handshake.rs b/crates/chain/chain-components/src/traits/message_builders/connection_handshake.rs index d55a535bc9..c2c43772a3 100644 --- a/crates/chain/chain-components/src/traits/message_builders/connection_handshake.rs +++ b/crates/chain/chain-components/src/traits/message_builders/connection_handshake.rs @@ -1,6 +1,6 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasClientIdType, HasConnectionIdType, HasMessageType}; +use hermes_prelude::*; use crate::traits::{ HasConnectionOpenAckPayloadType, HasConnectionOpenConfirmPayloadType, diff --git a/crates/chain/chain-components/src/traits/message_builders/create_client.rs b/crates/chain/chain-components/src/traits/message_builders/create_client.rs index 97087e6d0f..1fdad12805 100644 --- a/crates/chain/chain-components/src/traits/message_builders/create_client.rs +++ b/crates/chain/chain-components/src/traits/message_builders/create_client.rs @@ -1,6 +1,6 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::CanUseCounterparty; +use hermes_prelude::*; use crate::traits::{ CreateClientPayloadOf, HasCreateClientMessageOptionsType, HasCreateClientPayloadType, diff --git a/crates/chain/chain-components/src/traits/message_builders/receive_packet.rs b/crates/chain/chain-components/src/traits/message_builders/receive_packet.rs index bf85314205..f82a6f21b7 100644 --- a/crates/chain/chain-components/src/traits/message_builders/receive_packet.rs +++ b/crates/chain/chain-components/src/traits/message_builders/receive_packet.rs @@ -1,6 +1,6 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasOutgoingPacketType; +use hermes_prelude::*; use crate::traits::{HasMessageType, HasReceivePacketPayloadType}; diff --git a/crates/chain/chain-components/src/traits/message_builders/timeout_unordered_packet.rs b/crates/chain/chain-components/src/traits/message_builders/timeout_unordered_packet.rs index 5e042ed4a0..929490bf60 100644 --- a/crates/chain/chain-components/src/traits/message_builders/timeout_unordered_packet.rs +++ b/crates/chain/chain-components/src/traits/message_builders/timeout_unordered_packet.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasOutgoingPacketType; +use hermes_prelude::*; use crate::traits::{HasMessageType, HasTimeoutUnorderedPacketPayloadType}; diff --git a/crates/chain/chain-components/src/traits/message_builders/update_client.rs b/crates/chain/chain-components/src/traits/message_builders/update_client.rs index aa894aa5c5..d0b29a60b7 100644 --- a/crates/chain/chain-components/src/traits/message_builders/update_client.rs +++ b/crates/chain/chain-components/src/traits/message_builders/update_client.rs @@ -1,8 +1,8 @@ use alloc::vec::Vec; use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::{CanUseCounterparty, HasClientIdType, HasMessageType}; +use hermes_prelude::*; use crate::traits::{HasUpdateClientPayloadType, UpdateClientPayloadOf}; diff --git a/crates/chain/chain-components/src/traits/packet/fields.rs b/crates/chain/chain-components/src/traits/packet/fields.rs index 5af8e63aae..47ab8927e3 100644 --- a/crates/chain/chain-components/src/traits/packet/fields.rs +++ b/crates/chain/chain-components/src/traits/packet/fields.rs @@ -3,11 +3,11 @@ use core::marker::PhantomData; use cgp::core::component::{UseDelegate, WithProvider}; use cgp::core::field::FieldGetter; use cgp::core::macros::blanket_trait; -use cgp::prelude::*; use hermes_chain_type_components::traits::{ CanUseCounterparty, HasChannelIdType, HasHeightType, HasOutgoingPacketType, HasPortIdType, HasSequenceType, HasTimeoutType, TimeoutOf, }; +use hermes_prelude::*; use crate::types::aliases::{ChannelIdOf, HeightOf, PortIdOf}; diff --git a/crates/chain/chain-components/src/traits/packet/filter.rs b/crates/chain/chain-components/src/traits/packet/filter.rs index 5a83cdaea7..403a952fa5 100644 --- a/crates/chain/chain-components/src/traits/packet/filter.rs +++ b/crates/chain/chain-components/src/traits/packet/filter.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasIncomingPacketType, HasOutgoingPacketType}; +use hermes_prelude::*; #[cgp_component { context: Chain, diff --git a/crates/chain/chain-components/src/traits/packet/from_send_packet.rs b/crates/chain/chain-components/src/traits/packet/from_send_packet.rs index 12c77e343f..d16153a96a 100644 --- a/crates/chain/chain-components/src/traits/packet/from_send_packet.rs +++ b/crates/chain/chain-components/src/traits/packet/from_send_packet.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasOutgoingPacketType; +use hermes_prelude::*; use crate::traits::HasSendPacketEvent; diff --git a/crates/chain/chain-components/src/traits/packet/from_write_ack.rs b/crates/chain/chain-components/src/traits/packet/from_write_ack.rs index 8d37937f68..fd8a84dcf5 100644 --- a/crates/chain/chain-components/src/traits/packet/from_write_ack.rs +++ b/crates/chain/chain-components/src/traits/packet/from_write_ack.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasOutgoingPacketType; +use hermes_prelude::*; use crate::traits::{HasAcknowledgementType, HasWriteAckEvent}; diff --git a/crates/chain/chain-components/src/traits/payload_builders/ack_packet.rs b/crates/chain/chain-components/src/traits/payload_builders/ack_packet.rs index 4a8ea418d6..88d8b84d28 100644 --- a/crates/chain/chain-components/src/traits/payload_builders/ack_packet.rs +++ b/crates/chain/chain-components/src/traits/payload_builders/ack_packet.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasOutgoingPacketType; +use hermes_prelude::*; use crate::traits::{ HasAckPacketPayloadType, HasAcknowledgementType, HasClientStateType, HasHeightType, diff --git a/crates/chain/chain-components/src/traits/payload_builders/channel_handshake.rs b/crates/chain/chain-components/src/traits/payload_builders/channel_handshake.rs index 365163dbba..566f662ea0 100644 --- a/crates/chain/chain-components/src/traits/payload_builders/channel_handshake.rs +++ b/crates/chain/chain-components/src/traits/payload_builders/channel_handshake.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasHeightType, HasPortIdType}; +use hermes_prelude::*; use crate::traits::{ HasChannelOpenAckPayloadType, HasChannelOpenConfirmPayloadType, HasChannelOpenTryPayloadType, diff --git a/crates/chain/chain-components/src/traits/payload_builders/connection_handshake.rs b/crates/chain/chain-components/src/traits/payload_builders/connection_handshake.rs index 8daeb8c3c0..c672f32d94 100644 --- a/crates/chain/chain-components/src/traits/payload_builders/connection_handshake.rs +++ b/crates/chain/chain-components/src/traits/payload_builders/connection_handshake.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasClientIdType, HasConnectionIdType, HasHeightType}; +use hermes_prelude::*; use crate::traits::{ HasClientStateType, HasConnectionOpenAckPayloadType, HasConnectionOpenConfirmPayloadType, diff --git a/crates/chain/chain-components/src/traits/payload_builders/create_client.rs b/crates/chain/chain-components/src/traits/payload_builders/create_client.rs index c1a2f68040..69d1d4bcda 100644 --- a/crates/chain/chain-components/src/traits/payload_builders/create_client.rs +++ b/crates/chain/chain-components/src/traits/payload_builders/create_client.rs @@ -1,5 +1,5 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasCreateClientPayloadOptionsType, HasCreateClientPayloadType}; diff --git a/crates/chain/chain-components/src/traits/payload_builders/receive_packet.rs b/crates/chain/chain-components/src/traits/payload_builders/receive_packet.rs index c3925fc264..eed9420718 100644 --- a/crates/chain/chain-components/src/traits/payload_builders/receive_packet.rs +++ b/crates/chain/chain-components/src/traits/payload_builders/receive_packet.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasOutgoingPacketType; +use hermes_prelude::*; use crate::traits::{HasClientStateType, HasHeightType, HasReceivePacketPayloadType}; diff --git a/crates/chain/chain-components/src/traits/payload_builders/timeout_unordered_packet.rs b/crates/chain/chain-components/src/traits/payload_builders/timeout_unordered_packet.rs index a3b34d231a..2d29c77b81 100644 --- a/crates/chain/chain-components/src/traits/payload_builders/timeout_unordered_packet.rs +++ b/crates/chain/chain-components/src/traits/payload_builders/timeout_unordered_packet.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasOutgoingPacketType; +use hermes_prelude::*; use crate::traits::{HasClientStateType, HasHeightType, HasTimeoutUnorderedPacketPayloadType}; diff --git a/crates/chain/chain-components/src/traits/payload_builders/update_client.rs b/crates/chain/chain-components/src/traits/payload_builders/update_client.rs index c6d0b98ada..0c862f2c65 100644 --- a/crates/chain/chain-components/src/traits/payload_builders/update_client.rs +++ b/crates/chain/chain-components/src/traits/payload_builders/update_client.rs @@ -1,5 +1,5 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasClientStateType, HasHeightType, HasUpdateClientPayloadType}; diff --git a/crates/chain/chain-components/src/traits/queries/block.rs b/crates/chain/chain-components/src/traits/queries/block.rs index 6e3a59970a..6c98dd40b5 100644 --- a/crates/chain/chain-components/src/traits/queries/block.rs +++ b/crates/chain/chain-components/src/traits/queries/block.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasBlockType, HasHeightType}; diff --git a/crates/chain/chain-components/src/traits/queries/block_events.rs b/crates/chain/chain-components/src/traits/queries/block_events.rs index 9e31f0da13..df8abe6dce 100644 --- a/crates/chain/chain-components/src/traits/queries/block_events.rs +++ b/crates/chain/chain-components/src/traits/queries/block_events.rs @@ -1,7 +1,7 @@ use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasEventType, HasHeightType}; +use hermes_prelude::*; #[cgp_component { provider: BlockEventsQuerier, diff --git a/crates/chain/chain-components/src/traits/queries/block_time.rs b/crates/chain/chain-components/src/traits/queries/block_time.rs index effa6f34f9..d22640da34 100644 --- a/crates/chain/chain-components/src/traits/queries/block_time.rs +++ b/crates/chain/chain-components/src/traits/queries/block_time.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: BlockTimeQuerier, diff --git a/crates/chain/chain-components/src/traits/queries/chain_status.rs b/crates/chain/chain-components/src/traits/queries/chain_status.rs index d513445990..1ba2dc600a 100644 --- a/crates/chain/chain-components/src/traits/queries/chain_status.rs +++ b/crates/chain/chain-components/src/traits/queries/chain_status.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasChainStatusType, HasHeightType}; diff --git a/crates/chain/chain-components/src/traits/queries/channel_end.rs b/crates/chain/chain-components/src/traits/queries/channel_end.rs index 5a19589877..94a8dde382 100644 --- a/crates/chain/chain-components/src/traits/queries/channel_end.rs +++ b/crates/chain/chain-components/src/traits/queries/channel_end.rs @@ -1,7 +1,7 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasHeightType, HasPortIdType}; +use hermes_prelude::*; use crate::traits::{HasChannelEndType, HasCommitmentProofType}; diff --git a/crates/chain/chain-components/src/traits/queries/client_state.rs b/crates/chain/chain-components/src/traits/queries/client_state.rs index 02a4e84fa7..1cf2036aaf 100644 --- a/crates/chain/chain-components/src/traits/queries/client_state.rs +++ b/crates/chain/chain-components/src/traits/queries/client_state.rs @@ -2,10 +2,10 @@ use alloc::vec::Vec; use core::marker::PhantomData; use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::{ CanUseCounterparty, ClientStateOf, HasClientIdType, HasHeightType, }; +use hermes_prelude::*; use crate::traits::{ CanQueryChainStatus, HasClientStateType, HasCommitmentProofType, HasRawClientStateType, diff --git a/crates/chain/chain-components/src/traits/queries/connection_end.rs b/crates/chain/chain-components/src/traits/queries/connection_end.rs index b7753abf7d..eed59029e8 100644 --- a/crates/chain/chain-components/src/traits/queries/connection_end.rs +++ b/crates/chain/chain-components/src/traits/queries/connection_end.rs @@ -1,7 +1,7 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasConnectionIdType, HasHeightType}; +use hermes_prelude::*; use crate::traits::{HasCommitmentProofType, HasConnectionEndType}; diff --git a/crates/chain/chain-components/src/traits/queries/consensus_state.rs b/crates/chain/chain-components/src/traits/queries/consensus_state.rs index ae53482928..27b5ab2f85 100644 --- a/crates/chain/chain-components/src/traits/queries/consensus_state.rs +++ b/crates/chain/chain-components/src/traits/queries/consensus_state.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::{CanUseCounterparty, ConsensusStateOf, HasClientIdType}; +use hermes_prelude::*; use super::chain_status::CanQueryChainStatus; use crate::traits::{ diff --git a/crates/chain/chain-components/src/traits/queries/consensus_state_height.rs b/crates/chain/chain-components/src/traits/queries/consensus_state_height.rs index 6bb93c6c3a..bbdab4bee9 100644 --- a/crates/chain/chain-components/src/traits/queries/consensus_state_height.rs +++ b/crates/chain/chain-components/src/traits/queries/consensus_state_height.rs @@ -1,8 +1,8 @@ use alloc::vec::Vec; use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasClientIdType; +use hermes_prelude::*; use crate::traits::HasHeightType; diff --git a/crates/chain/chain-components/src/traits/queries/counterparty_chain_id.rs b/crates/chain/chain-components/src/traits/queries/counterparty_chain_id.rs index 2ece9878f9..0a7a6d11cd 100644 --- a/crates/chain/chain-components/src/traits/queries/counterparty_chain_id.rs +++ b/crates/chain/chain-components/src/traits/queries/counterparty_chain_id.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasPortIdType}; +use hermes_prelude::*; use crate::traits::HasChainIdType; diff --git a/crates/chain/chain-components/src/traits/queries/counterparty_connection_id.rs b/crates/chain/chain-components/src/traits/queries/counterparty_connection_id.rs index def65bd1aa..eed3066932 100644 --- a/crates/chain/chain-components/src/traits/queries/counterparty_connection_id.rs +++ b/crates/chain/chain-components/src/traits/queries/counterparty_connection_id.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasConnectionIdType; +use hermes_prelude::*; use crate::traits::HasChannelEndType; diff --git a/crates/chain/chain-components/src/traits/queries/packet_acknowledgement.rs b/crates/chain/chain-components/src/traits/queries/packet_acknowledgement.rs index afa7dac591..fa7784c3f4 100644 --- a/crates/chain/chain-components/src/traits/queries/packet_acknowledgement.rs +++ b/crates/chain/chain-components/src/traits/queries/packet_acknowledgement.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{ CanUseCounterparty, HasChannelIdType, HasHeightType, HasPortIdType, HasSequenceType, }; +use hermes_prelude::*; use crate::traits::{HasAckCommitmentHashType, HasCommitmentProofType}; use crate::types::aliases::SequenceOf; diff --git a/crates/chain/chain-components/src/traits/queries/packet_commitment.rs b/crates/chain/chain-components/src/traits/queries/packet_commitment.rs index 06e1e204bb..f5c073a2ca 100644 --- a/crates/chain/chain-components/src/traits/queries/packet_commitment.rs +++ b/crates/chain/chain-components/src/traits/queries/packet_commitment.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{ HasChannelIdType, HasHeightType, HasPortIdType, HasSequenceType, }; +use hermes_prelude::*; use crate::traits::{HasCommitmentProofType, HasPacketCommitmentType}; diff --git a/crates/chain/chain-components/src/traits/queries/packet_is_cleared.rs b/crates/chain/chain-components/src/traits/queries/packet_is_cleared.rs index 68b9569f13..f2933e2b51 100644 --- a/crates/chain/chain-components/src/traits/queries/packet_is_cleared.rs +++ b/crates/chain/chain-components/src/traits/queries/packet_is_cleared.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasPortIdType, HasSequenceType}; +use hermes_prelude::*; /** Checks if a given packet has been cleared on the source chain. Having diff --git a/crates/chain/chain-components/src/traits/queries/packet_is_received.rs b/crates/chain/chain-components/src/traits/queries/packet_is_received.rs index 5f028bc032..2790b411c1 100644 --- a/crates/chain/chain-components/src/traits/queries/packet_is_received.rs +++ b/crates/chain/chain-components/src/traits/queries/packet_is_received.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasPortIdType, HasSequenceType}; +use hermes_prelude::*; #[cgp_component { provider: PacketIsReceivedQuerier, diff --git a/crates/chain/chain-components/src/traits/queries/packet_receipt.rs b/crates/chain/chain-components/src/traits/queries/packet_receipt.rs index 6bf0acbb42..64231cb1cc 100644 --- a/crates/chain/chain-components/src/traits/queries/packet_receipt.rs +++ b/crates/chain/chain-components/src/traits/queries/packet_receipt.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{ CanUseCounterparty, HasChannelIdType, HasHeightType, HasPortIdType, HasSequenceType, }; +use hermes_prelude::*; use crate::traits::{HasCommitmentProofType, HasPacketReceiptType}; use crate::types::aliases::SequenceOf; diff --git a/crates/chain/chain-components/src/traits/send_message.rs b/crates/chain/chain-components/src/traits/send_message.rs index 7ba9327597..74b00be804 100644 --- a/crates/chain/chain-components/src/traits/send_message.rs +++ b/crates/chain/chain-components/src/traits/send_message.rs @@ -4,8 +4,8 @@ use alloc::vec; use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_prelude::*; use crate::traits::HasMessageType; diff --git a/crates/chain/chain-components/src/traits/types/block.rs b/crates/chain/chain-components/src/traits/types/block.rs index be73d49ac3..6d38e8422a 100644 --- a/crates/chain/chain-components/src/traits/types/block.rs +++ b/crates/chain/chain-components/src/traits/types/block.rs @@ -1,6 +1,6 @@ use core::fmt::Display; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: BlockTypeComponent, diff --git a/crates/chain/chain-components/src/traits/types/channel.rs b/crates/chain/chain-components/src/traits/types/channel.rs index 56a2b63422..be2ebd9a9c 100644 --- a/crates/chain/chain-components/src/traits/types/channel.rs +++ b/crates/chain/chain-components/src/traits/types/channel.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: InitChannelOptionsTypeComponent, diff --git a/crates/chain/chain-components/src/traits/types/client_state.rs b/crates/chain/chain-components/src/traits/types/client_state.rs index 186c5dc13e..506067f261 100644 --- a/crates/chain/chain-components/src/traits/types/client_state.rs +++ b/crates/chain/chain-components/src/traits/types/client_state.rs @@ -1,9 +1,9 @@ use core::time::Duration; use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChainIdType; pub use hermes_chain_type_components::traits::*; +use hermes_prelude::*; use crate::traits::HasHeightType; diff --git a/crates/chain/chain-components/src/traits/types/connection.rs b/crates/chain/chain-components/src/traits/types/connection.rs index 3de9d52a52..10e9d19acf 100644 --- a/crates/chain/chain-components/src/traits/types/connection.rs +++ b/crates/chain/chain-components/src/traits/types/connection.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: InitConnectionOptionsTypeComponent, diff --git a/crates/chain/chain-components/src/traits/types/consensus_state.rs b/crates/chain/chain-components/src/traits/types/consensus_state.rs index 64b816a4db..bb5a6070c1 100644 --- a/crates/chain/chain-components/src/traits/types/consensus_state.rs +++ b/crates/chain/chain-components/src/traits/types/consensus_state.rs @@ -1,6 +1,6 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; pub use hermes_chain_type_components::traits::*; +use hermes_prelude::*; use crate::traits::HasTimeType; diff --git a/crates/chain/chain-components/src/traits/types/create_client.rs b/crates/chain/chain-components/src/traits/types/create_client.rs index 42b61b9287..20ae41df2b 100644 --- a/crates/chain/chain-components/src/traits/types/create_client.rs +++ b/crates/chain/chain-components/src/traits/types/create_client.rs @@ -1,7 +1,7 @@ use cgp::core::component::{UseDelegate, WithProvider}; use cgp::core::types::ProvideType; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasClientIdType; +use hermes_prelude::*; #[cgp_component { name: CreateClientPayloadOptionsTypeComponent, diff --git a/crates/chain/chain-components/src/traits/types/height.rs b/crates/chain/chain-components/src/traits/types/height.rs index e3420d4d97..d7428bd8d4 100644 --- a/crates/chain/chain-components/src/traits/types/height.rs +++ b/crates/chain/chain-components/src/traits/types/height.rs @@ -2,8 +2,8 @@ Trait definition for [`HasHeightType`]. */ -use cgp::prelude::*; pub use hermes_chain_type_components::traits::*; +use hermes_prelude::*; #[cgp_component { name: HeightFieldComponent, diff --git a/crates/chain/chain-components/src/traits/types/ibc.rs b/crates/chain/chain-components/src/traits/types/ibc.rs index 121875b34a..c7ccc81a03 100644 --- a/crates/chain/chain-components/src/traits/types/ibc.rs +++ b/crates/chain/chain-components/src/traits/types/ibc.rs @@ -4,8 +4,8 @@ */ use cgp::core::component::UseDelegate; -use cgp::prelude::*; pub use hermes_chain_type_components::traits::*; +use hermes_prelude::*; use crate::traits::{HasChainTypes, HasHeightType, HasMessageType}; diff --git a/crates/chain/chain-components/src/traits/types/ibc_events/channel.rs b/crates/chain/chain-components/src/traits/types/ibc_events/channel.rs index ed66adedcc..2fe5bf8f6d 100644 --- a/crates/chain/chain-components/src/traits/types/ibc_events/channel.rs +++ b/crates/chain/chain-components/src/traits/types/ibc_events/channel.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; #[cgp_component { name: ChannelOpenInitEventComponent, diff --git a/crates/chain/chain-components/src/traits/types/ibc_events/connection.rs b/crates/chain/chain-components/src/traits/types/ibc_events/connection.rs index 7f56173481..324e495fed 100644 --- a/crates/chain/chain-components/src/traits/types/ibc_events/connection.rs +++ b/crates/chain/chain-components/src/traits/types/ibc_events/connection.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasConnectionIdType; +use hermes_prelude::*; #[cgp_component { name: ConnectionOpenTryEventComponent, diff --git a/crates/chain/chain-components/src/traits/types/ibc_events/send_packet.rs b/crates/chain/chain-components/src/traits/types/ibc_events/send_packet.rs index cb124a1a4f..0135c666d1 100644 --- a/crates/chain/chain-components/src/traits/types/ibc_events/send_packet.rs +++ b/crates/chain/chain-components/src/traits/types/ibc_events/send_packet.rs @@ -2,7 +2,7 @@ Trait definitions for [`HasSendPacketEvent`]. */ -use cgp::prelude::*; +use hermes_prelude::*; /** Indicates that a chain context's diff --git a/crates/chain/chain-components/src/traits/types/ibc_events/write_ack.rs b/crates/chain/chain-components/src/traits/types/ibc_events/write_ack.rs index 968e6b158b..b5f1ec2c8d 100644 --- a/crates/chain/chain-components/src/traits/types/ibc_events/write_ack.rs +++ b/crates/chain/chain-components/src/traits/types/ibc_events/write_ack.rs @@ -2,7 +2,7 @@ Trait definitions for [`HasWriteAckEvent`]. */ -use cgp::prelude::*; +use hermes_prelude::*; /** Indicates that a chain context's diff --git a/crates/chain/chain-components/src/traits/types/message.rs b/crates/chain/chain-components/src/traits/types/message.rs index 956602b654..5498473f28 100644 --- a/crates/chain/chain-components/src/traits/types/message.rs +++ b/crates/chain/chain-components/src/traits/types/message.rs @@ -2,8 +2,8 @@ Trait definitions for [`HasMessageType`] and [`CanEstimateMessageSize`]. */ -use cgp::prelude::*; pub use hermes_chain_type_components::traits::*; +use hermes_prelude::*; #[cgp_component { provider: MessageSizeEstimator, diff --git a/crates/chain/chain-components/src/traits/types/packets/ack.rs b/crates/chain/chain-components/src/traits/types/packets/ack.rs index 9419fbc5ec..179a75c719 100644 --- a/crates/chain/chain-components/src/traits/types/packets/ack.rs +++ b/crates/chain/chain-components/src/traits/types/packets/ack.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasAckPacketPayloadType: Async { diff --git a/crates/chain/chain-components/src/traits/types/packets/receive.rs b/crates/chain/chain-components/src/traits/types/packets/receive.rs index 601fd0614f..84cba171e7 100644 --- a/crates/chain/chain-components/src/traits/types/packets/receive.rs +++ b/crates/chain/chain-components/src/traits/types/packets/receive.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ReceivePacketPayloadTypeComponent, diff --git a/crates/chain/chain-components/src/traits/types/packets/timeout.rs b/crates/chain/chain-components/src/traits/types/packets/timeout.rs index 0f8fcc2fab..75605a1ed8 100644 --- a/crates/chain/chain-components/src/traits/types/packets/timeout.rs +++ b/crates/chain/chain-components/src/traits/types/packets/timeout.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: TimeoutUnorderedPacketPayloadTypeComponent, diff --git a/crates/chain/chain-components/src/traits/types/poll_interval.rs b/crates/chain/chain-components/src/traits/types/poll_interval.rs index 1132e360a8..51aa678b45 100644 --- a/crates/chain/chain-components/src/traits/types/poll_interval.rs +++ b/crates/chain/chain-components/src/traits/types/poll_interval.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: PollIntervalGetter, diff --git a/crates/chain/chain-components/src/traits/types/proof.rs b/crates/chain/chain-components/src/traits/types/proof.rs index 4997f281c7..8cadfa5742 100644 --- a/crates/chain/chain-components/src/traits/types/proof.rs +++ b/crates/chain/chain-components/src/traits/types/proof.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; pub use hermes_chain_type_components::traits::*; +use hermes_prelude::*; use crate::traits::HasHeightType; diff --git a/crates/chain/chain-components/src/traits/types/status.rs b/crates/chain/chain-components/src/traits/types/status.rs index 9949b16f3b..e183dbd6ef 100644 --- a/crates/chain/chain-components/src/traits/types/status.rs +++ b/crates/chain/chain-components/src/traits/types/status.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasHeightType, HasTimeType}; diff --git a/crates/chain/chain-components/src/traits/types/timestamp.rs b/crates/chain/chain-components/src/traits/types/timestamp.rs index 1b6fe3302c..cf8f5305eb 100644 --- a/crates/chain/chain-components/src/traits/types/timestamp.rs +++ b/crates/chain/chain-components/src/traits/types/timestamp.rs @@ -4,8 +4,8 @@ use core::time::Duration; -use cgp::prelude::*; pub use hermes_chain_type_components::traits::*; +use hermes_prelude::*; #[cgp_component { provider: TimeMeasurer, diff --git a/crates/chain/chain-components/src/traits/types/update_client.rs b/crates/chain/chain-components/src/traits/types/update_client.rs index db98719fac..d792664b9e 100644 --- a/crates/chain/chain-components/src/traits/types/update_client.rs +++ b/crates/chain/chain-components/src/traits/types/update_client.rs @@ -1,6 +1,6 @@ use cgp::core::component::{UseDelegate, WithProvider}; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: UpdateClientPayloadTypeComponent, diff --git a/crates/chain/chain-type-components/Cargo.toml b/crates/chain/chain-type-components/Cargo.toml index 859424ed91..ae9bb7c0b9 100644 --- a/crates/chain/chain-type-components/Cargo.toml +++ b/crates/chain/chain-type-components/Cargo.toml @@ -12,4 +12,5 @@ description = """ """ [dependencies] -cgp = { workspace = true, default-features = false } +cgp = { workspace = true } +hermes-prelude = { workspace = true } diff --git a/crates/chain/chain-type-components/src/impls/types/message_response.rs b/crates/chain/chain-type-components/src/impls/types/message_response.rs index 6a56e5aacf..a0049b5bdd 100644 --- a/crates/chain/chain-type-components/src/impls/types/message_response.rs +++ b/crates/chain/chain-type-components/src/impls/types/message_response.rs @@ -1,6 +1,6 @@ use alloc::vec::Vec; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ HasEventType, HasMessageResponseType, MessageResponseEventsGetter, diff --git a/crates/chain/chain-type-components/src/traits/builders/amount.rs b/crates/chain/chain-type-components/src/traits/builders/amount.rs index d8d3df9156..e55915dc1f 100644 --- a/crates/chain/chain-type-components/src/traits/builders/amount.rs +++ b/crates/chain/chain-type-components/src/traits/builders/amount.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasAmountType, HasDenomType, HasQuantityType}; diff --git a/crates/chain/chain-type-components/src/traits/fields/amount/denom.rs b/crates/chain/chain-type-components/src/traits/fields/amount/denom.rs index ba93f679ce..f4db58e351 100644 --- a/crates/chain/chain-type-components/src/traits/fields/amount/denom.rs +++ b/crates/chain/chain-type-components/src/traits/fields/amount/denom.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasAmountType, HasDenomType}; diff --git a/crates/chain/chain-type-components/src/traits/fields/amount/quantity.rs b/crates/chain/chain-type-components/src/traits/fields/amount/quantity.rs index 47a15e2f50..f29f6f5028 100644 --- a/crates/chain/chain-type-components/src/traits/fields/amount/quantity.rs +++ b/crates/chain/chain-type-components/src/traits/fields/amount/quantity.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasAmountType, HasQuantityType}; diff --git a/crates/chain/chain-type-components/src/traits/fields/chain_id.rs b/crates/chain/chain-type-components/src/traits/fields/chain_id.rs index 6ab4b9096e..75e6234afd 100644 --- a/crates/chain/chain-type-components/src/traits/fields/chain_id.rs +++ b/crates/chain/chain-type-components/src/traits/fields/chain_id.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasChainIdType; diff --git a/crates/chain/chain-type-components/src/traits/fields/height.rs b/crates/chain/chain-type-components/src/traits/fields/height.rs index 87de31f3c2..1af351f68d 100644 --- a/crates/chain/chain-type-components/src/traits/fields/height.rs +++ b/crates/chain/chain-type-components/src/traits/fields/height.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasHeightType; diff --git a/crates/chain/chain-type-components/src/traits/fields/message_response_events.rs b/crates/chain/chain-type-components/src/traits/fields/message_response_events.rs index fbb75eab9a..336a7a376a 100644 --- a/crates/chain/chain-type-components/src/traits/fields/message_response_events.rs +++ b/crates/chain/chain-type-components/src/traits/fields/message_response_events.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasEventType, HasMessageResponseType}; diff --git a/crates/chain/chain-type-components/src/traits/types/address.rs b/crates/chain/chain-type-components/src/traits/types/address.rs index f05b91d863..c3ed6b2f83 100644 --- a/crates/chain/chain-type-components/src/traits/types/address.rs +++ b/crates/chain/chain-type-components/src/traits/types/address.rs @@ -2,7 +2,7 @@ use core::fmt::Display; use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasAddressType: Async { diff --git a/crates/chain/chain-type-components/src/traits/types/amount.rs b/crates/chain/chain-type-components/src/traits/types/amount.rs index 43c419a8da..1306cb746f 100644 --- a/crates/chain/chain-type-components/src/traits/types/amount.rs +++ b/crates/chain/chain-type-components/src/traits/types/amount.rs @@ -2,7 +2,7 @@ use core::fmt::{Debug, Display}; use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type { name: AmountTypeProviderComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/chain_id.rs b/crates/chain/chain-type-components/src/traits/types/chain_id.rs index 0b1b7b3bdf..e4c5dc9092 100644 --- a/crates/chain/chain-type-components/src/traits/types/chain_id.rs +++ b/crates/chain/chain-type-components/src/traits/types/chain_id.rs @@ -1,6 +1,6 @@ use core::fmt::Display; -use cgp::prelude::*; +use hermes_prelude::*; /** This is implemented by a chain context to provide a `ChainId` type that diff --git a/crates/chain/chain-type-components/src/traits/types/commitment_prefix.rs b/crates/chain/chain-type-components/src/traits/types/commitment_prefix.rs index 63b935ec92..d5270a768f 100644 --- a/crates/chain/chain-type-components/src/traits/types/commitment_prefix.rs +++ b/crates/chain/chain-type-components/src/traits/types/commitment_prefix.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: CommitmentPrefixTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/commitment_proof.rs b/crates/chain/chain-type-components/src/traits/types/commitment_proof.rs index 524a48a38c..a2eb3a4049 100644 --- a/crates/chain/chain-type-components/src/traits/types/commitment_proof.rs +++ b/crates/chain/chain-type-components/src/traits/types/commitment_proof.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasCommitmentProofType: Async { diff --git a/crates/chain/chain-type-components/src/traits/types/denom.rs b/crates/chain/chain-type-components/src/traits/types/denom.rs index eb0eba0979..f6da462990 100644 --- a/crates/chain/chain-type-components/src/traits/types/denom.rs +++ b/crates/chain/chain-type-components/src/traits/types/denom.rs @@ -2,7 +2,7 @@ use core::fmt::Display; use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: DenomTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/event.rs b/crates/chain/chain-type-components/src/traits/types/event.rs index 6f00e9d61f..4157c0ef3c 100644 --- a/crates/chain/chain-type-components/src/traits/types/event.rs +++ b/crates/chain/chain-type-components/src/traits/types/event.rs @@ -4,7 +4,7 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; /** This is used for the chain context and the transaction context to declare diff --git a/crates/chain/chain-type-components/src/traits/types/height.rs b/crates/chain/chain-type-components/src/traits/types/height.rs index 5629f81cf7..72ddde8147 100644 --- a/crates/chain/chain-type-components/src/traits/types/height.rs +++ b/crates/chain/chain-type-components/src/traits/types/height.rs @@ -2,7 +2,7 @@ use core::fmt::{Debug, Display}; use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasHeightType: Sized + Async { diff --git a/crates/chain/chain-type-components/src/traits/types/ibc/channel_id.rs b/crates/chain/chain-type-components/src/traits/types/ibc/channel_id.rs index e1bd401c2d..88f12724c7 100644 --- a/crates/chain/chain-type-components/src/traits/types/ibc/channel_id.rs +++ b/crates/chain/chain-type-components/src/traits/types/ibc/channel_id.rs @@ -2,7 +2,7 @@ use core::fmt::{Debug, Display}; use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ChannelIdTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/ibc/client_id.rs b/crates/chain/chain-type-components/src/traits/types/ibc/client_id.rs index 9691a985fd..32845911cb 100644 --- a/crates/chain/chain-type-components/src/traits/types/ibc/client_id.rs +++ b/crates/chain/chain-type-components/src/traits/types/ibc/client_id.rs @@ -2,7 +2,7 @@ use core::fmt::{Debug, Display}; use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ClientIdTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/ibc/client_state.rs b/crates/chain/chain-type-components/src/traits/types/ibc/client_state.rs index c2b7a84702..55d797d20d 100644 --- a/crates/chain/chain-type-components/src/traits/types/ibc/client_state.rs +++ b/crates/chain/chain-type-components/src/traits/types/ibc/client_state.rs @@ -1,6 +1,6 @@ use cgp::core::component::{UseDelegate, WithProvider}; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ClientStateTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/ibc/connection_id.rs b/crates/chain/chain-type-components/src/traits/types/ibc/connection_id.rs index c5aef3e390..3cda19f463 100644 --- a/crates/chain/chain-type-components/src/traits/types/ibc/connection_id.rs +++ b/crates/chain/chain-type-components/src/traits/types/ibc/connection_id.rs @@ -2,7 +2,7 @@ use core::fmt::{Debug, Display}; use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ConnectionIdTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/ibc/consensus_state.rs b/crates/chain/chain-type-components/src/traits/types/ibc/consensus_state.rs index 5cf467a4c2..3edb301321 100644 --- a/crates/chain/chain-type-components/src/traits/types/ibc/consensus_state.rs +++ b/crates/chain/chain-type-components/src/traits/types/ibc/consensus_state.rs @@ -1,6 +1,6 @@ use cgp::core::component::{UseDelegate, WithProvider}; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ConsensusStateTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/ibc/packet.rs b/crates/chain/chain-type-components/src/traits/types/ibc/packet.rs index 64f0e9f8b3..5053595eaf 100644 --- a/crates/chain/chain-type-components/src/traits/types/ibc/packet.rs +++ b/crates/chain/chain-type-components/src/traits/types/ibc/packet.rs @@ -2,7 +2,7 @@ Trait definition for [`HasIbcPacketTypes`]. */ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::CanUseCounterparty; diff --git a/crates/chain/chain-type-components/src/traits/types/ibc/port_id.rs b/crates/chain/chain-type-components/src/traits/types/ibc/port_id.rs index c7a2a8406d..65ef13c278 100644 --- a/crates/chain/chain-type-components/src/traits/types/ibc/port_id.rs +++ b/crates/chain/chain-type-components/src/traits/types/ibc/port_id.rs @@ -1,6 +1,6 @@ use core::fmt::{Debug, Display}; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: PortIdTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/ibc/sequence.rs b/crates/chain/chain-type-components/src/traits/types/ibc/sequence.rs index d16946a5e7..dca90b16bf 100644 --- a/crates/chain/chain-type-components/src/traits/types/ibc/sequence.rs +++ b/crates/chain/chain-type-components/src/traits/types/ibc/sequence.rs @@ -1,6 +1,6 @@ use core::fmt::{Debug, Display}; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: SequenceTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/message.rs b/crates/chain/chain-type-components/src/traits/types/message.rs index 4e8919b787..a50c18839e 100644 --- a/crates/chain/chain-type-components/src/traits/types/message.rs +++ b/crates/chain/chain-type-components/src/traits/types/message.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; /** This is used for the chain context and the transaction context to declare diff --git a/crates/chain/chain-type-components/src/traits/types/message_response.rs b/crates/chain/chain-type-components/src/traits/types/message_response.rs index 0413015fe0..6eff9c70ba 100644 --- a/crates/chain/chain-type-components/src/traits/types/message_response.rs +++ b/crates/chain/chain-type-components/src/traits/types/message_response.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: MessageResponseTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/quantity.rs b/crates/chain/chain-type-components/src/traits/types/quantity.rs index f5e6dd810a..abb912434f 100644 --- a/crates/chain/chain-type-components/src/traits/types/quantity.rs +++ b/crates/chain/chain-type-components/src/traits/types/quantity.rs @@ -2,7 +2,7 @@ use core::fmt::Display; use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: QuantityTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/time.rs b/crates/chain/chain-type-components/src/traits/types/time.rs index aeee41fb7e..6f9023237b 100644 --- a/crates/chain/chain-type-components/src/traits/types/time.rs +++ b/crates/chain/chain-type-components/src/traits/types/time.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: TimeTypeComponent, diff --git a/crates/chain/chain-type-components/src/traits/types/timeout.rs b/crates/chain/chain-type-components/src/traits/types/timeout.rs index 3ef86c0260..beb0831654 100644 --- a/crates/chain/chain-type-components/src/traits/types/timeout.rs +++ b/crates/chain/chain-type-components/src/traits/types/timeout.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasTimeType; diff --git a/crates/cli/cli-components/Cargo.toml b/crates/cli/cli-components/Cargo.toml index 1495302fca..5e85d110c4 100644 --- a/crates/cli/cli-components/Cargo.toml +++ b/crates/cli/cli-components/Cargo.toml @@ -14,10 +14,11 @@ description = """ [dependencies] hermes-core = { workspace = true } -cgp = { workspace = true } -http = { workspace = true } -ibc = { workspace = true } -serde = { workspace = true, features = [ "derive" ] } -toml = { workspace = true } -humantime = { workspace = true } -clap = { workspace = true, features = [ "derive" ] } +cgp = { workspace = true } +hermes-prelude = { workspace = true } +http = { workspace = true } +ibc = { workspace = true } +serde = { workspace = true, features = [ "derive" ] } +toml = { workspace = true } +humantime = { workspace = true } +clap = { workspace = true, features = [ "derive" ] } diff --git a/crates/cli/cli-components/src/impls/commands/bootstrap/chain.rs b/crates/cli/cli-components/src/impls/commands/bootstrap/chain.rs index 5c4f15e584..d435b52dbb 100644 --- a/crates/cli/cli-components/src/impls/commands/bootstrap/chain.rs +++ b/crates/cli/cli-components/src/impls/commands/bootstrap/chain.rs @@ -1,7 +1,6 @@ use core::marker::PhantomData; use std::path::PathBuf; -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelInfo; use hermes_core::relayer_components::chain::traits::HasChainId; @@ -10,6 +9,7 @@ use hermes_core::test_components::bootstrap::traits::CanBootstrapChain; use hermes_core::test_components::chain_driver::traits::{ CanTakeChainProcess, ConfigUpdater, HasChain, }; +use hermes_prelude::*; use crate::traits::{ CanLoadBootstrap, CanLoadConfig, CanProduceOutput, CanWriteConfig, CommandRunner, diff --git a/crates/cli/cli-components/src/impls/commands/channel/create.rs b/crates/cli/cli-components/src/impls/commands/channel/create.rs index 8e770e3c6e..98f3126453 100644 --- a/crates/cli/cli-components/src/impls/commands/channel/create.rs +++ b/crates/cli/cli-components/src/impls/commands/channel/create.rs @@ -2,7 +2,6 @@ use core::fmt::Display; use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelInfo; use hermes_core::relayer_components::build::traits::builders::relay_builder::CanBuildRelay; @@ -13,6 +12,7 @@ use hermes_core::relayer_components::multi::traits::chain_at::HasChainTypeAt; use hermes_core::relayer_components::multi::traits::relay_at::HasRelayTypeAt; use hermes_core::relayer_components::relay::impls::CanBootstrapChannel; use hermes_core::relayer_components::relay::traits::HasRelayChains; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/commands/client/create.rs b/crates/cli/cli-components/src/impls/commands/client/create.rs index 93cb37e738..7d2fcb7aaf 100644 --- a/crates/cli/cli-components/src/impls/commands/client/create.rs +++ b/crates/cli/cli-components/src/impls/commands/client/create.rs @@ -1,7 +1,6 @@ use core::fmt::{Debug, Display}; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelInfo; use hermes_core::relayer_components::build::traits::builders::chain_builder::CanBuildChain; @@ -14,6 +13,7 @@ use hermes_core::relayer_components::multi::traits::chain_at::{ChainAt, HasChain use hermes_core::relayer_components::relay::traits::{ CanCreateClient, HasRelayChains, HasRelayClientIds, HasSourceTargetChainTypes, SourceTarget, }; +use hermes_prelude::*; use crate::traits::{ BuilderOf, CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, diff --git a/crates/cli/cli-components/src/impls/commands/client/update.rs b/crates/cli/cli-components/src/impls/commands/client/update.rs index a65696fc4c..d1b08d8f95 100644 --- a/crates/cli/cli-components/src/impls/commands/client/update.rs +++ b/crates/cli/cli-components/src/impls/commands/client/update.rs @@ -1,7 +1,6 @@ use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelInfo; use hermes_core::relayer_components::build::traits::builders::chain_builder::CanBuildChain; @@ -14,6 +13,7 @@ use hermes_core::relayer_components::relay::traits::{ CanSendTargetUpdateClientMessage, HasRelayChains, HasRelayClientIds, HasSourceTargetChainTypes, SourceTarget, }; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/commands/connection/create.rs b/crates/cli/cli-components/src/impls/commands/connection/create.rs index 0b51922392..b3d4f58b9d 100644 --- a/crates/cli/cli-components/src/impls/commands/connection/create.rs +++ b/crates/cli/cli-components/src/impls/commands/connection/create.rs @@ -2,7 +2,6 @@ use core::fmt::Display; use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelInfo; use hermes_core::relayer_components::build::traits::builders::relay_builder::CanBuildRelay; @@ -13,6 +12,7 @@ use hermes_core::relayer_components::multi::traits::chain_at::HasChainTypeAt; use hermes_core::relayer_components::multi::traits::relay_at::HasRelayTypeAt; use hermes_core::relayer_components::relay::impls::CanBootstrapConnection; use hermes_core::relayer_components::relay::traits::HasRelayChains; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/commands/queries/balance.rs b/crates/cli/cli-components/src/impls/commands/queries/balance.rs index 0713b3536a..0fd5bb0615 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/balance.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/balance.rs @@ -2,10 +2,10 @@ use core::fmt::Display; use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::relayer_components::build::traits::builders::chain_builder::CanBuildChain; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::test_components::chain::traits::CanQueryBalance; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/commands/queries/chain.rs b/crates/cli/cli-components/src/impls/commands/queries/chain.rs index 9fab705873..f2b10b3e83 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/chain.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/chain.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use super::chain_status::QueryChainStatusArgs; use crate::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; diff --git a/crates/cli/cli-components/src/impls/commands/queries/chain_status.rs b/crates/cli/cli-components/src/impls/commands/queries/chain_status.rs index 7afb5c84ef..4db211e3f5 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/chain_status.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/chain_status.rs @@ -2,9 +2,9 @@ use core::fmt::Display; use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::relayer_components::build::traits::builders::chain_builder::CanBuildChain; use hermes_core::relayer_components::chain::traits::{CanQueryChainStatus, HasChainIdType}; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/commands/queries/channel.rs b/crates/cli/cli-components/src/impls/commands/queries/channel.rs index 30081c071f..573d5c7a76 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/channel.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/channel.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::impls::QueryChannelEndArgs; use crate::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; diff --git a/crates/cli/cli-components/src/impls/commands/queries/channel_end.rs b/crates/cli/cli-components/src/impls/commands/queries/channel_end.rs index 9c9514d5b4..c35c7fa2e1 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/channel_end.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/channel_end.rs @@ -1,13 +1,13 @@ use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::relayer_components::build::traits::builders::chain_builder::CanBuildChain; use hermes_core::relayer_components::chain::traits::{ CanQueryChainHeight, CanQueryChannelEnd, HasChainIdType, HasChannelIdType, HasHeightType, HasPortIdType, }; use hermes_core::relayer_components::multi::traits::chain_at::HasChainTypeAt; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/commands/queries/client.rs b/crates/cli/cli-components/src/impls/commands/queries/client.rs index afd814a966..55cf2be60f 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/client.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/client.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::impls::{QueryClientStateArgs, QueryClientStatusArgs, QueryConsensusStateArgs}; use crate::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; diff --git a/crates/cli/cli-components/src/impls/commands/queries/client_state.rs b/crates/cli/cli-components/src/impls/commands/queries/client_state.rs index 1a0c241ce9..1ced0e505a 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/client_state.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/client_state.rs @@ -2,13 +2,13 @@ use core::fmt::Display; use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelInfo; use hermes_core::relayer_components::build::traits::builders::chain_builder::CanBuildChain; use hermes_core::relayer_components::chain::traits::{ CanQueryChainHeight, CanQueryClientState, HasChainIdType, HasClientStateType, }; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/commands/queries/client_status.rs b/crates/cli/cli-components/src/impls/commands/queries/client_status.rs index 20c4cc945a..34d42f0b54 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/client_status.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/client_status.rs @@ -2,7 +2,6 @@ use core::fmt::Display; use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelInfo; use hermes_core::relayer_components::build::traits::builders::chain_builder::CanBuildChain; @@ -12,6 +11,7 @@ use hermes_core::relayer_components::chain::traits::{ HasClientStateType, HasConsensusStateFields, HasConsensusStateType, HasIbcChainTypes, }; use hermes_core::relayer_components::multi::traits::chain_at::HasChainTypeAt; +use hermes_prelude::*; use serde::Serialize; use crate::traits::{ diff --git a/crates/cli/cli-components/src/impls/commands/queries/clients.rs b/crates/cli/cli-components/src/impls/commands/queries/clients.rs index 1bf5e1cad0..421674f6bd 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/clients.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/clients.rs @@ -2,7 +2,6 @@ use core::fmt::Display; use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelInfo; use hermes_core::relayer_components::build::traits::builders::chain_builder::CanBuildChain; @@ -10,6 +9,7 @@ use hermes_core::relayer_components::chain::traits::{ CanQueryAllClientStatesWithLatestHeight, HasChainIdType, HasClientIdType, HasClientStateFields, }; use hermes_core::relayer_components::multi::traits::chain_at::HasChainTypeAt; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/commands/queries/connection.rs b/crates/cli/cli-components/src/impls/commands/queries/connection.rs index b506eade56..8632cef9b2 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/connection.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/connection.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::impls::QueryConnectionEndArgs; use crate::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; diff --git a/crates/cli/cli-components/src/impls/commands/queries/connection_end.rs b/crates/cli/cli-components/src/impls/commands/queries/connection_end.rs index d8d23a1412..bfc1b31347 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/connection_end.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/connection_end.rs @@ -1,12 +1,12 @@ use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::relayer_components::build::traits::builders::chain_builder::CanBuildChain; use hermes_core::relayer_components::chain::traits::{ CanQueryChainHeight, CanQueryConnectionEnd, HasChainIdType, }; use hermes_core::relayer_components::multi::traits::chain_at::HasChainTypeAt; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/commands/queries/consensus_state.rs b/crates/cli/cli-components/src/impls/commands/queries/consensus_state.rs index fb2d0153e1..0e1497b233 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/consensus_state.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/consensus_state.rs @@ -2,13 +2,13 @@ use core::fmt::Display; use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::relayer_components::build::traits::builders::chain_builder::CanBuildChain; use hermes_core::relayer_components::chain::traits::{ CanQueryChainHeight, CanQueryConsensusState, CanQueryConsensusStateHeights, HasChainIdType, HasConsensusStateType, HasHeightType, }; use hermes_core::relayer_components::multi::traits::chain_at::HasChainTypeAt; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/commands/queries/wallet.rs b/crates/cli/cli-components/src/impls/commands/queries/wallet.rs index cb10f67e91..280e8a2714 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/wallet.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/wallet.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::impls::QueryBalanceArgs; use crate::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; diff --git a/crates/cli/cli-components/src/impls/commands/start.rs b/crates/cli/cli-components/src/impls/commands/start.rs index f5b68d101d..de05e7fc65 100644 --- a/crates/cli/cli-components/src/impls/commands/start.rs +++ b/crates/cli/cli-components/src/impls/commands/start.rs @@ -1,13 +1,13 @@ use std::marker::PhantomData; use cgp::extra::run::CanRun; -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelInfo; use hermes_core::relayer_components::birelay::traits::CanAutoBiRelay; use hermes_core::relayer_components::build::traits::builders::birelay_builder::CanBuildBiRelay; use hermes_core::relayer_components::chain::traits::{HasChainIdType, HasClientIdType}; use hermes_core::relayer_components::multi::traits::chain_at::HasChainTypeAt; +use hermes_prelude::*; use crate::traits::{ CanLoadBuilder, CanParseArg, CanProduceOutput, CommandRunner, CommandRunnerComponent, diff --git a/crates/cli/cli-components/src/impls/config/get_config_path.rs b/crates/cli/cli-components/src/impls/config/get_config_path.rs index ef34559358..1faca805d1 100644 --- a/crates/cli/cli-components/src/impls/config/get_config_path.rs +++ b/crates/cli/cli-components/src/impls/config/get_config_path.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{HasFilePathType, HasRuntime}; +use hermes_prelude::*; use crate::traits::{ConfigPathGetter, ConfigPathGetterComponent}; diff --git a/crates/cli/cli-components/src/impls/config/load_toml_config.rs b/crates/cli/cli-components/src/impls/config/load_toml_config.rs index b0afd2a976..9de9473fe4 100644 --- a/crates/cli/cli-components/src/impls/config/load_toml_config.rs +++ b/crates/cli/cli-components/src/impls/config/load_toml_config.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanReadFileAsString, HasRuntime}; +use hermes_prelude::*; use serde::de::DeserializeOwned; use crate::traits::{ConfigLoader, ConfigLoaderComponent, HasConfigPath, HasConfigType}; diff --git a/crates/cli/cli-components/src/impls/config/save_toml_config.rs b/crates/cli/cli-components/src/impls/config/save_toml_config.rs index d95853dd70..f6855a7f7c 100644 --- a/crates/cli/cli-components/src/impls/config/save_toml_config.rs +++ b/crates/cli/cli-components/src/impls/config/save_toml_config.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanWriteStringToFile, HasRuntime}; +use hermes_prelude::*; use serde::Serialize; use crate::traits::{ConfigWriter, ConfigWriterComponent, HasConfigPath, HasConfigType}; diff --git a/crates/cli/cli-components/src/impls/parse/field.rs b/crates/cli/cli-components/src/impls/parse/field.rs index 23e2eae232..8ad71a44cd 100644 --- a/crates/cli/cli-components/src/impls/parse/field.rs +++ b/crates/cli/cli-components/src/impls/parse/field.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ArgParser, ArgParserComponent}; diff --git a/crates/cli/cli-components/src/impls/parse/string.rs b/crates/cli/cli-components/src/impls/parse/string.rs index c6a0b59dab..3b2ea978be 100644 --- a/crates/cli/cli-components/src/impls/parse/string.rs +++ b/crates/cli/cli-components/src/impls/parse/string.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use core::str::FromStr; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ArgParser, ArgParserComponent}; diff --git a/crates/cli/cli-components/src/traits/any_counterparty.rs b/crates/cli/cli-components/src/traits/any_counterparty.rs index a8c7b9aaa4..3edba7fb37 100644 --- a/crates/cli/cli-components/src/traits/any_counterparty.rs +++ b/crates/cli/cli-components/src/traits/any_counterparty.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasAnyCounterpartyType { diff --git a/crates/cli/cli-components/src/traits/bootstrap.rs b/crates/cli/cli-components/src/traits/bootstrap.rs index a6a5af55a5..430e655cb4 100644 --- a/crates/cli/cli-components/src/traits/bootstrap.rs +++ b/crates/cli/cli-components/src/traits/bootstrap.rs @@ -1,6 +1,6 @@ use cgp::core::component::{UseDelegate, WithProvider}; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasBootstrapType { diff --git a/crates/cli/cli-components/src/traits/build.rs b/crates/cli/cli-components/src/traits/build.rs index 3778386cfa..ba8c512e7e 100644 --- a/crates/cli/cli-components/src/traits/build.rs +++ b/crates/cli/cli-components/src/traits/build.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: BuilderTypeComponent, diff --git a/crates/cli/cli-components/src/traits/command.rs b/crates/cli/cli-components/src/traits/command.rs index 35d291f2bf..d924499ca8 100644 --- a/crates/cli/cli-components/src/traits/command.rs +++ b/crates/cli/cli-components/src/traits/command.rs @@ -1,5 +1,5 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasOutputType; diff --git a/crates/cli/cli-components/src/traits/config/config_path.rs b/crates/cli/cli-components/src/traits/config/config_path.rs index ee82ad3bbb..c2630adc88 100644 --- a/crates/cli/cli-components/src/traits/config/config_path.rs +++ b/crates/cli/cli-components/src/traits/config/config_path.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; +use hermes_prelude::*; #[cgp_component { provider: ConfigPathGetter, diff --git a/crates/cli/cli-components/src/traits/config/load_config.rs b/crates/cli/cli-components/src/traits/config/load_config.rs index c9bb2fce19..5b2a6ca7a8 100644 --- a/crates/cli/cli-components/src/traits/config/load_config.rs +++ b/crates/cli/cli-components/src/traits/config/load_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasConfigType; diff --git a/crates/cli/cli-components/src/traits/config/write_config.rs b/crates/cli/cli-components/src/traits/config/write_config.rs index 4963006581..82a6fd551d 100644 --- a/crates/cli/cli-components/src/traits/config/write_config.rs +++ b/crates/cli/cli-components/src/traits/config/write_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasConfigType; diff --git a/crates/cli/cli-components/src/traits/output.rs b/crates/cli/cli-components/src/traits/output.rs index 383008d22a..7bee008456 100644 --- a/crates/cli/cli-components/src/traits/output.rs +++ b/crates/cli/cli-components/src/traits/output.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: OutputTypeComponent, diff --git a/crates/cli/cli-components/src/traits/parse.rs b/crates/cli/cli-components/src/traits/parse.rs index e1d823a37b..c24b61e061 100644 --- a/crates/cli/cli-components/src/traits/parse.rs +++ b/crates/cli/cli-components/src/traits/parse.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::component::UseDelegate; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: ArgParser, diff --git a/crates/cli/cli-components/src/traits/types/config.rs b/crates/cli/cli-components/src/traits/types/config.rs index 20b79ff9e0..6c1606ebb8 100644 --- a/crates/cli/cli-components/src/traits/types/config.rs +++ b/crates/cli/cli-components/src/traits/types/config.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ConfigTypeComponent, diff --git a/crates/cli/cli-framework/Cargo.toml b/crates/cli/cli-framework/Cargo.toml index 90a0826bc3..81928ce804 100644 --- a/crates/cli/cli-framework/Cargo.toml +++ b/crates/cli/cli-framework/Cargo.toml @@ -18,6 +18,7 @@ hermes-cosmos-relayer = { workspace = true } eyre = { workspace = true } cgp = { workspace = true } +hermes-prelude = { workspace = true } clap = { workspace = true } tokio = { workspace = true, features = [ "full" ] } tracing = { workspace = true } diff --git a/crates/cli/cli-framework/src/application/mod.rs b/crates/cli/cli-framework/src/application/mod.rs index 9a7dc8296d..e667d975ac 100644 --- a/crates/cli/cli-framework/src/application/mod.rs +++ b/crates/cli/cli-framework/src/application/mod.rs @@ -4,7 +4,7 @@ mod boot; use std::path::Path; pub use boot::boot; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use crate::command::CommandRunner; diff --git a/crates/cli/cli-framework/src/command.rs b/crates/cli/cli-framework/src/command.rs index c2850c63bd..ba0941d6a9 100644 --- a/crates/cli/cli-framework/src/command.rs +++ b/crates/cli/cli-framework/src/command.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::output::Output; use crate::Result; diff --git a/crates/cli/cli/Cargo.toml b/crates/cli/cli/Cargo.toml index df677018f6..70cf91e5fd 100644 --- a/crates/cli/cli/Cargo.toml +++ b/crates/cli/cli/Cargo.toml @@ -17,6 +17,7 @@ path = "bin/hermes.rs" [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-any-counterparty = { workspace = true } hermes-cli-components = { workspace = true } hermes-cli-framework = { workspace = true } diff --git a/crates/cli/cli/src/commands/bootstrap/chain.rs b/crates/cli/cli/src/commands/bootstrap/chain.rs index 1e841df401..f9c529c8a0 100644 --- a/crates/cli/cli/src/commands/bootstrap/chain.rs +++ b/crates/cli/cli/src/commands/bootstrap/chain.rs @@ -1,6 +1,5 @@ use alloc::sync::Arc; -use cgp::prelude::*; use hermes_cli_components::traits::{BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType}; use hermes_core::runtime_components::traits::HasRuntime; use hermes_cosmos_core::chain_components::types::DynamicGasConfig; @@ -8,6 +7,7 @@ use hermes_cosmos_core::error::types::HermesError; use hermes_cosmos_core::integration_tests::contexts::{CosmosBootstrap, CosmosBootstrapFields}; use hermes_cosmos_core::relayer::contexts::CosmosBuilder; use hermes_cosmos_core::runtime::types::runtime::HermesRuntime; +use hermes_prelude::*; #[derive(Debug, clap::Parser, HasField)] pub struct BootstrapCosmosChainArgs { diff --git a/crates/cli/cli/src/commands/bootstrap/subcommand.rs b/crates/cli/cli/src/commands/bootstrap/subcommand.rs index ebcdd8d6f9..ac7cf75b1c 100644 --- a/crates/cli/cli/src/commands/bootstrap/subcommand.rs +++ b/crates/cli/cli/src/commands/bootstrap/subcommand.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; +use hermes_prelude::*; use crate::commands::BootstrapCosmosChainArgs; diff --git a/crates/cli/cli/src/commands/channel/mod.rs b/crates/cli/cli/src/commands/channel/mod.rs index d8a327d30c..44c082a9e6 100644 --- a/crates/cli/cli/src/commands/channel/mod.rs +++ b/crates/cli/cli/src/commands/channel/mod.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_cli_components::traits::{CanRunCommand, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; use hermes_cli_framework::output::Output; +use hermes_prelude::*; use crate::contexts::HermesApp; use crate::Result; diff --git a/crates/cli/cli/src/commands/clear/packets.rs b/crates/cli/cli/src/commands/clear/packets.rs index 4aee981367..fa50dca8d9 100644 --- a/crates/cli/cli/src/commands/clear/packets.rs +++ b/crates/cli/cli/src/commands/clear/packets.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use futures::stream::{self, StreamExt}; use hermes_cli_components::traits::CanLoadBuilder; use hermes_cli_components::traits::CommandRunnerComponent; diff --git a/crates/cli/cli/src/commands/client/create.rs b/crates/cli/cli/src/commands/client/create.rs index 1fa08735c1..0d26dcb3c5 100644 --- a/crates/cli/cli/src/commands/client/create.rs +++ b/crates/cli/cli/src/commands/client/create.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use eyre::eyre; use hermes_cosmos_core::ibc::clients::tendermint::types::TrustThreshold; +use hermes_prelude::*; #[derive(Debug, clap::Parser, HasField)] pub struct CreateCosmosClientArgs { diff --git a/crates/cli/cli/src/commands/client/mod.rs b/crates/cli/cli/src/commands/client/mod.rs index aab350e9c9..996e1f8c41 100644 --- a/crates/cli/cli/src/commands/client/mod.rs +++ b/crates/cli/cli/src/commands/client/mod.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_cli_components::impls::UpdateClientArgs; use hermes_cli_components::traits::{CanRunCommand, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; use hermes_cli_framework::output::Output; +use hermes_prelude::*; use crate::contexts::HermesApp; use crate::Result; diff --git a/crates/cli/cli/src/commands/connection/mod.rs b/crates/cli/cli/src/commands/connection/mod.rs index f6a0227698..441587f74f 100644 --- a/crates/cli/cli/src/commands/connection/mod.rs +++ b/crates/cli/cli/src/commands/connection/mod.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_cli_components::impls::CreateConnectionArgs; use hermes_cli_components::traits::{CanRunCommand, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; use hermes_cli_framework::output::Output; +use hermes_prelude::*; use crate::contexts::HermesApp; use crate::Result; diff --git a/crates/cli/cli/src/commands/keys/add.rs b/crates/cli/cli/src/commands/keys/add.rs index 13a31f0a09..5038ea40fe 100644 --- a/crates/cli/cli/src/commands/keys/add.rs +++ b/crates/cli/cli/src/commands/keys/add.rs @@ -2,7 +2,6 @@ use std::fs; use std::path::{Path, PathBuf}; use std::str::FromStr; -use cgp::prelude::*; use eyre::{eyre, WrapErr}; use hdpath::StandardHDPath; use hermes_cli_components::traits::{CanLoadBuilder, CommandRunnerComponent}; @@ -11,6 +10,7 @@ use hermes_cli_framework::output::Output; use hermes_cosmos_core::chain_components::impls::CosmosChainConfig; use hermes_cosmos_core::chain_components::types::{KeyRing, Secp256k1KeyPair}; use hermes_cosmos_core::ibc::core::host::types::identifiers::ChainId; +use hermes_prelude::*; use tracing::warn; use crate::contexts::HermesApp; diff --git a/crates/cli/cli/src/commands/keys/delete.rs b/crates/cli/cli/src/commands/keys/delete.rs index d6964e52e5..81a561d99d 100644 --- a/crates/cli/cli/src/commands/keys/delete.rs +++ b/crates/cli/cli/src/commands/keys/delete.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use eyre::eyre; use hermes_cli_components::traits::{CanLoadBuilder, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; @@ -6,6 +5,7 @@ use hermes_cli_framework::output::Output; use hermes_cosmos_core::chain_components::impls::CosmosChainConfig; use hermes_cosmos_core::chain_components::types::KeyRing; use hermes_cosmos_core::ibc::core::host::types::identifiers::ChainId; +use hermes_prelude::*; use tracing::warn; use crate::contexts::HermesApp; diff --git a/crates/cli/cli/src/commands/keys/list.rs b/crates/cli/cli/src/commands/keys/list.rs index 6284a9cd9e..4d3d8166cc 100644 --- a/crates/cli/cli/src/commands/keys/list.rs +++ b/crates/cli/cli/src/commands/keys/list.rs @@ -1,13 +1,13 @@ use core::fmt::Write; use std::collections::BTreeMap; -use cgp::prelude::*; use eyre::eyre; use hermes_cli_components::traits::{CanLoadBuilder, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; use hermes_cli_framework::output::{json, Output}; use hermes_cosmos_core::chain_components::types::KeyRing; use hermes_cosmos_core::ibc::core::host::types::identifiers::ChainId; +use hermes_prelude::*; use crate::contexts::HermesApp; diff --git a/crates/cli/cli/src/commands/keys/mod.rs b/crates/cli/cli/src/commands/keys/mod.rs index 4e5ebb3322..993a896bb9 100644 --- a/crates/cli/cli/src/commands/keys/mod.rs +++ b/crates/cli/cli/src/commands/keys/mod.rs @@ -6,10 +6,10 @@ use hermes_cli_components::traits::CommandRunnerComponent; pub use list::KeysListCmd; mod delete; -use cgp::prelude::*; pub use delete::KeysDeleteCmd; use hermes_cli_framework::command::CommandRunner; use hermes_cli_framework::output::Output; +use hermes_prelude::*; use crate::contexts::HermesApp; use crate::Result; diff --git a/crates/cli/cli/src/commands/mod.rs b/crates/cli/cli/src/commands/mod.rs index ab1c486ea9..1c229270c6 100644 --- a/crates/cli/cli/src/commands/mod.rs +++ b/crates/cli/cli/src/commands/mod.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_cli_components::impls::StartRelayerArgs; use hermes_cli_components::traits::{CanRunCommand, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; use hermes_cli_framework::output::Output; +use hermes_prelude::*; use crate::contexts::HermesApp; use crate::Result; diff --git a/crates/cli/cli/src/commands/query/channel/client.rs b/crates/cli/cli/src/commands/query/channel/client.rs index 923ca772ff..ea4d8c5fac 100644 --- a/crates/cli/cli/src/commands/query/channel/client.rs +++ b/crates/cli/cli/src/commands/query/channel/client.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_cli_components::traits::{CanLoadBuilder, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; use hermes_cli_framework::output::Output; @@ -6,6 +5,7 @@ use hermes_cosmos_core::chain_components::traits::HasGrpcAddress; use hermes_cosmos_core::ibc::core::channel::types::proto::v1::query_client::QueryClient; use hermes_cosmos_core::ibc::core::channel::types::proto::v1::QueryChannelClientStateRequest; use hermes_cosmos_core::ibc::core::host::types::identifiers::{ChainId, ChannelId, PortId}; +use hermes_prelude::*; use http::Uri; use crate::contexts::HermesApp; diff --git a/crates/cli/cli/src/commands/query/channel/ends.rs b/crates/cli/cli/src/commands/query/channel/ends.rs index 364fbe6cc9..c8d1ca5e18 100644 --- a/crates/cli/cli/src/commands/query/channel/ends.rs +++ b/crates/cli/cli/src/commands/query/channel/ends.rs @@ -1,6 +1,5 @@ use std::str::FromStr; -use cgp::prelude::*; use eyre::eyre; use hermes_cli_components::traits::{CanLoadBuilder, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; @@ -19,6 +18,7 @@ use hermes_cosmos_core::ibc::cosmos_host::IBC_QUERY_PATH; use hermes_cosmos_core::ibc::primitives::proto::Protobuf; use hermes_cosmos_core::protobuf_encoding_components::types::any::Any; use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_prelude::*; use serde::{Deserialize, Serialize}; use crate::contexts::HermesApp; diff --git a/crates/cli/cli/src/commands/query/channels.rs b/crates/cli/cli/src/commands/query/channels.rs index 6ecc6891b8..fcaea3dfe3 100644 --- a/crates/cli/cli/src/commands/query/channels.rs +++ b/crates/cli/cli/src/commands/query/channels.rs @@ -1,7 +1,6 @@ use std::marker::PhantomData; use std::str::FromStr; -use cgp::prelude::*; use hermes_cli_components::traits::{CanLoadBuilder, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; use hermes_cli_framework::output::{json, Output}; @@ -15,6 +14,7 @@ use hermes_cosmos_core::ibc::core::host::types::identifiers::{ ChainId, ChannelId, ClientId, PortId, }; use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_prelude::*; use http::Uri; use tracing::{info, warn}; diff --git a/crates/cli/cli/src/commands/query/connections.rs b/crates/cli/cli/src/commands/query/connections.rs index 3bd72be9ee..813ff39e59 100644 --- a/crates/cli/cli/src/commands/query/connections.rs +++ b/crates/cli/cli/src/commands/query/connections.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cli_components::traits::{CanLoadBuilder, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; use hermes_cli_framework::output::{json, Output}; @@ -11,6 +10,7 @@ use hermes_cosmos_core::ibc::core::connection::types::proto::v1::QueryConnection use hermes_cosmos_core::ibc::core::connection::types::IdentifiedConnectionEnd; use hermes_cosmos_core::ibc::core::host::types::identifiers::ChainId; use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_prelude::*; use http::Uri; use tracing::{info, warn}; diff --git a/crates/cli/cli/src/commands/query/mod.rs b/crates/cli/cli/src/commands/query/mod.rs index 47e5b8a6bc..8df558bc60 100644 --- a/crates/cli/cli/src/commands/query/mod.rs +++ b/crates/cli/cli/src/commands/query/mod.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_cli_components::impls::{ QueryChainSubCommand, QueryClientSubCommand, QueryClientsArgs, QueryConnectionSubCommand, QueryWalletSubCommand, @@ -6,6 +5,7 @@ use hermes_cli_components::impls::{ use hermes_cli_components::traits::{CanRunCommand, CommandRunnerComponent}; use hermes_cli_framework::command::CommandRunner; use hermes_cli_framework::output::Output; +use hermes_prelude::*; mod connections; pub use connections::QueryConnections; diff --git a/crates/cli/cli/src/contexts/app.rs b/crates/cli/cli/src/contexts/app.rs index d6b191286f..85d9e3439e 100644 --- a/crates/cli/cli/src/contexts/app.rs +++ b/crates/cli/cli/src/contexts/app.rs @@ -6,7 +6,6 @@ use cgp::core::component::{UseContext, UseDelegate}; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; use cgp::core::field::Index; use cgp::core::types::WithType; -use cgp::prelude::*; use hermes_any_counterparty::contexts::AnyCounterparty; use hermes_cli_components::impls::{ CreateClientOptionsParser, CreateClientOptionsParserComponent, CreateConnectionArgs, @@ -49,6 +48,7 @@ use hermes_cosmos_core::relayer::contexts::{CosmosBuilder, CosmosChain}; use hermes_cosmos_core::runtime::types::runtime::HermesRuntime; use hermes_cosmos_core::test_components::chain::types::Denom; use hermes_cosmos_core::tracing_logging_components::contexts::TracingLogger; +use hermes_prelude::*; use serde::Serialize; use crate::commands::{ diff --git a/crates/cli/cli/src/impls/build.rs b/crates/cli/cli/src/impls/build.rs index 0bc626c5b7..04ed7580e2 100644 --- a/crates/cli/cli/src/impls/build.rs +++ b/crates/cli/cli/src/impls/build.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_cli_components::traits::{ BuilderLoader, BuilderLoaderComponent, CanLoadConfig, HasBuilderType, HasConfigType, }; @@ -6,6 +5,7 @@ use hermes_core::runtime_components::traits::HasRuntime; use hermes_cosmos_core::chain_components::impls::RelayerConfig; use hermes_cosmos_core::relayer::contexts::CosmosBuilder; use hermes_cosmos_core::runtime::types::runtime::HermesRuntime; +use hermes_prelude::*; pub struct LoadCosmosBuilder; diff --git a/crates/cli/cli/src/impls/error.rs b/crates/cli/cli/src/impls/error.rs index 091214f41b..b2b0fe83fb 100644 --- a/crates/cli/cli/src/impls/error.rs +++ b/crates/cli/cli/src/impls/error.rs @@ -4,7 +4,6 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ ErrorRaiser, ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent, }; -use cgp::prelude::*; use eyre::Report; use hermes_core::relayer_components::error::traits::RetryableErrorComponent; use hermes_cosmos_core::error::handlers::{ @@ -16,6 +15,7 @@ use hermes_cosmos_core::ibc::clients::tendermint::types::error::TendermintClient use hermes_cosmos_core::ibc::core::channel::types::error::ChannelError; use hermes_cosmos_core::ibc::core::host::types::error::{DecodingError, IdentifierError}; use hermes_cosmos_core::runtime::types::error::TokioRuntimeError; +use hermes_prelude::*; use tonic::transport::Error as TransportError; pub struct ProvideCliError; diff --git a/crates/cli/cli/src/impls/parse.rs b/crates/cli/cli/src/impls/parse.rs index e06434bd98..55164964d3 100644 --- a/crates/cli/cli/src/impls/parse.rs +++ b/crates/cli/cli/src/impls/parse.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cli_components::traits::{ArgParser, ArgParserComponent}; use hermes_cosmos_core::chain_components::types::CosmosInitChannelOptions; use hermes_cosmos_core::ibc::core::channel::types::channel::Order; @@ -8,6 +7,7 @@ use hermes_cosmos_core::ibc::core::channel::types::error::ChannelError; use hermes_cosmos_core::ibc::core::channel::types::Version; use hermes_cosmos_core::ibc::core::host::types::error::IdentifierError; use hermes_cosmos_core::ibc::core::host::types::identifiers::ConnectionId; +use hermes_prelude::*; #[cgp_auto_getter] pub trait HasCosmosCreateChannelFields { diff --git a/crates/comet/comet-light-client-components/Cargo.toml b/crates/comet/comet-light-client-components/Cargo.toml index 1ce20119f9..0e36dbf28e 100644 --- a/crates/comet/comet-light-client-components/Cargo.toml +++ b/crates/comet/comet-light-client-components/Cargo.toml @@ -13,4 +13,5 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-chain-type-components = { workspace = true } diff --git a/crates/comet/comet-light-client-components/src/impls/verify_target_height/verify_forward.rs b/crates/comet/comet-light-client-components/src/impls/verify_target_height/verify_forward.rs index 73d85749bb..02c9fe4460 100644 --- a/crates/comet/comet-light-client-components/src/impls/verify_target_height/verify_forward.rs +++ b/crates/comet/comet-light-client-components/src/impls/verify_target_height/verify_forward.rs @@ -1,7 +1,7 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; +use hermes_prelude::*; use crate::traits::{ CanComputeNextVerificationHeight, CanFetchLightBlockWithStatus, CanQueryLightBlock, diff --git a/crates/comet/comet-light-client-components/src/impls/verify_target_height/verify_to_target.rs b/crates/comet/comet-light-client-components/src/impls/verify_target_height/verify_to_target.rs index 2f74184492..87c716c1fa 100644 --- a/crates/comet/comet-light-client-components/src/impls/verify_target_height/verify_to_target.rs +++ b/crates/comet/comet-light-client-components/src/impls/verify_target_height/verify_to_target.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ CanQueryLightBlock, CanVerifyTargetHeight, GetHighestTrustedOrVerifiedBefore, diff --git a/crates/comet/comet-light-client-components/src/traits/compute_verification_height.rs b/crates/comet/comet-light-client-components/src/traits/compute_verification_height.rs index 02f2f49e4e..a0e3b04c9a 100644 --- a/crates/comet/comet-light-client-components/src/traits/compute_verification_height.rs +++ b/crates/comet/comet-light-client-components/src/traits/compute_verification_height.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; +use hermes_prelude::*; #[cgp_component { provider: NextVerificationHeightComputer, diff --git a/crates/comet/comet-light-client-components/src/traits/fetch_light_block.rs b/crates/comet/comet-light-client-components/src/traits/fetch_light_block.rs index 5024b9b887..f2a8996f1e 100644 --- a/crates/comet/comet-light-client-components/src/traits/fetch_light_block.rs +++ b/crates/comet/comet-light-client-components/src/traits/fetch_light_block.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; +use hermes_prelude::*; use crate::traits::{HasLightBlockType, HasVerificationStatusType}; diff --git a/crates/comet/comet-light-client-components/src/traits/light_block/height.rs b/crates/comet/comet-light-client-components/src/traits/light_block/height.rs index fb08cde9e0..1e6c052f41 100644 --- a/crates/comet/comet-light-client-components/src/traits/light_block/height.rs +++ b/crates/comet/comet-light-client-components/src/traits/light_block/height.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; +use hermes_prelude::*; use crate::traits::HasLightBlockType; diff --git a/crates/comet/comet-light-client-components/src/traits/query_light_block.rs b/crates/comet/comet-light-client-components/src/traits/query_light_block.rs index a3db5adeb2..63260d7492 100644 --- a/crates/comet/comet-light-client-components/src/traits/query_light_block.rs +++ b/crates/comet/comet-light-client-components/src/traits/query_light_block.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; +use hermes_prelude::*; use crate::traits::HasLightBlockType; diff --git a/crates/comet/comet-light-client-components/src/traits/trace_verification_height.rs b/crates/comet/comet-light-client-components/src/traits/trace_verification_height.rs index d5902dafc8..8fd700174b 100644 --- a/crates/comet/comet-light-client-components/src/traits/trace_verification_height.rs +++ b/crates/comet/comet-light-client-components/src/traits/trace_verification_height.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; +use hermes_prelude::*; #[cgp_component { provider: VerificationHeightTracer, diff --git a/crates/comet/comet-light-client-components/src/traits/types/light_block.rs b/crates/comet/comet-light-client-components/src/traits/types/light_block.rs index 57376b5c7c..904623661e 100644 --- a/crates/comet/comet-light-client-components/src/traits/types/light_block.rs +++ b/crates/comet/comet-light-client-components/src/traits/types/light_block.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: LightBlockTypeComponent, diff --git a/crates/comet/comet-light-client-components/src/traits/types/status.rs b/crates/comet/comet-light-client-components/src/traits/types/status.rs index 1c509046d8..e28d151dbc 100644 --- a/crates/comet/comet-light-client-components/src/traits/types/status.rs +++ b/crates/comet/comet-light-client-components/src/traits/types/status.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: VerificationStatusTypeComponent, diff --git a/crates/comet/comet-light-client-components/src/traits/types/verdict.rs b/crates/comet/comet-light-client-components/src/traits/types/verdict.rs index 8702d9cd13..ab660b6062 100644 --- a/crates/comet/comet-light-client-components/src/traits/types/verdict.rs +++ b/crates/comet/comet-light-client-components/src/traits/types/verdict.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: VerdictTypeComponent, diff --git a/crates/comet/comet-light-client-components/src/traits/update_client.rs b/crates/comet/comet-light-client-components/src/traits/update_client.rs index 3833a300d4..a2338ba29b 100644 --- a/crates/comet/comet-light-client-components/src/traits/update_client.rs +++ b/crates/comet/comet-light-client-components/src/traits/update_client.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; +use hermes_prelude::*; use crate::traits::HasLightBlockType; diff --git a/crates/comet/comet-light-client-components/src/traits/update_verification_status.rs b/crates/comet/comet-light-client-components/src/traits/update_verification_status.rs index a81469da7c..57f60f3e90 100644 --- a/crates/comet/comet-light-client-components/src/traits/update_verification_status.rs +++ b/crates/comet/comet-light-client-components/src/traits/update_verification_status.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasLightBlockType; diff --git a/crates/comet/comet-light-client-components/src/traits/validate_light_block.rs b/crates/comet/comet-light-client-components/src/traits/validate_light_block.rs index c8bba1b3b7..7569e2534e 100644 --- a/crates/comet/comet-light-client-components/src/traits/validate_light_block.rs +++ b/crates/comet/comet-light-client-components/src/traits/validate_light_block.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasLightBlockType; diff --git a/crates/comet/comet-light-client-components/src/traits/verify_target_height.rs b/crates/comet/comet-light-client-components/src/traits/verify_target_height.rs index d174abe38c..41784298c5 100644 --- a/crates/comet/comet-light-client-components/src/traits/verify_target_height.rs +++ b/crates/comet/comet-light-client-components/src/traits/verify_target_height.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; +use hermes_prelude::*; use crate::traits::HasLightBlockType; diff --git a/crates/comet/comet-light-client-components/src/traits/verify_update_header.rs b/crates/comet/comet-light-client-components/src/traits/verify_update_header.rs index 4291ac2522..d1ec56d2df 100644 --- a/crates/comet/comet-light-client-components/src/traits/verify_update_header.rs +++ b/crates/comet/comet-light-client-components/src/traits/verify_update_header.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasLightBlockType, HasVerdictType}; diff --git a/crates/comet/comet-light-client-context/Cargo.toml b/crates/comet/comet-light-client-context/Cargo.toml index 9a1f8fcbd5..7e92102e28 100644 --- a/crates/comet/comet-light-client-context/Cargo.toml +++ b/crates/comet/comet-light-client-context/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-error = { workspace = true } hermes-chain-components = { workspace = true } hermes-chain-type-components = { workspace = true } diff --git a/crates/comet/comet-light-client-context/src/contexts/error.rs b/crates/comet/comet-light-client-context/src/contexts/error.rs index 51c924553a..af06862c9a 100644 --- a/crates/comet/comet-light-client-context/src/contexts/error.rs +++ b/crates/comet/comet-light-client-context/src/contexts/error.rs @@ -1,12 +1,12 @@ use core::convert::Infallible; -use cgp::prelude::*; use eyre::Report; use hermes_chain_components::traits::HasHeightType; use hermes_comet_light_client_components::impls::TargetLowerThanTrustedHeight; use hermes_comet_light_client_components::traits::NoInitialTrustedState; use hermes_error::handlers::{DebugError, HandleInfallible, ReportError, ReturnError}; use hermes_error::types::Error; +use hermes_prelude::*; use tendermint_light_client_verifier::errors::VerificationErrorDetail; use crate::impls::validate_light_block::TrustedStateOutsideTrustingPeriod; diff --git a/crates/comet/comet-light-client-context/src/contexts/light_client.rs b/crates/comet/comet-light-client-context/src/contexts/light_client.rs index 24e9aefc8e..9b4ae9ee0f 100644 --- a/crates/comet/comet-light-client-context/src/contexts/light_client.rs +++ b/crates/comet/comet-light-client-context/src/contexts/light_client.rs @@ -1,7 +1,6 @@ use cgp::core::component::{UseContext, UseDelegate}; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::types::WithDelegatedType; -use cgp::prelude::*; use hermes_chain_components::traits::{HasHeightType, HeightTypeProviderComponent}; use hermes_comet_light_client_components::impls::DoVerifyForward; use hermes_comet_light_client_components::traits::{ @@ -19,6 +18,7 @@ use hermes_comet_light_client_components::traits::{ }; use hermes_comet_light_client_components::types::{Verdict, VerificationStatus}; use hermes_error::impls::UseHermesError; +use hermes_prelude::*; use tendermint::block::Height; use tendermint::Time; use tendermint_light_client_verifier::options::Options; diff --git a/crates/comet/comet-light-client-context/src/impls/bisect_height.rs b/crates/comet/comet-light-client-context/src/impls/bisect_height.rs index 8b130bc056..c9a7b8c44c 100644 --- a/crates/comet/comet-light-client-context/src/impls/bisect_height.rs +++ b/crates/comet/comet-light-client-context/src/impls/bisect_height.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; use hermes_comet_light_client_components::traits::{ CanQueryLightBlock, GetHighestTrustedOrVerifiedBefore, HasLightBlockHeight, NextVerificationHeightComputer, NextVerificationHeightComputerComponent, NoInitialTrustedState, }; +use hermes_prelude::*; use tendermint::block::Height; pub struct BisectHeight; diff --git a/crates/comet/comet-light-client-context/src/impls/fetch_light_block.rs b/crates/comet/comet-light-client-context/src/impls/fetch_light_block.rs index 9f860fafc1..18e21306ec 100644 --- a/crates/comet/comet-light-client-context/src/impls/fetch_light_block.rs +++ b/crates/comet/comet-light-client-context/src/impls/fetch_light_block.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasHeightType; use hermes_comet_light_client_components::traits::{ HasLightBlockType, LightBlockFetcher, LightBlockFetcherComponent, }; +use hermes_prelude::*; use tendermint_light_client_verifier::types::{Height, LightBlock, ValidatorSet}; use tendermint_rpc::{Client, Error as RpcError, Paging}; diff --git a/crates/comet/comet-light-client-context/src/impls/fetch_light_block_with_status.rs b/crates/comet/comet-light-client-context/src/impls/fetch_light_block_with_status.rs index efc5c310d9..76bcf8c2c9 100644 --- a/crates/comet/comet-light-client-context/src/impls/fetch_light_block_with_status.rs +++ b/crates/comet/comet-light-client-context/src/impls/fetch_light_block_with_status.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasHeightType; use hermes_comet_light_client_components::traits::{ CanFetchLightBlock, HasLightBlockType, HasVerificationStatusType, LightBlockWithStatusFetcher, LightBlockWithStatusFetcherComponent, }; use hermes_comet_light_client_components::types::VerificationStatus; +use hermes_prelude::*; use tendermint::block::Height; use tendermint_light_client_verifier::types::LightBlock; diff --git a/crates/comet/comet-light-client-context/src/impls/query_light_block/highest_trusted_or_before.rs b/crates/comet/comet-light-client-context/src/impls/query_light_block/highest_trusted_or_before.rs index 86f2fa867e..e4d528d656 100644 --- a/crates/comet/comet-light-client-context/src/impls/query_light_block/highest_trusted_or_before.rs +++ b/crates/comet/comet-light-client-context/src/impls/query_light_block/highest_trusted_or_before.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasHeightType; use hermes_comet_light_client_components::traits::{ GetHighestTrustedOrVerifiedBefore, HasLightBlockType, LightBlockQuerier, LightBlockQuerierComponent, }; use hermes_comet_light_client_components::types::VerificationStatus; +use hermes_prelude::*; use tendermint::block::Height; use tendermint_light_client_verifier::types::LightBlock; diff --git a/crates/comet/comet-light-client-context/src/impls/trace_verification.rs b/crates/comet/comet-light-client-context/src/impls/trace_verification.rs index 24fb5acf10..8710fafd10 100644 --- a/crates/comet/comet-light-client-context/src/impls/trace_verification.rs +++ b/crates/comet/comet-light-client-context/src/impls/trace_verification.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasHeightType; use hermes_comet_light_client_components::traits::{ VerificationHeightTracer, VerificationHeightTracerComponent, }; +use hermes_prelude::*; use tendermint::block::Height; use crate::traits::verification_trace::HasVerificationTrace; diff --git a/crates/comet/comet-light-client-context/src/impls/types/all.rs b/crates/comet/comet-light-client-context/src/impls/types/all.rs index 2af00a6462..cf021791ea 100644 --- a/crates/comet/comet-light-client-context/src/impls/types/all.rs +++ b/crates/comet/comet-light-client-context/src/impls/types/all.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HeightTypeProviderComponent; use hermes_comet_light_client_components::traits::{ VerdictTypeComponent, VerificationStatusTypeComponent, }; use hermes_comet_light_client_components::types::{Verdict, VerificationStatus}; +use hermes_prelude::*; use tendermint::block::Height; pub struct CometLightClientTypes; diff --git a/crates/comet/comet-light-client-context/src/impls/types/light_block.rs b/crates/comet/comet-light-client-context/src/impls/types/light_block.rs index 67768fcff8..bbacab527e 100644 --- a/crates/comet/comet-light-client-context/src/impls/types/light_block.rs +++ b/crates/comet/comet-light-client-context/src/impls/types/light_block.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasHeightType; use hermes_comet_light_client_components::traits::{ HasLightBlockType, LightBlockHeightGetter, LightBlockHeightGetterComponent, LightBlockTypeComponent, ProvideLightBlockType, }; +use hermes_prelude::*; use tendermint::block::Height; use tendermint_light_client_verifier::types::LightBlock; diff --git a/crates/comet/comet-light-client-context/src/impls/update_client.rs b/crates/comet/comet-light-client-context/src/impls/update_client.rs index 86050ecb90..6893d96cee 100644 --- a/crates/comet/comet-light-client-context/src/impls/update_client.rs +++ b/crates/comet/comet-light-client-context/src/impls/update_client.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasHeightType; use hermes_comet_light_client_components::traits::{ CanFetchLightBlock, CanUpdateVerificationStatus, CanVerifyTargetHeight, HasLightBlockType, @@ -6,6 +5,7 @@ use hermes_comet_light_client_components::traits::{ VerifyForward, }; use hermes_comet_light_client_components::types::VerificationStatus; +use hermes_prelude::*; use tendermint::block::Height; use tendermint_light_client_verifier::types::LightBlock; diff --git a/crates/comet/comet-light-client-context/src/impls/update_verification_status.rs b/crates/comet/comet-light-client-context/src/impls/update_verification_status.rs index ef76a5f3bf..a50ff28186 100644 --- a/crates/comet/comet-light-client-context/src/impls/update_verification_status.rs +++ b/crates/comet/comet-light-client-context/src/impls/update_verification_status.rs @@ -1,11 +1,11 @@ use std::collections::btree_map::Entry; -use cgp::prelude::*; use hermes_comet_light_client_components::traits::{ HasLightBlockType, TrustedStatus, VerificationStatusUpdater, VerificationStatusUpdaterComponent, VerifiedStatus, }; use hermes_comet_light_client_components::types::VerificationStatus; +use hermes_prelude::*; use tendermint_light_client_verifier::types::LightBlock; use crate::traits::light_block_store::HasLightBlockStore; diff --git a/crates/comet/comet-light-client-context/src/impls/validate_light_block.rs b/crates/comet/comet-light-client-context/src/impls/validate_light_block.rs index de2ea873de..f59da767c7 100644 --- a/crates/comet/comet-light-client-context/src/impls/validate_light_block.rs +++ b/crates/comet/comet-light-client-context/src/impls/validate_light_block.rs @@ -1,9 +1,9 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_comet_light_client_components::traits::{ HasLightBlockType, LightBlockValidator, LightBlockValidatorComponent, }; +use hermes_prelude::*; use tendermint::Time; use tendermint_light_client_verifier::types::LightBlock; diff --git a/crates/comet/comet-light-client-context/src/impls/verify_update_header.rs b/crates/comet/comet-light-client-context/src/impls/verify_update_header.rs index f360183fb8..6a8638b519 100644 --- a/crates/comet/comet-light-client-context/src/impls/verify_update_header.rs +++ b/crates/comet/comet-light-client-context/src/impls/verify_update_header.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_comet_light_client_components::traits::{ HasLightBlockType, HasVerdictType, UpdateHeaderVerifier, UpdateHeaderVerifierComponent, }; use hermes_comet_light_client_components::types::Verdict; +use hermes_prelude::*; use tendermint_light_client_verifier::errors::VerificationErrorDetail; use tendermint_light_client_verifier::types::LightBlock; use tendermint_light_client_verifier::{Verdict as TendermintVerdict, Verifier}; diff --git a/crates/comet/comet-light-client-context/src/traits/current_time.rs b/crates/comet/comet-light-client-context/src/traits/current_time.rs index de5a507ee7..1a99cbc007 100644 --- a/crates/comet/comet-light-client-context/src/traits/current_time.rs +++ b/crates/comet/comet-light-client-context/src/traits/current_time.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; use tendermint_light_client_verifier::types::Time; #[cgp_component { diff --git a/crates/comet/comet-light-client-context/src/traits/light_block_store.rs b/crates/comet/comet-light-client-context/src/traits/light_block_store.rs index 553a484836..051c1c9180 100644 --- a/crates/comet/comet-light-client-context/src/traits/light_block_store.rs +++ b/crates/comet/comet-light-client-context/src/traits/light_block_store.rs @@ -2,8 +2,8 @@ use core::marker::PhantomData; use std::collections::BTreeMap; use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_comet_light_client_components::types::VerificationStatus; +use hermes_prelude::*; use tendermint::block::Height; use tendermint_light_client_verifier::types::LightBlock; diff --git a/crates/comet/comet-light-client-context/src/traits/peer_id.rs b/crates/comet/comet-light-client-context/src/traits/peer_id.rs index e489cbe208..f5ea2045af 100644 --- a/crates/comet/comet-light-client-context/src/traits/peer_id.rs +++ b/crates/comet/comet-light-client-context/src/traits/peer_id.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; use tendermint_light_client_verifier::types::PeerId; #[cgp_component { diff --git a/crates/comet/comet-light-client-context/src/traits/rpc_client.rs b/crates/comet/comet-light-client-context/src/traits/rpc_client.rs index 0b8736de1e..6294f22be7 100644 --- a/crates/comet/comet-light-client-context/src/traits/rpc_client.rs +++ b/crates/comet/comet-light-client-context/src/traits/rpc_client.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; use tendermint_rpc::HttpClient; #[cgp_component { diff --git a/crates/comet/comet-light-client-context/src/traits/verification_trace.rs b/crates/comet/comet-light-client-context/src/traits/verification_trace.rs index 03c5ef80d3..07474f7251 100644 --- a/crates/comet/comet-light-client-context/src/traits/verification_trace.rs +++ b/crates/comet/comet-light-client-context/src/traits/verification_trace.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use std::collections::{BTreeMap, BTreeSet}; use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; use tendermint::block::Height; pub type VerificationTrace = BTreeMap>; diff --git a/crates/comet/comet-light-client-context/src/traits/verifier.rs b/crates/comet/comet-light-client-context/src/traits/verifier.rs index 05ff4894e9..0fdb3e8920 100644 --- a/crates/comet/comet-light-client-context/src/traits/verifier.rs +++ b/crates/comet/comet-light-client-context/src/traits/verifier.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; use tendermint_light_client_verifier::Verifier; #[cgp_component { diff --git a/crates/comet/comet-light-client-context/src/traits/verifier_options.rs b/crates/comet/comet-light-client-context/src/traits/verifier_options.rs index f5169a9192..8bdb15a460 100644 --- a/crates/comet/comet-light-client-context/src/traits/verifier_options.rs +++ b/crates/comet/comet-light-client-context/src/traits/verifier_options.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; use tendermint_light_client_verifier::options::Options; #[cgp_component { diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 9d5e706751..f1771d4d1a 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime-components = { workspace = true } hermes-logging-components = { workspace = true } hermes-encoding-components = { workspace = true } diff --git a/crates/cosmos/cosmos-chain-components/Cargo.toml b/crates/cosmos/cosmos-chain-components/Cargo.toml index a700816164..05f71eadda 100644 --- a/crates/cosmos/cosmos-chain-components/Cargo.toml +++ b/crates/cosmos/cosmos-chain-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-error = { workspace = true } hermes-core = { workspace = true } hermes-protobuf-encoding-components = { workspace = true } diff --git a/crates/cosmos/cosmos-chain-components/src/encoding/components.rs b/crates/cosmos/cosmos-chain-components/src/encoding/components.rs index 3e6e83b598..1c4605c03f 100644 --- a/crates/cosmos/cosmos-chain-components/src/encoding/components.rs +++ b/crates/cosmos/cosmos-chain-components/src/encoding/components.rs @@ -1,13 +1,13 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::UseDelegate; - use cgp::prelude::*; use hermes_core::encoding_components::traits::{ ConverterComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent, EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, SchemaGetterComponent, SchemaTypeComponent, }; use hermes_cosmos_encoding_components::components::CosmosEncodingComponents; + use hermes_prelude::*; use hermes_protobuf_encoding_components::traits::EncodedLengthGetterComponent; use crate::encoding::convert::CosmosConverterComponents; diff --git a/crates/cosmos/cosmos-chain-components/src/encoding/convert.rs b/crates/cosmos/cosmos-chain-components/src/encoding/convert.rs index 0e8d686b94..3a1b816205 100644 --- a/crates/cosmos/cosmos-chain-components/src/encoding/convert.rs +++ b/crates/cosmos/cosmos-chain-components/src/encoding/convert.rs @@ -1,6 +1,6 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_core::encoding_components::impls::{ConvertFrom, TryConvertFrom}; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::any::{DecodeAsAnyProtobuf, EncodeAsAnyProtobuf}; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use ibc::core::commitment_types::merkle::MerkleProof; diff --git a/crates/cosmos/cosmos-chain-components/src/encoding/encode.rs b/crates/cosmos/cosmos-chain-components/src/encoding/encode.rs index e5872f712b..13359a9505 100644 --- a/crates/cosmos/cosmos-chain-components/src/encoding/encode.rs +++ b/crates/cosmos/cosmos-chain-components/src/encoding/encode.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::encoding_components::impls::{ ConvertAndEncode, EncodeUsingStrategy, ReturnEncoded, }; use hermes_core::relayer_components::chain::traits::ViaCommitmentProof; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::encode::buffer::EncodeProtoWithMutBuffer; use hermes_protobuf_encoding_components::impls::protobuf::EncodeAsProtobuf; use hermes_protobuf_encoding_components::impls::via_any::EncodeViaAny; diff --git a/crates/cosmos/cosmos-chain-components/src/encoding/type_url.rs b/crates/cosmos/cosmos-chain-components/src/encoding/type_url.rs index c930ad680d..85f3e4bba7 100644 --- a/crates/cosmos/cosmos-chain-components/src/encoding/type_url.rs +++ b/crates/cosmos/cosmos-chain-components/src/encoding/type_url.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impl_type_url; use ibc::clients::tendermint::types::{ TENDERMINT_CLIENT_STATE_TYPE_URL, TENDERMINT_CONSENSUS_STATE_TYPE_URL, diff --git a/crates/cosmos/cosmos-chain-components/src/impls/channel/channel_handshake_message.rs b/crates/cosmos/cosmos-chain-components/src/impls/channel/channel_handshake_message.rs index 9475b74367..ed3a71e1e8 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/channel/channel_handshake_message.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/channel/channel_handshake_message.rs @@ -1,6 +1,5 @@ use core::fmt::Display; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasMessageType; use hermes_core::relayer_components::chain::traits::{ ChannelOpenAckMessageBuilder, ChannelOpenAckMessageBuilderComponent, @@ -14,6 +13,7 @@ use hermes_core::relayer_components::chain::traits::{ use hermes_core::relayer_components::chain::types::payloads::channel::{ ChannelOpenAckPayload, ChannelOpenConfirmPayload, ChannelOpenTryPayload, }; +use hermes_prelude::*; use ibc::core::channel::types::channel::{ChannelEnd, State}; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/channel/init_channel_options.rs b/crates/cosmos/cosmos-chain-components/src/impls/channel/init_channel_options.rs index 50c619f31d..33853004b7 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/channel/init_channel_options.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/channel/init_channel_options.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ InitChannelOptionsTypeComponent, ProvideInitChannelOptionsType, }; +use hermes_prelude::*; use crate::types::CosmosInitChannelOptions; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/client/create_client_message.rs b/crates/cosmos/cosmos-chain-components/src/impls/client/create_client_message.rs index c2298d9072..0ca4d22de2 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/client/create_client_message.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/client/create_client_message.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::encoding_components::traits::{CanConvert, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; use hermes_core::relayer_components::chain::traits::{ @@ -8,6 +7,7 @@ use hermes_core::relayer_components::chain::traits::{ HasConsensusStateType, HasCreateClientMessageOptionsType, HasCreateClientPayloadType, HasMessageType, }; +use hermes_prelude::*; use prost_types::Any; use crate::traits::{CosmosMessage, ToCosmosMessage}; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/client/create_client_payload.rs b/crates/cosmos/cosmos-chain-components/src/impls/client/create_client_payload.rs index a0c05832ff..19d61728f8 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/client/create_client_payload.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/client/create_client_payload.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_comet_light_client_components::traits::CanFetchLightBlock; use hermes_comet_light_client_context::contexts::light_client::CometLightClient; use hermes_core::chain_type_components::traits::HasChainId; @@ -8,6 +7,7 @@ use hermes_core::relayer_components::chain::traits::{ HasCreateClientPayloadType, }; use hermes_error::types::HermesError; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc::core::commitment_types::commitment::CommitmentRoot; use ibc::core::commitment_types::specs::ProofSpecs; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/client/update_client_message.rs b/crates/cosmos/cosmos-chain-components/src/impls/client/update_client_message.rs index a094a0542b..f46a59a014 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/client/update_client_message.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/client/update_client_message.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ HasIbcChainTypes, HasUpdateClientPayloadType, UpdateClientMessageBuilder, UpdateClientMessageBuilderComponent, }; +use hermes_prelude::*; use ibc::core::host::types::identifiers::ClientId; use ibc_proto::google::protobuf::Any as IbcProtoAny; use prost_types::Any; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/client/update_client_payload.rs b/crates/cosmos/cosmos-chain-components/src/impls/client/update_client_payload.rs index e76ba33817..9177214a06 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/client/update_client_payload.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/client/update_client_payload.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_comet_light_client_components::traits::CanBuildLightBlocksForUpdateClient; use hermes_comet_light_client_context::contexts::light_client::CometLightClient; use hermes_core::chain_type_components::traits::HasHeightType; @@ -7,6 +6,7 @@ use hermes_core::relayer_components::chain::traits::{ UpdateClientPayloadBuilder, UpdateClientPayloadBuilderComponent, }; use hermes_error::types::HermesError; +use hermes_prelude::*; use ibc::clients::tendermint::types::error::TendermintClientError; use ibc::clients::tendermint::types::Header; use ibc::core::client::types::error::ClientError; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/commitment_prefix.rs b/crates/cosmos/cosmos-chain-components/src/impls/commitment_prefix.rs index bfd6b19b75..bccb256571 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/commitment_prefix.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/commitment_prefix.rs @@ -1,10 +1,10 @@ use alloc::vec::Vec; use std::sync::OnceLock; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ HasCommitmentPrefixType, IbcCommitmentPrefixGetter, IbcCommitmentPrefixGetterComponent, }; +use hermes_prelude::*; pub struct ProvideIbcCommitmentPrefix; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/connection/connection_handshake_message.rs b/crates/cosmos/cosmos-chain-components/src/impls/connection/connection_handshake_message.rs index c85a147aa2..d364b3d960 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/connection/connection_handshake_message.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/connection/connection_handshake_message.rs @@ -1,6 +1,5 @@ use core::fmt::Display; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasMessageType; use hermes_core::encoding_components::traits::{CanConvert, HasEncoding}; use hermes_core::encoding_components::types::AsBytes; @@ -18,6 +17,7 @@ use hermes_core::relayer_components::chain::types::payloads::connection::{ ConnectionOpenAckPayload, ConnectionOpenConfirmPayload, ConnectionOpenInitPayload, ConnectionOpenTryPayload, }; +use hermes_prelude::*; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; use ibc::core::connection::types::ConnectionEnd; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/connection/init_connection_options.rs b/crates/cosmos/cosmos-chain-components/src/impls/connection/init_connection_options.rs index f20bc92a9f..23e7e84a2a 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/connection/init_connection_options.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/connection/init_connection_options.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ InitConnectionOptionsTypeComponent, ProvideInitConnectionOptionsType, }; +use hermes_prelude::*; use crate::types::CosmosInitConnectionOptions; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/events.rs b/crates/cosmos/cosmos-chain-components/src/impls/events.rs index f5b214ef6a..6b108964b6 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/events.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/events.rs @@ -1,7 +1,6 @@ use alloc::sync::Arc; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasMessageResponseType; use hermes_core::relayer_components::chain::traits::{ ChannelOpenInitEventComponent, ChannelOpenTryEventComponent, ConnectionOpenInitEventComponent, @@ -14,6 +13,7 @@ use hermes_core::relayer_components::chain::traits::{ ProvideConnectionOpenTryEvent, ProvideCreateClientEvent, ProvideSendPacketEvent, ProvideWriteAckEvent, SendPacketEventComponent, WriteAckEventComponent, }; +use hermes_prelude::*; use ibc::core::channel::types::packet::Packet; use ibc::core::client::types::events::CLIENT_ID_ATTRIBUTE_KEY; use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId}; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/message_height.rs b/crates/cosmos/cosmos-chain-components/src/impls/message_height.rs index f474d45fd4..dc035244fe 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/message_height.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/message_height.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ CounterpartyMessageHeightGetter, CounterpartyMessageHeightGetterComponent, HasHeightType, HasMessageType, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use crate::traits::CosmosMessage; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/packet/packet_fields.rs b/crates/cosmos/cosmos-chain-components/src/impls/packet/packet_fields.rs index de5900892d..b883baefb2 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/packet/packet_fields.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/packet/packet_fields.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasHeightType, HasTimeoutType}; use hermes_core::relayer_components::chain::traits::{ HasChannelIdType, HasOutgoingPacketType, HasPortIdType, HasSequenceType, @@ -8,6 +7,7 @@ use hermes_core::relayer_components::chain::traits::{ PacketSrcPortIdGetterComponent, PacketTimeoutHeightGetter, PacketTimeoutHeightGetterComponent, PacketTimeoutTimestampGetter, PacketTimeoutTimestampGetterComponent, }; +use hermes_prelude::*; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; use ibc::core::client::types::Height; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/packet/packet_message.rs b/crates/cosmos/cosmos-chain-components/src/impls/packet/packet_message.rs index 5ef192851d..c335d13772 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/packet/packet_message.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/packet/packet_message.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ AckPacketMessageBuilder, AckPacketMessageBuilderComponent, HasAckPacketPayloadType, HasAcknowledgementType, HasCommitmentProofBytes, HasHeightFields, HasMessageType, @@ -9,6 +8,7 @@ use hermes_core::relayer_components::chain::traits::{ use hermes_core::relayer_components::chain::types::payloads::packet::{ AckPacketPayload, ReceivePacketPayload, TimeoutUnorderedPacketPayload, }; +use hermes_prelude::*; use ibc::core::channel::types::packet::Packet; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/abci.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/abci.rs index ca5a72b6ab..0aba06f628 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/abci.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/abci.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use hermes_core::encoding_components::types::AsBytes; use hermes_core::relayer_components::chain::traits::{HasCommitmentProofType, HasHeightType}; use hermes_core::relayer_components::error::traits::{CanPerformRetry, HasMaxErrorRetry}; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use ibc::core::client::types::Height; use ibc::core::commitment_types::merkle::MerkleProof; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/block.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/block.rs index 72166a431f..9b25621bda 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/block.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/block.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use tendermint::block::{Block, Height as BlockHeight, Id as BlockId}; use tendermint::Error as TendermintError; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/block_events.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/block_events.rs index e1056c1a74..f05b6202d6 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/block_events.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/block_events.rs @@ -1,10 +1,10 @@ use std::sync::Arc; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasEventType, HasHeightType}; use hermes_core::relayer_components::chain::traits::{ BlockEventsQuerier, BlockEventsQuerierComponent, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use tendermint::abci::Code; use tendermint::block::Height as TmHeight; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/chain_id.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/chain_id.rs index b569be3299..c9d0fdbd91 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/chain_id.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/chain_id.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ CanQueryChainHeight, CanQueryClientState, CounterpartyChainIdQuerier, CounterpartyChainIdQuerierComponent, HasChainIdType, HasClientStateFields, HasIbcChainTypes, }; +use hermes_prelude::*; use ibc::core::channel::types::channel::{ChannelEnd, State}; use ibc::core::channel::types::error::ChannelError; use ibc::core::connection::types::ConnectionEnd; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/chain_status.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/chain_status.rs index 6c28ef81a1..8d32b93bf9 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/chain_status.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/chain_status.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ ChainStatusQuerier, ChainStatusQuerierComponent, HasChainStatusType, }; +use hermes_prelude::*; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; use ibc::core::host::types::error::IdentifierError; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/channel_end.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/channel_end.rs index 8889c59422..412e5e7478 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/channel_end.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/channel_end.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ ChannelEndQuerier, ChannelEndQuerierComponent, ChannelEndWithProofsQuerier, ChannelEndWithProofsQuerierComponent, HasChannelEndType, HasCommitmentProofType, HasIbcChainTypes, }; +use hermes_prelude::*; use ibc::core::channel::types::channel::ChannelEnd; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::{ChannelId, PortId}; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/client_state.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/client_state.rs index 94e0f43c42..e20bf11bf9 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/client_state.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/client_state.rs @@ -1,12 +1,12 @@ use core::iter::Iterator; use core::str::FromStr; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ AllRawClientStatesQuerier, AllRawClientStatesQuerierComponent, HasIbcChainTypes, HasRawClientStateType, RawClientStateQuerier, RawClientStateQuerierComponent, RawClientStateWithProofsQuerier, RawClientStateWithProofsQuerierComponent, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc::core::host::types::error::IdentifierError; use ibc::core::host::types::identifiers::ClientId; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/connection_end.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/connection_end.rs index fa0b03c38b..ae63c62625 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/connection_end.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/connection_end.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ ConnectionEndQuerier, ConnectionEndQuerierComponent, ConnectionEndWithProofsQuerier, ConnectionEndWithProofsQuerierComponent, HasCommitmentProofType, HasConnectionEndType, HasIbcChainTypes, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc::core::connection::types::ConnectionEnd; use ibc::core::host::types::identifiers::ConnectionId; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/consensus_state.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/consensus_state.rs index 0caaeb9603..d273142b52 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/consensus_state.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/consensus_state.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ HasCommitmentProofType, HasHeightFields, HasIbcChainTypes, HasRawConsensusStateType, RawConsensusStateQuerier, RawConsensusStateQuerierComponent, RawConsensusStateWithProofsQuerier, RawConsensusStateWithProofsQuerierComponent, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::ClientId; use ibc::cosmos_host::IBC_QUERY_PATH; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/consensus_state_height.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/consensus_state_height.rs index 9c3bccd986..7ebf3bdc95 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/consensus_state_height.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/consensus_state_height.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ ConsensusStateHeightsQuerier, ConsensusStateHeightsQuerierComponent, HasHeightType, HasIbcChainTypes, }; +use hermes_prelude::*; use http::uri::InvalidUri; use http::Uri; use ibc::core::client::types::Height; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/counterparty_connection_id.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/counterparty_connection_id.rs index 5e7ddb2dd2..f6b1c1c803 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/counterparty_connection_id.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/counterparty_connection_id.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ CanQueryChainHeight, CanQueryConnectionEnd, CounterpartyConnectionIdQuerier, CounterpartyConnectionIdQuerierComponent, HasChannelEndType, HasConnectionIdType, }; +use hermes_prelude::*; use ibc::core::channel::types::channel::ChannelEnd; use ibc::core::connection::types::ConnectionEnd; use ibc::core::host::types::identifiers::ConnectionId; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/dispatch.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/dispatch.rs index feb88b92a6..010b607546 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/dispatch.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/dispatch.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::impls::{OsmosisQueryEip, QueryEipFromFeeMarket}; use crate::traits::{EipQuerier, EipQuerierComponent}; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/feemarket.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/feemarket.rs index 10b252f222..b2dc53395c 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/feemarket.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/feemarket.rs @@ -1,6 +1,6 @@ use core::str::FromStr; -use cgp::prelude::*; +use hermes_prelude::*; use prost::DecodeError; use subtle_encoding::base64; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/osmosis.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/osmosis.rs index 92e36b490d..0c30801402 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/osmosis.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/eip/osmosis.rs @@ -1,6 +1,6 @@ use core::str::FromStr; -use cgp::prelude::*; +use hermes_prelude::*; use ibc_proto::cosmos::base::v1beta1::DecProto; use prost::DecodeError; use subtle_encoding::base64; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_acknowledgement.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_acknowledgement.rs index 210c89aa85..4740dbc59e 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_acknowledgement.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_acknowledgement.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ HasAckCommitmentHashType, HasCommitmentProofType, HasIbcChainTypes, PacketAckCommitmentQuerier, PacketAckCommitmentQuerierComponent, }; +use hermes_prelude::*; use ibc::cosmos_host::IBC_QUERY_PATH; use crate::traits::CanQueryAbci; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_commitment.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_commitment.rs index 66bb229f43..a49c07e544 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_commitment.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_commitment.rs @@ -1,10 +1,10 @@ use core::fmt::Display; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ HasCommitmentProofType, HasIbcChainTypes, HasPacketCommitmentType, PacketCommitmentQuerier, PacketCommitmentQuerierComponent, }; +use hermes_prelude::*; use ibc::cosmos_host::IBC_QUERY_PATH; use crate::traits::CanQueryAbci; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_receipt.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_receipt.rs index fba1f8e797..6d7c7eca98 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_receipt.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/packet_receipt.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ HasCommitmentProofType, HasIbcChainTypes, HasPacketReceiptType, PacketReceiptQuerier, PacketReceiptQuerierComponent, }; +use hermes_prelude::*; use ibc::cosmos_host::IBC_QUERY_PATH; use crate::traits::CanQueryAbci; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/queries/received_packet.rs b/crates/cosmos/cosmos-chain-components/src/impls/queries/received_packet.rs index 1c07915bed..c8e2e1a5b4 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/queries/received_packet.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/queries/received_packet.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ HasIbcChainTypes, PacketIsReceivedQuerier, PacketIsReceivedQuerierComponent, }; +use hermes_prelude::*; use http::uri::InvalidUri; use http::Uri; use ibc::core::host::types::identifiers::{ChannelId, PortId, Sequence}; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/relay/packet_filter.rs b/crates/cosmos/cosmos-chain-components/src/impls/relay/packet_filter.rs index f15ad7b36d..f931aaeb3c 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/relay/packet_filter.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/relay/packet_filter.rs @@ -1,11 +1,11 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ HasChannelIdType, HasPacketDstChannelId, HasPacketDstPortId, HasPacketSrcChannelId, HasPacketSrcPortId, HasPortIdType, IncomingPacketFilter, IncomingPacketFilterComponent, OutgoingPacketFilter, OutgoingPacketFilterComponent, }; +use hermes_prelude::*; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use crate::types::PacketFilterConfig; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/transaction/convert_gas_to_fee.rs b/crates/cosmos/cosmos-chain-components/src/impls/transaction/convert_gas_to_fee.rs index e2868164e8..f736f6dfc1 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/transaction/convert_gas_to_fee.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/transaction/convert_gas_to_fee.rs @@ -1,7 +1,7 @@ use core::cmp::min; -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::HasFeeType; +use hermes_prelude::*; use ibc_proto::cosmos::base::v1beta1::Coin; use ibc_proto::cosmos::tx::v1beta1::Fee; use num_bigint::BigInt; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/transaction/encode_tx.rs b/crates/cosmos/cosmos-chain-components/src/impls/transaction/encode_tx.rs index 03b11ffdde..d83ff47f0a 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/transaction/encode_tx.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/transaction/encode_tx.rs @@ -1,10 +1,10 @@ #![allow(clippy::ptr_arg)] -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{HasChainId, HasMessageType}; use hermes_core::relayer_components::transaction::traits::{ HasFeeType, HasNonceType, HasSignerType, HasTransactionType, TxEncoder, TxEncoderComponent, }; +use hermes_prelude::*; use ibc::core::host::types::identifiers::ChainId; use ibc::primitives::Signer; use ibc_proto::cosmos::tx::v1beta1::mode_info::{Single, Sum}; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/transaction/estimate_fee.rs b/crates/cosmos/cosmos-chain-components/src/impls/transaction/estimate_fee.rs index e4e1f7e672..517a0f3443 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/transaction/estimate_fee.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/transaction/estimate_fee.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainId; use hermes_core::relayer_components::transaction::traits::{ HasFeeType, HasTransactionType, TxFeeEstimator, TxFeeEstimatorComponent, }; +use hermes_prelude::*; use http::uri::InvalidUri; use ibc::core::host::types::identifiers::ChainId; use ibc_proto::cosmos::tx::v1beta1::service_client::ServiceClient; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/transaction/event.rs b/crates/cosmos/cosmos-chain-components/src/impls/transaction/event.rs index ffa077e09a..77aa3bdcc6 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/transaction/event.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/transaction/event.rs @@ -1,10 +1,10 @@ use alloc::sync::Arc; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasMessageResponseType; use hermes_core::relayer_components::transaction::traits::{ HasTxResponseType, TxMessageResponseParser, TxMessageResponseParserComponent, }; +use hermes_prelude::*; use tendermint::abci::Event as AbciEvent; use tendermint_rpc::endpoint::tx::Response as TxResponse; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/transaction/poll_timeout.rs b/crates/cosmos/cosmos-chain-components/src/impls/transaction/poll_timeout.rs index e88484781b..b261842e8f 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/transaction/poll_timeout.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/transaction/poll_timeout.rs @@ -1,9 +1,9 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::relayer_components::transaction::impls::{ PollTimeoutGetter, PollTimeoutGetterComponent, }; +use hermes_prelude::*; pub struct FixedPollTimeoutSecs; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/transaction/query_nonce.rs b/crates/cosmos/cosmos-chain-components/src/impls/transaction/query_nonce.rs index d16dde09f4..b95c93fcf6 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/transaction/query_nonce.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/transaction/query_nonce.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::{ HasNonceType, HasSignerType, NonceQuerier, NonceQuerierComponent, }; +use hermes_prelude::*; use http::uri::InvalidUri; use prost::DecodeError; use tonic::transport::Error as TransportError; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/transaction/query_tx_response.rs b/crates/cosmos/cosmos-chain-components/src/impls/transaction/query_tx_response.rs index ddfffcce73..e4c50c3b44 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/transaction/query_tx_response.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/transaction/query_tx_response.rs @@ -1,5 +1,4 @@ use cgp::extra::runtime::HasRuntime; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ CanQueryChainHeight, HasHeightFields, HasPollInterval, }; @@ -7,6 +6,7 @@ use hermes_core::relayer_components::transaction::traits::{ HasTxHashType, HasTxResponseType, TxResponseQuerier, TxResponseQuerierComponent, }; use hermes_core::runtime_components::traits::CanSleep; +use hermes_prelude::*; use tendermint::Hash as TxHash; use tendermint_rpc::endpoint::tx::Response as TxResponse; use tendermint_rpc::query::Query; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/transaction/submit_tx.rs b/crates/cosmos/cosmos-chain-components/src/impls/transaction/submit_tx.rs index cf710d3bf1..1bbb237d05 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/transaction/submit_tx.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/transaction/submit_tx.rs @@ -1,9 +1,9 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::{ HasTransactionType, HasTxHashType, TxSubmitter, TxSubmitterComponent, }; +use hermes_prelude::*; use ibc_proto::cosmos::tx::v1beta1::TxRaw; use prost::Message; use tendermint::Hash as TxHash; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/types/chain.rs b/crates/cosmos/cosmos-chain-components/src/impls/types/chain.rs index f44bcc92d8..9dabaf3046 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/types/chain.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/types/chain.rs @@ -2,7 +2,6 @@ use alloc::sync::Arc; use core::time::Duration; use cgp::core::error::CanRaiseAsyncError; -use cgp::prelude::*; use hermes_core::chain_type_components::impls::UseEventsMessageResponse; use hermes_core::chain_type_components::traits::{ ChainIdTypeProviderComponent, EventTypeProviderComponent, HeightAdjuster, @@ -29,6 +28,7 @@ use hermes_core::relayer_components::chain::traits::{ ProvidePortIdType, ProvideSequenceType, ProvideTimeType, ProvideTimeoutType, SequenceTypeComponent, TimeMeasurer, TimeMeasurerComponent, }; +use hermes_prelude::*; use ibc::core::channel::types::channel::ChannelEnd; use ibc::core::channel::types::packet::Packet; use ibc::core::client::types::error::ClientError; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/types/client_state.rs b/crates/cosmos/cosmos-chain-components/src/impls/types/client_state.rs index 8acf9d5cb2..42b1f32bcf 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/types/client_state.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/types/client_state.rs @@ -1,11 +1,11 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ ClientStateFieldsComponent, ClientStateFieldsGetter, ClientStateTypeComponent, HasChainIdType, HasClientStateType, HasHeightType, ProvideClientStateType, ProvideRawClientStateType, RawClientStateTypeComponent, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::ChainId; use prost_types::Any; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/types/consensus_state.rs b/crates/cosmos/cosmos-chain-components/src/impls/types/consensus_state.rs index 9a3d634853..069417dd44 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/types/consensus_state.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/types/consensus_state.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ ConsensusStateFieldComponent, ConsensusStateFieldGetter, ConsensusStateTypeComponent, HasConsensusStateType, HasTimeType, ProvideConsensusStateType, ProvideRawConsensusStateType, RawConsensusStateTypeComponent, }; +use hermes_prelude::*; use prost_types::Any; use tendermint::Time; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/types/create_client_options.rs b/crates/cosmos/cosmos-chain-components/src/impls/types/create_client_options.rs index 4cb8b07d69..5b57b1470d 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/types/create_client_options.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/types/create_client_options.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ CreateClientMessageOptionsTypeComponent, CreateClientPayloadOptionsTypeComponent, ProvideCreateClientMessageOptionsType, ProvideCreateClientPayloadOptionsType, }; +use hermes_prelude::*; use crate::types::CosmosCreateClientOptions; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/types/payload.rs b/crates/cosmos/cosmos-chain-components/src/impls/types/payload.rs index da305052f2..9b2c69d65a 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/types/payload.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/types/payload.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::impls::{ ProvideChannelPayloadTypes, ProvideConnectionPayloadTypes, ProvidePacketPayloadTypes, }; @@ -11,6 +10,7 @@ use hermes_core::relayer_components::chain::traits::{ ProvideUpdateClientPayloadType, ReceivePacketPayloadTypeComponent, TimeoutUnorderedPacketPayloadTypeComponent, UpdateClientPayloadTypeComponent, }; +use hermes_prelude::*; use crate::types::{CosmosCreateClientPayload, CosmosUpdateClientPayload}; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/types/proof.rs b/crates/cosmos/cosmos-chain-components/src/impls/types/proof.rs index 75e41252bd..92d75bed06 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/types/proof.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/types/proof.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::CommitmentProofTypeProviderComponent; use hermes_core::relayer_components::chain::traits::CommitmentProofTypeProvider; +use hermes_prelude::*; use ibc::core::commitment_types::merkle::MerkleProof; pub struct ProvideMerkleProofType; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/types/transaction.rs b/crates/cosmos/cosmos-chain-components/src/impls/types/transaction.rs index 97e79c909c..deb6a4c30d 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/types/transaction.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/types/transaction.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::{ FeeTypeProviderComponent, NonceTypeProviderComponent, ProvideTransactionType, SignerTypeProviderComponent, TransactionTypeComponent, TxHashTypeProviderComponent, TxResponseTypeProviderComponent, }; +use hermes_prelude::*; use ibc_proto::cosmos::tx::v1beta1::{Fee, TxRaw}; use prost::Message as _; use tendermint::hash::Hash; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/unbonding_period.rs b/crates/cosmos/cosmos-chain-components/src/impls/unbonding_period.rs index daefacbf2e..980d164805 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/unbonding_period.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/unbonding_period.rs @@ -1,7 +1,7 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{CanQueryChainHeight, HasHeightType}; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc_proto::cosmos::staking::v1beta1::QueryParamsResponse; use prost::{DecodeError, Message}; diff --git a/crates/cosmos/cosmos-chain-components/src/traits/abci_query.rs b/crates/cosmos/cosmos-chain-components/src/traits/abci_query.rs index d74600645d..ae6e50f41d 100644 --- a/crates/cosmos/cosmos-chain-components/src/traits/abci_query.rs +++ b/crates/cosmos/cosmos-chain-components/src/traits/abci_query.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{HasCommitmentProofType, HasHeightType}; +use hermes_prelude::*; #[cgp_component { provider: AbciQuerier, diff --git a/crates/cosmos/cosmos-chain-components/src/traits/convert_gas_to_fee.rs b/crates/cosmos/cosmos-chain-components/src/traits/convert_gas_to_fee.rs index 8b8b09f2b9..40d4660ea4 100644 --- a/crates/cosmos/cosmos-chain-components/src/traits/convert_gas_to_fee.rs +++ b/crates/cosmos/cosmos-chain-components/src/traits/convert_gas_to_fee.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::HasFeeType; +use hermes_prelude::*; #[cgp_component { provider: GasToFeeConverter, diff --git a/crates/cosmos/cosmos-chain-components/src/traits/eip/eip_query.rs b/crates/cosmos/cosmos-chain-components/src/traits/eip/eip_query.rs index db54f151c8..7fe701e7cc 100644 --- a/crates/cosmos/cosmos-chain-components/src/traits/eip/eip_query.rs +++ b/crates/cosmos/cosmos-chain-components/src/traits/eip/eip_query.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::types::DynamicGasConfig; diff --git a/crates/cosmos/cosmos-chain-components/src/traits/gas_config.rs b/crates/cosmos/cosmos-chain-components/src/traits/gas_config.rs index 14c0f97ae2..21d06ecc87 100644 --- a/crates/cosmos/cosmos-chain-components/src/traits/gas_config.rs +++ b/crates/cosmos/cosmos-chain-components/src/traits/gas_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::types::GasConfig; diff --git a/crates/cosmos/cosmos-chain-components/src/traits/grpc_address.rs b/crates/cosmos/cosmos-chain-components/src/traits/grpc_address.rs index 1c0757414e..5bf982b8e3 100644 --- a/crates/cosmos/cosmos-chain-components/src/traits/grpc_address.rs +++ b/crates/cosmos/cosmos-chain-components/src/traits/grpc_address.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use tendermint_rpc::Url; use tonic::client::Grpc; use tonic::transport::Endpoint; diff --git a/crates/cosmos/cosmos-chain-components/src/traits/rpc_client.rs b/crates/cosmos/cosmos-chain-components/src/traits/rpc_client.rs index fa0b417a0d..c244d856d5 100644 --- a/crates/cosmos/cosmos-chain-components/src/traits/rpc_client.rs +++ b/crates/cosmos/cosmos-chain-components/src/traits/rpc_client.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use tendermint_rpc::{HttpClient, Url}; #[cgp_component { diff --git a/crates/cosmos/cosmos-chain-components/src/traits/tx_extension_options.rs b/crates/cosmos/cosmos-chain-components/src/traits/tx_extension_options.rs index 09f265efc0..fe469b1352 100644 --- a/crates/cosmos/cosmos-chain-components/src/traits/tx_extension_options.rs +++ b/crates/cosmos/cosmos-chain-components/src/traits/tx_extension_options.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use ibc_proto::google::protobuf::Any; #[cgp_component { diff --git a/crates/cosmos/cosmos-chain-components/src/traits/unbonding_period.rs b/crates/cosmos/cosmos-chain-components/src/traits/unbonding_period.rs index a58fe0f8fb..c269d395f7 100644 --- a/crates/cosmos/cosmos-chain-components/src/traits/unbonding_period.rs +++ b/crates/cosmos/cosmos-chain-components/src/traits/unbonding_period.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: UnbondingPeriodQuerier, diff --git a/crates/cosmos/cosmos-chain-components/src/types/commitment_proof.rs b/crates/cosmos/cosmos-chain-components/src/types/commitment_proof.rs index 79831435fa..b97183d39d 100644 --- a/crates/cosmos/cosmos-chain-components/src/types/commitment_proof.rs +++ b/crates/cosmos/cosmos-chain-components/src/types/commitment_proof.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::CommitmentProofTypeProviderComponent; use hermes_core::relayer_components::chain::traits::{ CommitmentProofBytesGetter, CommitmentProofBytesGetterComponent, CommitmentProofHeightGetter, CommitmentProofHeightGetterComponent, HasCommitmentProofType, HasHeightType, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc::core::commitment_types::merkle::MerkleProof; diff --git a/crates/cosmos/cosmos-chain-components/src/types/payloads/client.rs b/crates/cosmos/cosmos-chain-components/src/types/payloads/client.rs index 739f493871..159781d300 100644 --- a/crates/cosmos/cosmos-chain-components/src/types/payloads/client.rs +++ b/crates/cosmos/cosmos-chain-components/src/types/payloads/client.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; use ibc_client_tendermint::types::proto::v1::Fraction; use crate::types::{TendermintClientState, TendermintConsensusState, TendermintHeader}; diff --git a/crates/cosmos/cosmos-chain-components/src/types/transaction/account.rs b/crates/cosmos/cosmos-chain-components/src/types/transaction/account.rs index 68fd6c0d6e..13ae7d165f 100644 --- a/crates/cosmos/cosmos-chain-components/src/types/transaction/account.rs +++ b/crates/cosmos/cosmos-chain-components/src/types/transaction/account.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use http::uri::InvalidUri; use http::Uri; use ibc_proto::cosmos::auth::v1beta1::query_client::QueryClient; diff --git a/crates/cosmos/cosmos-chain-preset/Cargo.toml b/crates/cosmos/cosmos-chain-preset/Cargo.toml index f4cd2e80f0..ba53ab1bc3 100644 --- a/crates/cosmos/cosmos-chain-preset/Cargo.toml +++ b/crates/cosmos/cosmos-chain-preset/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-cosmos-chain-components = { workspace = true } hermes-cosmos-test-components = { workspace = true } diff --git a/crates/cosmos/cosmos-chain-preset/src/presets/chain.rs b/crates/cosmos/cosmos-chain-preset/src/presets/chain.rs index 27c69e7d7b..7b5ff6ec0c 100644 --- a/crates/cosmos/cosmos-chain-preset/src/presets/chain.rs +++ b/crates/cosmos/cosmos-chain-preset/src/presets/chain.rs @@ -1,7 +1,6 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::UseDelegate; - use cgp::prelude::*; use hermes_core::chain_type_components::traits::{ AddressTypeProviderComponent, AmountDenomGetterComponent, AmountTypeProviderComponent, DenomTypeComponent, HeightAdjusterComponent, HeightIncrementerComponent, @@ -126,6 +125,7 @@ mod preset { ProvideCosmosProposalTypes, ProvideCosmosTestWallet, ProvideIbcDenom, QueryCosmosBalance, QueryProposalStatusWithGrpc, UseCosmosAmount, }; + use hermes_prelude::*; use crate::delegate::DelegateCosmosChainComponents; diff --git a/crates/cosmos/cosmos-chain-preset/src/presets/cosmos_to_cosmos.rs b/crates/cosmos/cosmos-chain-preset/src/presets/cosmos_to_cosmos.rs index c4832345ac..561a16247a 100644 --- a/crates/cosmos/cosmos-chain-preset/src/presets/cosmos_to_cosmos.rs +++ b/crates/cosmos/cosmos-chain-preset/src/presets/cosmos_to_cosmos.rs @@ -1,6 +1,5 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; use hermes_core::relayer_components::chain::impls::{ QueryAndConvertRawClientState, QueryAndConvertRawConsensusState, }; @@ -36,6 +35,7 @@ mod preset { QueryConsensusStateHeightsFromGrpc, }; use hermes_cosmos_test_components::chain::impls::ConvertCosmosIbcAmount; + use hermes_prelude::*; cgp_preset! { CosmosToCosmosComponents { diff --git a/crates/cosmos/cosmos-encoding-components/Cargo.toml b/crates/cosmos/cosmos-encoding-components/Cargo.toml index de35ae762d..6a50d8b34d 100644 --- a/crates/cosmos/cosmos-encoding-components/Cargo.toml +++ b/crates/cosmos/cosmos-encoding-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-protobuf-encoding-components = { workspace = true } diff --git a/crates/cosmos/cosmos-encoding-components/src/components.rs b/crates/cosmos/cosmos-encoding-components/src/components.rs index 3d8edcf02f..288b27d985 100644 --- a/crates/cosmos/cosmos-encoding-components/src/components.rs +++ b/crates/cosmos/cosmos-encoding-components/src/components.rs @@ -1,12 +1,12 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::UseDelegate; - use cgp::prelude::*; use hermes_core::encoding_components::traits::{ DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent, EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, SchemaTypeComponent, }; + use hermes_prelude::*; use hermes_protobuf_encoding_components::components::ProtobufEncodingComponents; use hermes_protobuf_encoding_components::traits::EncodedLengthGetterComponent; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; diff --git a/crates/cosmos/cosmos-encoding-components/src/impls/any.rs b/crates/cosmos/cosmos-encoding-components/src/impls/any.rs index 376be346d8..10e57bb4e3 100644 --- a/crates/cosmos/cosmos-encoding-components/src/impls/any.rs +++ b/crates/cosmos/cosmos-encoding-components/src/impls/any.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{Converter, ConverterComponent}; +use hermes_prelude::*; use ibc::primitives::proto::Any as IbcAny; use prost_types::Any as ProstAny; diff --git a/crates/cosmos/cosmos-encoding-components/src/impls/chain_id.rs b/crates/cosmos/cosmos-encoding-components/src/impls/chain_id.rs index e3e236e243..8ae4cf99c3 100644 --- a/crates/cosmos/cosmos-encoding-components/src/impls/chain_id.rs +++ b/crates/cosmos/cosmos-encoding-components/src/impls/chain_id.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::string::EncodeStringField; use ibc::core::host::types::error::IdentifierError; use ibc::core::host::types::identifiers::ChainId; diff --git a/crates/cosmos/cosmos-encoding-components/src/impls/commitment_root.rs b/crates/cosmos/cosmos-encoding-components/src/impls/commitment_root.rs index ff802a2e7a..d8043548b7 100644 --- a/crates/cosmos/cosmos-encoding-components/src/impls/commitment_root.rs +++ b/crates/cosmos/cosmos-encoding-components/src/impls/commitment_root.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::encoding_components::impls::DecodeFrom; use hermes_core::encoding_components::traits::{ HasEncodeBufferType, MutDecoderComponent, MutEncoder, MutEncoderComponent, Transformer, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::bytes::EncodeByteField; use ibc::core::commitment_types::commitment::CommitmentRoot; diff --git a/crates/cosmos/cosmos-encoding-components/src/impls/height.rs b/crates/cosmos/cosmos-encoding-components/src/impls/height.rs index 856ce09913..6bcc8c60f2 100644 --- a/crates/cosmos/cosmos-encoding-components/src/impls/height.rs +++ b/crates/cosmos/cosmos-encoding-components/src/impls/height.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::encoding_components::impls::EncoderPair; use hermes_core::encoding_components::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::u64::EncodeU64ProtoField; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; diff --git a/crates/cosmos/cosmos-encoding-components/src/impls/timestamp.rs b/crates/cosmos/cosmos-encoding-components/src/impls/timestamp.rs index b2f8de5418..0af57b14af 100644 --- a/crates/cosmos/cosmos-encoding-components/src/impls/timestamp.rs +++ b/crates/cosmos/cosmos-encoding-components/src/impls/timestamp.rs @@ -1,11 +1,11 @@ use core::num::TryFromIntError; -use cgp::prelude::*; use hermes_core::encoding_components::impls::EncoderPair; use hermes_core::encoding_components::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::u64::EncodeU64ProtoField; use ibc::core::primitives::{Timestamp, TimestampError}; use ibc_proto::google::protobuf::Timestamp as ProtoTimestamp; diff --git a/crates/cosmos/cosmos-integration-tests/Cargo.toml b/crates/cosmos/cosmos-integration-tests/Cargo.toml index cdc82e7a10..ea958904ec 100644 --- a/crates/cosmos/cosmos-integration-tests/Cargo.toml +++ b/crates/cosmos/cosmos-integration-tests/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } hermes-core = { workspace = true } diff --git a/crates/cosmos/cosmos-integration-tests/src/contexts/binary_channel/setup.rs b/crates/cosmos/cosmos-integration-tests/src/contexts/binary_channel/setup.rs index ab66087191..602c5da642 100644 --- a/crates/cosmos/cosmos-integration-tests/src/contexts/binary_channel/setup.rs +++ b/crates/cosmos/cosmos-integration-tests/src/contexts/binary_channel/setup.rs @@ -1,6 +1,5 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::{Index, UseField, WithField}; -use cgp::prelude::*; use hermes_core::relayer_components::multi::traits::birelay_at::BiRelayTypeProviderAtComponent; use hermes_core::relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; @@ -21,6 +20,7 @@ use hermes_cosmos_chain_components::types::{ use hermes_cosmos_relayer::contexts::{CosmosBiRelay, CosmosBuilder, CosmosChain, CosmosRelay}; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; +use hermes_prelude::*; use ibc::core::host::types::identifiers::PortId; use crate::contexts::{CosmosBinaryChannelTestDriver, CosmosChainDriver}; diff --git a/crates/cosmos/cosmos-integration-tests/src/contexts/binary_channel/test_driver.rs b/crates/cosmos/cosmos-integration-tests/src/contexts/binary_channel/test_driver.rs index 97f2e9dedc..f20fe13a27 100644 --- a/crates/cosmos/cosmos-integration-tests/src/contexts/binary_channel/test_driver.rs +++ b/crates/cosmos/cosmos-integration-tests/src/contexts/binary_channel/test_driver.rs @@ -1,6 +1,5 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::relayer_components::multi::traits::birelay_at::BiRelayTypeProviderAtComponent; use hermes_core::relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; @@ -13,6 +12,7 @@ use hermes_core::test_components::setup::traits::PortIdGetterAtComponent; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_ibc_test_suite::traits::CanUseBinaryTestDriverMethods; +use hermes_prelude::*; use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId}; diff --git a/crates/cosmos/cosmos-integration-tests/src/contexts/bootstrap.rs b/crates/cosmos/cosmos-integration-tests/src/contexts/bootstrap.rs index 8b5c7639fd..e603d1a083 100644 --- a/crates/cosmos/cosmos-integration-tests/src/contexts/bootstrap.rs +++ b/crates/cosmos/cosmos-integration-tests/src/contexts/bootstrap.rs @@ -3,7 +3,6 @@ use core::ops::Deref; use std::path::PathBuf; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, @@ -27,6 +26,7 @@ use hermes_cosmos_test_components::bootstrap::traits::{ use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::types::Error; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_tracing_logging_components::contexts::TracingLogger; diff --git a/crates/cosmos/cosmos-integration-tests/src/contexts/bootstrap_legacy.rs b/crates/cosmos/cosmos-integration-tests/src/contexts/bootstrap_legacy.rs index b6baecfa7b..c5940934fd 100644 --- a/crates/cosmos/cosmos-integration-tests/src/contexts/bootstrap_legacy.rs +++ b/crates/cosmos/cosmos-integration-tests/src/contexts/bootstrap_legacy.rs @@ -3,7 +3,6 @@ use std::path::PathBuf; use std::sync::Arc; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, @@ -26,6 +25,7 @@ use hermes_cosmos_test_components::bootstrap::traits::{ use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::types::Error; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_tracing_logging_components::contexts::TracingLogger; use tendermint_rpc::client::CompatMode; diff --git a/crates/cosmos/cosmos-integration-tests/src/contexts/chain_driver.rs b/crates/cosmos/cosmos-integration-tests/src/contexts/chain_driver.rs index 128113aacc..deec322762 100644 --- a/crates/cosmos/cosmos-integration-tests/src/contexts/chain_driver.rs +++ b/crates/cosmos/cosmos-integration-tests/src/contexts/chain_driver.rs @@ -3,7 +3,6 @@ use core::marker::PhantomData; use std::path::PathBuf; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ RuntimeGetter, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; @@ -31,6 +30,7 @@ use hermes_cosmos_test_components::chain_driver::traits::{ use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::types::Error; +use hermes_prelude::*; use hermes_runtime::impls::types::runtime::ProvideHermesRuntime; use hermes_runtime::types::runtime::HermesRuntime; use tokio::process::Child; diff --git a/crates/cosmos/cosmos-integration-tests/src/contexts/relay_driver.rs b/crates/cosmos/cosmos-integration-tests/src/contexts/relay_driver.rs index 90cca209d0..5dc4dd5968 100644 --- a/crates/cosmos/cosmos-integration-tests/src/contexts/relay_driver.rs +++ b/crates/cosmos/cosmos-integration-tests/src/contexts/relay_driver.rs @@ -2,7 +2,6 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::{Index, WithField}; use cgp::core::types::WithType; use cgp::extra::run::CanRun; -use cgp::prelude::*; use hermes_core::relayer_components::multi::traits::birelay_at::{ BiRelayGetterAtComponent, BiRelayTypeProviderAtComponent, }; @@ -15,6 +14,7 @@ use hermes_cosmos_relayer::contexts::{CosmosBiRelay, CosmosChain, CosmosRelay}; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::types::Error; +use hermes_prelude::*; use tokio::task::AbortHandle; #[cgp_context(CosmosRelayDriverComponents)] diff --git a/crates/cosmos/cosmos-integration-tests/src/impls/binary_channel_driver.rs b/crates/cosmos/cosmos-integration-tests/src/impls/binary_channel_driver.rs index f381f856d1..491da95693 100644 --- a/crates/cosmos/cosmos-integration-tests/src/impls/binary_channel_driver.rs +++ b/crates/cosmos/cosmos-integration-tests/src/impls/binary_channel_driver.rs @@ -1,5 +1,4 @@ use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::relayer_components::multi::traits::birelay_at::HasBiRelayTypeAt; use hermes_core::relayer_components::multi::traits::chain_at::HasChainTypeAt; use hermes_core::relayer_components::multi::traits::relay_at::HasRelayTypeAt; @@ -8,6 +7,7 @@ use hermes_core::test_components::setup::traits::{ BinaryChannelDriverBuilder, BinaryChannelDriverBuilderComponent, HasTestDriverType, }; use hermes_cosmos_relayer::contexts::{CosmosBiRelay, CosmosChain, CosmosRelay}; +use hermes_prelude::*; use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId}; use crate::contexts::{CosmosBinaryChannelTestDriver, CosmosChainDriver, CosmosRelayDriver}; diff --git a/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/build_cosmos_chain.rs b/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/build_cosmos_chain.rs index 6583cc1b01..bb62b16afa 100644 --- a/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/build_cosmos_chain.rs +++ b/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/build_cosmos_chain.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::{LevelDebug, LevelTrace, LevelWarn}; use hermes_core::relayer_components::chain::traits::{ @@ -11,6 +10,7 @@ use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_cosmos_test_components::bootstrap::traits::{HasChainNodeConfigType, HasDynamicGas}; use hermes_cosmos_test_components::chain::types::CosmosTestWallet; use hermes_error::types::HermesError; +use hermes_prelude::*; use crate::traits::{ CanBuildRelayerChainConfig, ChainBuilderWithNodeConfig, ChainBuilderWithNodeConfigComponent, diff --git a/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/build_cosmos_chain_driver.rs b/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/build_cosmos_chain_driver.rs index d9e0b4d2d4..1fc01f2046 100644 --- a/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/build_cosmos_chain_driver.rs +++ b/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/build_cosmos_chain_driver.rs @@ -1,7 +1,6 @@ use alloc::collections::BTreeMap; use std::path::PathBuf; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ HasChildProcessType, HasFilePathType, HasRuntimeType, }; @@ -14,6 +13,7 @@ use hermes_cosmos_test_components::bootstrap::traits::{ }; use hermes_cosmos_test_components::bootstrap::types::{CosmosChainNodeConfig, CosmosGenesisConfig}; use hermes_cosmos_test_components::chain::types::CosmosTestWallet; +use hermes_prelude::*; use tokio::process::Child; use crate::contexts::CosmosChainDriver; diff --git a/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/relayer_chain_config.rs b/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/relayer_chain_config.rs index df746ec80d..b0cf195f96 100644 --- a/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/relayer_chain_config.rs +++ b/crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/relayer_chain_config.rs @@ -4,7 +4,6 @@ use std::path::PathBuf; use cgp::core::error::ErrorOf; use cgp::extra::runtime::HasRuntime; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ CanCreateDir, CanWriteStringToFile, HasFilePathType, }; @@ -17,6 +16,7 @@ use hermes_cosmos_test_components::bootstrap::traits::{ }; use hermes_cosmos_test_components::bootstrap::types::{CosmosChainNodeConfig, CosmosGenesisConfig}; use hermes_cosmos_test_components::chain::types::CosmosTestWallet; +use hermes_prelude::*; use ibc_proto::cosmos::base::v1beta1::Coin; use ibc_proto::cosmos::tx::v1beta1::Fee; use tendermint_rpc::{Error as TendermintRpcError, Url}; diff --git a/crates/cosmos/cosmos-integration-tests/src/impls/init_channel_options.rs b/crates/cosmos/cosmos-integration-tests/src/impls/init_channel_options.rs index a8ce9c5c51..7340b341ba 100644 --- a/crates/cosmos/cosmos-integration-tests/src/impls/init_channel_options.rs +++ b/crates/cosmos/cosmos-integration-tests/src/impls/init_channel_options.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ HasConnectionIdType, HasInitChannelOptionsType, }; @@ -9,6 +8,7 @@ use hermes_core::test_components::setup::traits::{ InitChannelOptionsGetterAt, InitChannelOptionsGetterAtComponent, }; use hermes_cosmos_chain_components::types::CosmosInitChannelOptions; +use hermes_prelude::*; use ibc::core::host::types::identifiers::ConnectionId; #[cgp_new_provider(InitChannelOptionsGetterAtComponent)] diff --git a/crates/cosmos/cosmos-integration-tests/src/impls/test_driver/types.rs b/crates/cosmos/cosmos-integration-tests/src/impls/test_driver/types.rs index 47270ff9b2..2b1023a034 100644 --- a/crates/cosmos/cosmos-integration-tests/src/impls/test_driver/types.rs +++ b/crates/cosmos/cosmos-integration-tests/src/impls/test_driver/types.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::relayer_components::multi::traits::birelay_at::BiRelayTypeProviderAtComponent; use hermes_core::relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; @@ -6,6 +5,7 @@ use hermes_core::test_components::driver::traits::{ ChainDriverTypeProviderAtComponent, RelayDriverTypeProviderAtComponent, }; use hermes_cosmos_relayer::contexts::{CosmosBiRelay, CosmosChain, CosmosRelay}; +use hermes_prelude::*; use crate::contexts::{CosmosChainDriver, CosmosRelayDriver}; diff --git a/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/build_chain.rs b/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/build_chain.rs index 4522a00c91..c2a747c77c 100644 --- a/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/build_chain.rs +++ b/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/build_chain.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::test_components::chain::traits::{HasWalletType, WalletOf}; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_cosmos_test_components::bootstrap::traits::{ HasChainGenesisConfigType, HasChainNodeConfigType, }; +use hermes_prelude::*; #[cgp_component { provider: ChainBuilderWithNodeConfig, diff --git a/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/compat_mode.rs b/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/compat_mode.rs index 3a2744c1a6..b08d77c4cc 100644 --- a/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/compat_mode.rs +++ b/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/compat_mode.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use tendermint_rpc::client::CompatMode; #[cgp_getter { diff --git a/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/cosmos_builder.rs b/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/cosmos_builder.rs index d07365a262..1eb9cf9945 100644 --- a/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/cosmos_builder.rs +++ b/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/cosmos_builder.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_cosmos_relayer::contexts::CosmosBuilder; +use hermes_prelude::*; #[cgp_getter { provider: CosmosBuilderGetter, diff --git a/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/relayer_chain_config.rs b/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/relayer_chain_config.rs index d6672f03b0..8a2a7b639b 100644 --- a/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/relayer_chain_config.rs +++ b/crates/cosmos/cosmos-integration-tests/src/traits/bootstrap/relayer_chain_config.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_core::test_components::chain::traits::{HasWalletType, WalletOf}; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_cosmos_chain_components::impls::CosmosChainConfig; use hermes_cosmos_test_components::bootstrap::traits::{ HasChainGenesisConfigType, HasChainNodeConfigType, }; +use hermes_prelude::*; /** Capability for the bootstrap context to build a Hermes v1 relayer chain config. diff --git a/crates/cosmos/cosmos-relayer/Cargo.toml b/crates/cosmos/cosmos-relayer/Cargo.toml index 65c41f3fb3..f0150efec5 100644 --- a/crates/cosmos/cosmos-relayer/Cargo.toml +++ b/crates/cosmos/cosmos-relayer/Cargo.toml @@ -16,6 +16,7 @@ all-features = true [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-tracing-logging-components = { workspace = true } hermes-protobuf-encoding-components = { workspace = true } hermes-runtime = { workspace = true } diff --git a/crates/cosmos/cosmos-relayer/src/contexts/birelay.rs b/crates/cosmos/cosmos-relayer/src/contexts/birelay.rs index 653674b0a5..bf974656a1 100644 --- a/crates/cosmos/cosmos-relayer/src/contexts/birelay.rs +++ b/crates/cosmos/cosmos-relayer/src/contexts/birelay.rs @@ -2,7 +2,6 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::core::types::WithType; use cgp::extra::run::RunnerComponent; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::relayer_components::birelay::traits::AutoBiRelayerComponent; use hermes_core::relayer_components::components::default::DefaultBiRelayComponents; @@ -13,6 +12,7 @@ use hermes_core::relayer_components::multi::traits::relay_at::{ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_tracing_logging_components::contexts::TracingLogger; diff --git a/crates/cosmos/cosmos-relayer/src/contexts/build.rs b/crates/cosmos/cosmos-relayer/src/contexts/build.rs index 3076bc7340..66008def40 100644 --- a/crates/cosmos/cosmos-relayer/src/contexts/build.rs +++ b/crates/cosmos/cosmos-relayer/src/contexts/build.rs @@ -9,7 +9,6 @@ use std::str::FromStr; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::{Index, UseField, WithField}; use cgp::core::types::WithType; -use cgp::prelude::*; use eyre::{eyre, Report}; use futures::lock::Mutex; use hermes_core::relayer_components::build::traits::builders::birelay_from_relay_builder::{ @@ -46,6 +45,7 @@ use hermes_cosmos_chain_components::types::{ PacketFilterConfig, Secp256k1KeyPair, KEYSTORE_DEFAULT_FOLDER, KEYSTORE_FILE_EXTENSION, }; use hermes_error::types::Error; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use ibc::core::host::types::identifiers::{ChainId, ClientId}; use tendermint_rpc::client::CompatMode; diff --git a/crates/cosmos/cosmos-relayer/src/contexts/chain.rs b/crates/cosmos/cosmos-relayer/src/contexts/chain.rs index ce61a1c689..cec3c2e8b1 100644 --- a/crates/cosmos/cosmos-relayer/src/contexts/chain.rs +++ b/crates/cosmos/cosmos-relayer/src/contexts/chain.rs @@ -3,7 +3,6 @@ use core::ops::Deref; use core::time::Duration; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_any_counterparty::contexts::AnyCounterparty; use hermes_core::chain_type_components::traits::{ @@ -65,6 +64,7 @@ use hermes_cosmos_chain_components::types::{ }; use hermes_cosmos_chain_preset::delegate::DelegateCosmosChainComponents; use hermes_cosmos_chain_preset::presets::{CosmosChainPreset, CosmosToCosmosComponents}; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_tracing_logging_components::contexts::TracingLogger; use hermes_wasm_test_components::components::WasmChainComponents; diff --git a/crates/cosmos/cosmos-relayer/src/contexts/encoding.rs b/crates/cosmos/cosmos-relayer/src/contexts/encoding.rs index 5ddf3d457f..fb099c0b2a 100644 --- a/crates/cosmos/cosmos-relayer/src/contexts/encoding.rs +++ b/crates/cosmos/cosmos-relayer/src/contexts/encoding.rs @@ -1,5 +1,4 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::encoding_components::impls::GetDefaultEncoding; use hermes_core::encoding_components::traits::{ CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut, DefaultEncodingGetter, @@ -9,6 +8,7 @@ use hermes_core::encoding_components::traits::{ use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_chain_components::encoding::CosmosClientEncodingComponents; use hermes_cosmos_chain_components::types::{TendermintClientState, TendermintConsensusState}; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::encode_mut::chunk::ProtoChunks; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use ibc::core::client::types::Height; diff --git a/crates/cosmos/cosmos-relayer/src/contexts/relay.rs b/crates/cosmos/cosmos-relayer/src/contexts/relay.rs index fd79217393..e37de44dc5 100644 --- a/crates/cosmos/cosmos-relayer/src/contexts/relay.rs +++ b/crates/cosmos/cosmos-relayer/src/contexts/relay.rs @@ -5,7 +5,6 @@ use core::ops::Deref; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; use cgp::core::field::Index; use cgp::core::types::WithType; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::relayer_components::error::traits::{CanPerformRetry, RetryableErrorComponent}; @@ -30,6 +29,7 @@ use hermes_core::relayer_components_extra::components::extra::relay::ExtraRelayP use hermes_core::runtime_components::traits::{ HasRuntime, RuntimeGetterComponent, RuntimeOf, RuntimeTypeProviderComponent, }; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::host::types::identifiers::ClientId; diff --git a/crates/cosmos/cosmos-relayer/src/impls/error.rs b/crates/cosmos/cosmos-relayer/src/impls/error.rs index 1a0a5d79d3..a790e7d8af 100644 --- a/crates/cosmos/cosmos-relayer/src/impls/error.rs +++ b/crates/cosmos/cosmos-relayer/src/impls/error.rs @@ -8,7 +8,6 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ ErrorRaiser, ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent, }; -use cgp::prelude::*; use eyre::Report; use futures::channel::mpsc::SendError; use futures::channel::oneshot::Canceled; @@ -40,6 +39,7 @@ use hermes_error::handlers::{ }; use hermes_error::impls::UseHermesError; use hermes_error::types::Error; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::any::TypeUrlMismatchError; use hermes_protobuf_encoding_components::impls::encode_mut::chunk::{ InvalidWireType, UnsupportedWireType, diff --git a/crates/cosmos/cosmos-test-components/Cargo.toml b/crates/cosmos/cosmos-test-components/Cargo.toml index ed49a86f62..63085b4415 100644 --- a/crates/cosmos/cosmos-test-components/Cargo.toml +++ b/crates/cosmos/cosmos-test-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime = { workspace = true } hermes-core = { workspace = true } hermes-cosmos-chain-components = { workspace = true } diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/components/cosmos_sdk.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/components/cosmos_sdk.rs index ffc682c12c..5adf672f7e 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/components/cosmos_sdk.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/components/cosmos_sdk.rs @@ -1,7 +1,7 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; + use hermes_prelude::*; use crate::bootstrap::impls::{ AddCosmosGenesisAccount, AddCosmosGenesisValidator, AddCosmosWalletToGenesis, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/components/cosmos_sdk_legacy.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/components/cosmos_sdk_legacy.rs index 7e96d7388c..524a77a3ea 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/components/cosmos_sdk_legacy.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/components/cosmos_sdk_legacy.rs @@ -1,6 +1,6 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; + use hermes_prelude::*; use CosmosSdkBootstrapComponents::re_exports::*; use crate::bootstrap::components::CosmosSdkBootstrapComponents; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/bootstrap_chain.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/bootstrap_chain.rs index 6f1eccc4e2..e17330cc44 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/bootstrap_chain.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/bootstrap_chain.rs @@ -1,6 +1,5 @@ use alloc::collections::BTreeMap; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::runtime_components::traits::{HasChildProcessType, HasFilePathType, HasRuntime}; use hermes_core::test_components::bootstrap::traits::{ @@ -9,6 +8,7 @@ use hermes_core::test_components::bootstrap::traits::{ use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_core::test_components::driver::traits::HasChainDriverType; +use hermes_prelude::*; use crate::bootstrap::traits::{ CanAddWalletToGenesis, CanBuildChainDriver, CanCollectGenesisTransactions, CanGenerateChainId, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/build_wait.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/build_wait.rs index 6eb0d336cf..7528fa2526 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/build_wait.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/build_wait.rs @@ -1,13 +1,13 @@ use core::marker::PhantomData; use std::collections::BTreeMap; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ ChildProcessOf, HasChildProcessType, HasRuntimeType, }; use hermes_core::test_components::chain::traits::{HasWalletType, Wallet}; use hermes_core::test_components::chain_driver::traits::{CanWaitChainStartup, HasChainType}; use hermes_core::test_components::driver::traits::HasChainDriverType; +use hermes_prelude::*; use crate::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/start_chain.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/start_chain.rs index 3de9a48055..62111c0c2d 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/start_chain.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/chain/start_chain.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanStartChildProcess, HasFilePathType, HasRuntime}; +use hermes_prelude::*; use crate::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainCommandPath, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/fields/genesis_denom.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/fields/genesis_denom.rs index c83fc513d1..0fe5aae3af 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/fields/genesis_denom.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/fields/genesis_denom.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasDenomType; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ DenomForStaking, DenomForTransfer, GenesisDenomGetter, GenesisDenomGetterComponent, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/fields/hd_path.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/fields/hd_path.rs index c04dca4fc2..3c3c98d135 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/fields/hd_path.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/fields/hd_path.rs @@ -1,7 +1,7 @@ use core::str::FromStr; -use cgp::prelude::*; use hdpath::StandardHDPath; +use hermes_prelude::*; use crate::bootstrap::traits::{WalletHdPathComponent, WalletHdPathGetter}; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/random_chain_id.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/random_chain_id.rs index 8ea2778cc5..38553f70ea 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/random_chain_id.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/random_chain_id.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::runtime_components::traits::{CanGenerateRandom, HasRuntime}; use hermes_core::test_components::chain::traits::CanBuildChainIdFromString; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ChainIdGenerator, ChainIdGeneratorComponent, HasRandomIdFlag}; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/return_chain_id_prefix.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/return_chain_id_prefix.rs index ce3e1e47d4..b0d88c4760 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/return_chain_id_prefix.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/return_chain_id_prefix.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::test_components::chain::traits::CanBuildChainIdFromString; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ChainIdGenerator, ChainIdGeneratorComponent}; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/wallet_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/wallet_config.rs index 50f0605aff..8d61b11d09 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/wallet_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/generator/wallet_config.rs @@ -1,9 +1,9 @@ use alloc::collections::BTreeMap; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasDenomType; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ DenomForStaking, DenomForTransfer, HasChainGenesisConfigType, HasGenesisDenom, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_account.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_account.rs index 2eeaf5618f..f534928e43 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_account.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_account.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::runtime_components::traits::{CanExecCommand, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ GenesisAccountAdder, GenesisAccountAdderComponent, HasChainCommandPath, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_validator.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_validator.rs index 9622bafea8..6d0084ddd9 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_validator.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_validator.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAmountType; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::runtime_components::traits::{CanExecCommand, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ GenesisValidatorAdder, GenesisValidatorAdderComponent, HasChainCommandPath, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_wallet.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_wallet.rs index 4a5d9ff496..efbbd83d32 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_wallet.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_wallet.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::runtime_components::traits::{HasFilePathType, HasRuntime}; use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_core::test_components::driver::traits::HasChainDriverType; +use hermes_prelude::*; use crate::bootstrap::traits::{ CanAddGenesisAccount, CanAddGenesisValidator, CanInitWallet, GenesisWalletAdder, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/collect_gentxs.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/collect_gentxs.rs index cbdc368d7c..bec9bde100 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/collect_gentxs.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis/collect_gentxs.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanExecCommand, HasFilePathType, HasRuntime}; +use hermes_prelude::*; use crate::bootstrap::traits::{ GenesisTransactionsCollector, GenesisTransactionsCollectorComponent, HasChainCommandPath, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/add_genesis_account.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/add_genesis_account.rs index a87f15324d..418781fc6d 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/add_genesis_account.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/add_genesis_account.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::runtime_components::traits::{CanExecCommand, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ GenesisAccountAdder, GenesisAccountAdderComponent, HasChainCommandPath, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/add_genesis_validator.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/add_genesis_validator.rs index 887def7c12..c23dab97fa 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/add_genesis_validator.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/add_genesis_validator.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAmountType; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::runtime_components::traits::{CanExecCommand, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ GenesisValidatorAdder, GenesisValidatorAdderComponent, HasChainCommandPath, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/collect_gentxs.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/collect_gentxs.rs index 78e0fa8383..5a8f114c22 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/collect_gentxs.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/genesis_legacy/collect_gentxs.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanExecCommand, HasFilePathType, HasRuntime}; +use hermes_prelude::*; use crate::bootstrap::traits::{ GenesisTransactionsCollector, GenesisTransactionsCollectorComponent, HasChainCommandPath, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/create_chain_home_dir.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/create_chain_home_dir.rs index 51b6b037f7..8fd2ef27ca 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/create_chain_home_dir.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/create_chain_home_dir.rs @@ -1,9 +1,9 @@ use core::fmt::Display; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::runtime_components::traits::{CanCreateDir, HasRuntime}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ ChainHomeDirInitializer, ChainHomeDirInitializerComponent, HasChainStoreDir, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/init_chain_data.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/init_chain_data.rs index 4daf8f8931..f3c898fe21 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/init_chain_data.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/init_chain_data.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::runtime_components::traits::{CanExecCommand, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ ChainDataInitializer, ChainDataInitializerComponent, HasChainCommandPath, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/init_wallet.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/init_wallet.rs index c3fa599789..f2f0b215f6 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/init_wallet.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/init_wallet.rs @@ -1,12 +1,12 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ CanExecCommand, CanWriteStringToFile, ExecOutput, HasFilePathType, HasRuntime, }; use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_prelude::*; use serde_json as json; use crate::bootstrap::traits::{ diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/update_chain_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/update_chain_config.rs index f0a7440351..be76929f25 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/update_chain_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/update_chain_config.rs @@ -1,12 +1,12 @@ use core::time::Duration; use std::path::PathBuf; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::runtime_components::traits::{ CanReadFileAsString, CanReserveTcpPort, CanWriteStringToFile, HasFilePathType, HasRuntime, }; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use ibc::core::host::types::identifiers::ChainId; use toml::Value; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/update_genesis_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/update_genesis_config.rs index b28f0165f9..3003902926 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/update_genesis_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/initializers/update_genesis_config.rs @@ -1,9 +1,9 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ CanReadFileAsString, CanWriteStringToFile, HasFilePathType, HasRuntime, }; +use hermes_prelude::*; use serde_json::{Error as JsonError, Value}; use crate::bootstrap::traits::{ diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_comet_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_comet_config.rs index f71fa855a7..14aaaae6a1 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_comet_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_comet_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use toml::Value; use crate::bootstrap::traits::{CometConfigModifier, CometConfigModifierComponent}; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_cosmos_sdk_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_cosmos_sdk_config.rs index ffee283a6a..c3f4359ead 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_cosmos_sdk_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_cosmos_sdk_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use toml::Value; use crate::bootstrap::traits::{CosmosSdkConfigModifier, CosmosSdkConfigModifierComponent}; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_genesis_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_genesis_config.rs index b2fbea257c..0e6687bec6 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_genesis_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/modifiers/no_modify_genesis_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use serde_json::Value; use crate::bootstrap::traits::{CosmosGenesisConfigModifier, CosmosGenesisConfigModifierComponent}; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/chain_node_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/chain_node_config.rs index 175abbbe7f..0af438d2e1 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/chain_node_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/chain_node_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::bootstrap::traits::{ChainNodeConfigTypeComponent, ProvideChainNodeConfigType}; use crate::bootstrap::types::CosmosChainNodeConfig; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/genesis_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/genesis_config.rs index 2d57b50039..a6b5d19afa 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/genesis_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/genesis_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::bootstrap::traits::{ChainGenesisConfigTypeComponent, ProvideChainGenesisConfigType}; use crate::bootstrap::types::CosmosGenesisConfig; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/wallet_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/wallet_config.rs index d1e784df19..499936934a 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/wallet_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/impls/types/wallet_config.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAmountType; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{ HasWalletConfigType, ProvideWalletConfigType, WalletConfigFieldsComponent, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/chain/build_chain_driver.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/chain/build_chain_driver.rs index 12b3fb4ae9..2a81c70c6e 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/chain/build_chain_driver.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/chain/build_chain_driver.rs @@ -1,12 +1,12 @@ use alloc::collections::BTreeMap; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ ChildProcessOf, HasChildProcessType, HasRuntimeType, }; use hermes_core::test_components::chain::traits::{HasWalletType, Wallet}; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_core::test_components::driver::traits::HasChainDriverType; +use hermes_prelude::*; use crate::bootstrap::traits::{HasChainGenesisConfigType, HasChainNodeConfigType}; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/chain/start_chain.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/chain/start_chain.rs index 71e8582272..c80db4d85a 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/chain/start_chain.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/chain/start_chain.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ ChildProcessOf, FilePathOf, HasChildProcessType, HasFilePathType, HasRuntime, }; +use hermes_prelude::*; use crate::bootstrap::traits::{HasChainGenesisConfigType, HasChainNodeConfigType}; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/account_prefix.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/account_prefix.rs index 8d6c57761d..32d9aa326e 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/account_prefix.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/account_prefix.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_getter { provider: AccountPrefixGetter, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/chain_command_path.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/chain_command_path.rs index df0f4b4137..ad92a18431 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/chain_command_path.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/chain_command_path.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; +use hermes_prelude::*; #[cgp_getter { provider: ChainCommandPathGetter, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/chain_store_dir.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/chain_store_dir.rs index a5ceec780c..aacb5290a0 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/chain_store_dir.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/chain_store_dir.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; +use hermes_prelude::*; #[cgp_getter { provider: ChainStoreDirGetter, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/denom.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/denom.rs index dff03a2edb..31b8115442 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/denom.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/denom.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{DenomOf, HasDenomType}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::HasChainGenesisConfigType; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/dynamic_gas_fee.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/dynamic_gas_fee.rs index a425753756..13dd79c3a5 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/dynamic_gas_fee.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/dynamic_gas_fee.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::types::DynamicGasConfig; +use hermes_prelude::*; #[cgp_getter { provider: DynamicGasGetter, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/hd_path.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/hd_path.rs index 2b63b622a2..b9e52d3a24 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/hd_path.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/hd_path.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hdpath::StandardHDPath; +use hermes_prelude::*; #[cgp_component { name: WalletHdPathComponent, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/random_id.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/random_id.rs index d0371cda1b..03264c6372 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/random_id.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/fields/random_id.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_getter { provider: RandomIdFlagGetter, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/generator/generate_chain_id.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/generator/generate_chain_id.rs index 5f515457b2..8b9eb7c0ec 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/generator/generate_chain_id.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/generator/generate_chain_id.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::relayer_components::chain::types::aliases::ChainIdOf; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; #[cgp_component { provider: ChainIdGenerator, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/generator/generate_wallet_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/generator/generate_wallet_config.rs index a935b063d2..063bb569db 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/generator/generate_wallet_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/generator/generate_wallet_config.rs @@ -1,6 +1,6 @@ use alloc::collections::BTreeMap; -use cgp::prelude::*; +use hermes_prelude::*; use crate::bootstrap::traits::{HasChainGenesisConfigType, HasWalletConfigType}; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_account.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_account.rs index 2967950b4c..ff3d9f661b 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_account.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_account.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{ AddressOf, AmountOf, HasAddressType, HasAmountType, }; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; #[cgp_component { provider: GenesisAccountAdder, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_validator.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_validator.rs index e50c021c39..d8577828db 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_validator.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_validator.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{AmountOf, HasAmountType}; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::relayer_components::chain::types::aliases::ChainIdOf; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; #[cgp_component { provider: GenesisValidatorAdder, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_wallet.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_wallet.rs index 29d699993e..8db563f03c 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_wallet.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/add_genesis_wallet.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::relayer_components::chain::types::aliases::ChainIdOf; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain::traits::{HasWalletType, Wallet}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::HasWalletConfigType; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/collect_gentxs.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/collect_gentxs.rs index 55296fc1bf..f4c8fb038d 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/collect_gentxs.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/genesis/collect_gentxs.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; +use hermes_prelude::*; #[cgp_component { provider: GenesisTransactionsCollector, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_config.rs index 6cf7e926e8..0e290e253d 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_config.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::relayer_components::chain::types::aliases::ChainIdOf; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntimeType}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; use crate::bootstrap::traits::{HasChainGenesisConfigType, HasChainNodeConfigType}; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_data.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_data.rs index b40725d8a0..36e4b778a1 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_data.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_data.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::relayer_components::chain::types::aliases::ChainIdOf; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; /** Initialize a new chain with data files stored at the given home directory diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_home_dir.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_home_dir.rs index de4b293fa0..b56aa66f1e 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_home_dir.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_chain_home_dir.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::relayer_components::chain::types::aliases::ChainIdOf; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; #[cgp_component { provider: ChainHomeDirInitializer, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_genesis_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_genesis_config.rs index 580559e18f..56fc11612b 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_genesis_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_genesis_config.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; +use hermes_prelude::*; use crate::bootstrap::traits::HasChainGenesisConfigType; diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_wallet.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_wallet.rs index ccc8d5db9b..9fb4be6ee8 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_wallet.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/initializers/init_wallet.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; use hermes_core::test_components::chain::traits::{HasWalletType, Wallet}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; #[cgp_component { provider: WalletInitializer, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_comet_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_comet_config.rs index 3baf09b6c8..5ffab82810 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_comet_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_comet_config.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use toml::Value; #[cgp_component { diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_cosmos_sdk_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_cosmos_sdk_config.rs index 8ebb271f8d..b082fba102 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_cosmos_sdk_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_cosmos_sdk_config.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; use toml::Value; #[cgp_component { diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_genesis_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_genesis_config.rs index 16cbf83b69..7a33a5661f 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_genesis_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/modifiers/modify_genesis_config.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use serde_json::Value; #[cgp_component { diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/chain_node_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/chain_node_config.rs index 1686e9ef77..922da47ee3 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/chain_node_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/chain_node_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ChainNodeConfigTypeComponent, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/genesis_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/genesis_config.rs index 0bc9934db7..64b08aad76 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/genesis_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/genesis_config.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ChainGenesisConfigTypeComponent, diff --git a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/wallet_config.rs b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/wallet_config.rs index 80ca19ad40..111ffe8a43 100644 --- a/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/wallet_config.rs +++ b/crates/cosmos/cosmos-test-components/src/bootstrap/traits/types/wallet_config.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{AmountOf, HasAmountType}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; /** A wallet config is a template for generating fresh wallets for a chain. diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/chain_id.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/chain_id.rs index dba0f4f81d..e8bf40717d 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/chain_id.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/chain_id.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasChainIdType; use hermes_core::test_components::chain::traits::{ ChainIdFromStringBuilder, ChainIdFromStringBuilderComponent, }; +use hermes_prelude::*; use ibc::core::host::types::identifiers::ChainId; pub struct BuildCosmosChainIdFromString; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/messages/ibc_transfer.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/messages/ibc_transfer.rs index 17b4f1f22e..aafc422dcc 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/messages/ibc_transfer.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/messages/ibc_transfer.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::relayer_components::chain::traits::{ HasChannelIdType, HasHeightFields, HasMessageType, HasPortIdType, HasTimeoutType, @@ -9,6 +8,7 @@ use hermes_core::test_components::chain::traits::{ HasMemoType, IbcTokenTransferMessageBuilder, IbcTokenTransferMessageBuilderComponent, }; use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; +use hermes_prelude::*; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::{ChannelId, PortId}; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/messages/deposit.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/messages/deposit.rs index d57caf34da..95e85d0fad 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/messages/deposit.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/messages/deposit.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAmountType; use hermes_core::relayer_components::chain::traits::HasMessageType; use hermes_core::test_components::chain::traits::{ DepositProposalMessageBuilder, DepositProposalMessageBuilderComponent, HasProposalIdType, }; use hermes_cosmos_chain_components::traits::{CosmosMessage, DynCosmosMessage, ToCosmosMessage}; +use hermes_prelude::*; use ibc::primitives::Signer; use ibc_proto::cosmos::base::v1beta1::Coin; use ibc_proto::cosmos::gov::v1::MsgDeposit; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/messages/vote.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/messages/vote.rs index 8a9e91b984..dedc70622a 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/messages/vote.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/messages/vote.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::HasMessageType; use hermes_core::test_components::chain::traits::{ HasProposalIdType, HasProposalVoteType, VoteProposalMessageBuilder, VoteProposalMessageBuilderComponent, }; use hermes_cosmos_chain_components::traits::{CosmosMessage, DynCosmosMessage, ToCosmosMessage}; +use hermes_prelude::*; use ibc::primitives::Signer; use ibc_proto::cosmos::gov::v1::MsgVote; use ibc_proto::google::protobuf::Any; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/poll_status.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/poll_status.rs index 8226726391..219fc97764 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/poll_status.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/poll_status.rs @@ -1,12 +1,12 @@ use core::fmt::{Debug, Display}; use core::time::Duration; -use cgp::prelude::*; use hermes_core::relayer_components::error::traits::HasRetryableError; use hermes_core::runtime_components::traits::{CanSleep, HasRuntime}; use hermes_core::test_components::chain::traits::{ CanQueryProposalStatus, ProposalStatusPoller, ProposalStatusPollerComponent, }; +use hermes_prelude::*; pub struct PollProposalStatus; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/query_status.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/query_status.rs index 708085d1b5..f8bedda50e 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/query_status.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/proposal/query_status.rs @@ -1,10 +1,10 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_core::test_components::chain::traits::{ HasProposalIdType, HasProposalStatusType, ProposalStatusQuerier, ProposalStatusQuerierComponent, }; use hermes_cosmos_chain_components::traits::HasGrpcAddress; +use hermes_prelude::*; use http::uri::InvalidUri; use http::Uri; use ibc_proto::cosmos::gov::v1::query_client::QueryClient; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/queries/balance.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/queries/balance.rs index a9264b0553..4ae6b359f1 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/queries/balance.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/queries/balance.rs @@ -1,9 +1,9 @@ use core::num::ParseIntError; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType, HasDenomType}; use hermes_core::test_components::chain::traits::{BalanceQuerier, BalanceQuerierComponent}; use hermes_cosmos_chain_components::traits::HasGrpcAddress; +use hermes_prelude::*; use http::uri::InvalidUri; use http::Uri; use ibc_proto::cosmos::bank::v1beta1::query_client::QueryClient; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/transfer/amount.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/transfer/amount.rs index b0f208d7b1..e5b5037dbb 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/transfer/amount.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/transfer/amount.rs @@ -1,12 +1,12 @@ use core::marker::PhantomData; use std::string::FromUtf8Error; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAmountType, HasDenomType}; use hermes_core::relayer_components::chain::traits::{HasChannelIdType, HasPortIdType}; use hermes_core::test_components::chain::traits::{ IbcTransferredAmountConverter, IbcTransferredAmountConverterComponent, }; +use hermes_prelude::*; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use sha2::{Digest, Sha256}; use subtle_encoding::hex; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/transfer/timeout.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/transfer/timeout.rs index ed42789a4a..ffd7a6aee6 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/transfer/timeout.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/transfer/timeout.rs @@ -1,11 +1,11 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{HasHeightType, HasTimeType, HasTimeoutType}; use hermes_core::test_components::chain::traits::{ IbcTransferTimeoutCalculator, IbcTransferTimeoutCalculatorComponent, }; use hermes_cosmos_chain_components::types::Time; +use hermes_prelude::*; use ibc::primitives::Timestamp; use time::OffsetDateTime; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/types/amount.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/types/amount.rs index ca44478fb0..662262c5bb 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/types/amount.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/types/amount.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{ AmountDenomGetter, AmountDenomGetterComponent, AmountTypeProviderComponent, HasAmountType, HasDenomType, }; use hermes_core::test_components::chain::traits::{AmountMethodsComponent, ProvideAmountMethods}; +use hermes_prelude::*; use crate::chain::types::{Amount, Denom}; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/types/denom.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/types/denom.rs index a8f35a7e72..cbc55d4e46 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/types/denom.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/types/denom.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{DenomTypeComponent, ProvideDenomType}; +use hermes_prelude::*; use crate::chain::types::Denom; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/types/proposal.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/types/proposal.rs index 28d5577d94..12836fe913 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/types/proposal.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/types/proposal.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::test_components::chain::traits::{ ProposalIdTypeComponent, ProposalStatusTypeComponent, ProposalVoteTypeComponent, ProvideProposalIdType, ProvideProposalStatusType, ProvideProposalVoteType, }; +use hermes_prelude::*; use crate::chain::types::{ProposalStatus, ProposalVote}; diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/types/wallet.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/types/wallet.rs index 8276014070..663cfe18b0 100644 --- a/crates/cosmos/cosmos-test-components/src/chain/impls/types/wallet.rs +++ b/crates/cosmos/cosmos-test-components/src/chain/impls/types/wallet.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::relayer_components::transaction::traits::HasSignerType; use hermes_core::test_components::chain::traits::{ @@ -6,6 +5,7 @@ use hermes_core::test_components::chain::traits::{ WalletTypeComponent, }; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_prelude::*; use crate::chain::types::CosmosTestWallet; diff --git a/crates/cosmos/cosmos-test-components/src/chain_driver/components.rs b/crates/cosmos/cosmos-test-components/src/chain_driver/components.rs index c6ae91c266..e6d9a18c3e 100644 --- a/crates/cosmos/cosmos-test-components/src/chain_driver/components.rs +++ b/crates/cosmos/cosmos-test-components/src/chain_driver/components.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::test_components::chain_driver::impls::WaitChainReachHeight; use hermes_core::test_components::chain_driver::traits::{ ChainStartupWaiterComponent, RandomAmountGeneratorComponent, }; +use hermes_prelude::*; use crate::chain_driver::impls::GenerateRandomAmount; diff --git a/crates/cosmos/cosmos-test-components/src/chain_driver/impls/amount.rs b/crates/cosmos/cosmos-test-components/src/chain_driver/impls/amount.rs index adbf957190..d0e64fbb24 100644 --- a/crates/cosmos/cosmos-test-components/src/chain_driver/impls/amount.rs +++ b/crates/cosmos/cosmos-test-components/src/chain_driver/impls/amount.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAmountType; use hermes_core::runtime_components::traits::{CanGenerateRandom, HasRuntime}; use hermes_core::test_components::chain_driver::traits::{ HasChainType, RandomAmountGenerator, RandomAmountGeneratorComponent, }; +use hermes_prelude::*; use crate::chain::types::Amount; diff --git a/crates/cosmos/cosmos-test-components/src/chain_driver/traits/grpc_port.rs b/crates/cosmos/cosmos-test-components/src/chain_driver/traits/grpc_port.rs index 7cce57fe8c..0d0787dd94 100644 --- a/crates/cosmos/cosmos-test-components/src/chain_driver/traits/grpc_port.rs +++ b/crates/cosmos/cosmos-test-components/src/chain_driver/traits/grpc_port.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: GrpcPortGetter, diff --git a/crates/cosmos/cosmos-test-components/src/chain_driver/traits/rpc_port.rs b/crates/cosmos/cosmos-test-components/src/chain_driver/traits/rpc_port.rs index bc8352d644..38bbf2d4bf 100644 --- a/crates/cosmos/cosmos-test-components/src/chain_driver/traits/rpc_port.rs +++ b/crates/cosmos/cosmos-test-components/src/chain_driver/traits/rpc_port.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: RpcPortGetter, diff --git a/crates/cosmos/cosmos-test-components/src/chain_driver/traits/store_wasm_client.rs b/crates/cosmos/cosmos-test-components/src/chain_driver/traits/store_wasm_client.rs index afe93307a8..418309cb7a 100644 --- a/crates/cosmos/cosmos-test-components/src/chain_driver/traits/store_wasm_client.rs +++ b/crates/cosmos/cosmos-test-components/src/chain_driver/traits/store_wasm_client.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_core::runtime_components::traits::{FilePathOf, HasFilePathType}; use hermes_core::runtime_components::traits::HasRuntimeType; diff --git a/crates/cosmos/cosmos-wasm-relayer/Cargo.toml b/crates/cosmos/cosmos-wasm-relayer/Cargo.toml index 6b34ff21e0..ffc7f4b226 100644 --- a/crates/cosmos/cosmos-wasm-relayer/Cargo.toml +++ b/crates/cosmos/cosmos-wasm-relayer/Cargo.toml @@ -16,6 +16,7 @@ all-features = true [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-tracing-logging-components = { workspace = true } hermes-protobuf-encoding-components = { workspace = true } hermes-error = { workspace = true } diff --git a/crates/cosmos/cosmos-wasm-relayer/src/components/chain.rs b/crates/cosmos/cosmos-wasm-relayer/src/components/chain.rs index 7509e6c7e7..7f0b2bebaa 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/components/chain.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/components/chain.rs @@ -1,7 +1,7 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; use hermes_cosmos_chain_preset::presets::CosmosChainPreset; + use hermes_prelude::*; use CosmosChainPreset::re_exports::*; use crate::impls::ProvideWrappedTendermintClientState; diff --git a/crates/cosmos/cosmos-wasm-relayer/src/components/cosmos_to_wasm_cosmos.rs b/crates/cosmos/cosmos-wasm-relayer/src/components/cosmos_to_wasm_cosmos.rs index 2f62e94d36..17ea433ada 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/components/cosmos_to_wasm_cosmos.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/components/cosmos_to_wasm_cosmos.rs @@ -1,6 +1,5 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ AllClientStatesQuerierComponent, ChannelOpenAckMessageBuilderComponent, ChannelOpenConfirmMessageBuilderComponent, ChannelOpenInitMessageBuilderComponent, @@ -13,6 +12,7 @@ mod preset { CreateClientMessageOptionsTypeComponent, UpdateClientMessageBuilderComponent, }; use hermes_cosmos_chain_preset::presets::CosmosToCosmosComponents; + use hermes_prelude::*; use CosmosToCosmosComponents::re_exports::*; use crate::impls::{ diff --git a/crates/cosmos/cosmos-wasm-relayer/src/context/chain.rs b/crates/cosmos/cosmos-wasm-relayer/src/context/chain.rs index cacf240f10..533ae1932f 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/context/chain.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/context/chain.rs @@ -1,7 +1,6 @@ use core::ops::Deref; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; -use cgp::prelude::*; use hermes_any_counterparty::contexts::AnyCounterparty; use hermes_core::encoding_components::traits::{ DefaultEncodingGetterComponent, EncodingGetterComponent, EncodingTypeProviderComponent, @@ -53,6 +52,7 @@ use hermes_cosmos_chain_preset::delegate::DelegateCosmosChainComponents; use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_cosmos_relayer::impls::HandleCosmosError; use hermes_cosmos_relayer::types::telemetry::CosmosTelemetry; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_tracing_logging_components::contexts::TracingLogger; use hermes_wasm_test_components::components::WasmChainComponents; diff --git a/crates/cosmos/cosmos-wasm-relayer/src/context/cosmos_bootstrap.rs b/crates/cosmos/cosmos-wasm-relayer/src/context/cosmos_bootstrap.rs index fa0ea1bcbf..1440fb6206 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/context/cosmos_bootstrap.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/context/cosmos_bootstrap.rs @@ -1,7 +1,6 @@ use std::path::PathBuf; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, @@ -32,6 +31,7 @@ use hermes_cosmos_test_components::bootstrap::traits::{ }; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_tracing_logging_components::contexts::TracingLogger; use hermes_wasm_test_components::impls::bootstrap::{ diff --git a/crates/cosmos/cosmos-wasm-relayer/src/context/cosmos_to_wasm_cosmos_relay.rs b/crates/cosmos/cosmos-wasm-relayer/src/context/cosmos_to_wasm_cosmos_relay.rs index 66b1977a47..2f46a86586 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/context/cosmos_to_wasm_cosmos_relay.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/context/cosmos_to_wasm_cosmos_relay.rs @@ -4,7 +4,6 @@ use std::sync::Arc; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::UseField; use cgp::extra::run::CanRun; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_core::logging_components::traits::{CanLog, LoggerComponent}; use hermes_core::relayer_components::chain::traits::{ @@ -28,6 +27,7 @@ use hermes_core::runtime_components::traits::{ use hermes_cosmos_chain_components::types::PacketFilterConfig; use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_cosmos_relayer::impls::HandleCosmosError; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::host::types::identifiers::{ChannelId, ClientId, PortId, Sequence}; diff --git a/crates/cosmos/cosmos-wasm-relayer/src/context/encoding.rs b/crates/cosmos/cosmos-wasm-relayer/src/context/encoding.rs index 9a2a0af8e8..3983c4933c 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/context/encoding.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/context/encoding.rs @@ -1,5 +1,4 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::encoding_components::impls::GetDefaultEncoding; use hermes_core::encoding_components::traits::{ CanConvert, CanConvertBothWays, CanEncode, CanEncodeAndDecode, DefaultEncodingGetter, @@ -9,6 +8,7 @@ use hermes_core::encoding_components::traits::{ use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_chain_components::types::{TendermintClientState, TendermintConsensusState}; use hermes_cosmos_relayer::impls::HandleCosmosError; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use hermes_wasm_encoding_components::types::{ WasmClientMessage, WasmClientState, WasmConsensusState, diff --git a/crates/cosmos/cosmos-wasm-relayer/src/context/wasm_cosmos_relay.rs b/crates/cosmos/cosmos-wasm-relayer/src/context/wasm_cosmos_relay.rs index 5defe3da2c..18e7b8578c 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/context/wasm_cosmos_relay.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/context/wasm_cosmos_relay.rs @@ -4,7 +4,6 @@ use std::sync::Arc; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::UseField; use cgp::extra::run::CanRun; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_core::logging_components::traits::{CanLog, LoggerComponent}; use hermes_core::relayer_components::chain::traits::{ @@ -27,6 +26,7 @@ use hermes_core::runtime_components::traits::{ }; use hermes_cosmos_chain_components::types::PacketFilterConfig; use hermes_cosmos_relayer::impls::HandleCosmosError; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::host::types::identifiers::{ChannelId, ClientId, PortId, Sequence}; diff --git a/crates/cosmos/cosmos-wasm-relayer/src/encoding/components.rs b/crates/cosmos/cosmos-wasm-relayer/src/encoding/components.rs index 30a7683025..380636ecda 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/encoding/components.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/encoding/components.rs @@ -1,12 +1,12 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::UseDelegate; - use cgp::prelude::*; use hermes_core::encoding_components::traits::{ ConverterComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent, EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, SchemaGetterComponent, SchemaTypeComponent, }; + use hermes_prelude::*; use hermes_protobuf_encoding_components::traits::EncodedLengthGetterComponent; use hermes_wasm_encoding_components::components::WasmEncodingComponents; diff --git a/crates/cosmos/cosmos-wasm-relayer/src/encoding/convert.rs b/crates/cosmos/cosmos-wasm-relayer/src/encoding/convert.rs index 48ff6dfed7..320edff86a 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/encoding/convert.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/encoding/convert.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::encoding::CosmosClientEncodingComponents; use hermes_cosmos_chain_components::types::{ ProtoTendermintClientState, ProtoTendermintConsensusState, TendermintClientState, TendermintConsensusState, }; +use hermes_prelude::*; use hermes_wasm_encoding_components::components::WasmEncodingComponents; use hermes_wasm_encoding_components::impls::{ DecodeViaWasmConsensusState, EncodeViaWasmConsensusState, diff --git a/crates/cosmos/cosmos-wasm-relayer/src/encoding/encode.rs b/crates/cosmos/cosmos-wasm-relayer/src/encoding/encode.rs index 6bea16cc90..7fde9d3cd1 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/encoding/encode.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/encoding/encode.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::ViaCommitmentProof; use hermes_cosmos_chain_components::encoding::CosmosClientEncodingComponents; use hermes_cosmos_chain_components::types::{ ProtoTendermintClientState, ProtoTendermintConsensusState, TendermintClientState, TendermintConsensusState, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use hermes_wasm_encoding_components::components::WasmEncodingComponents; use hermes_wasm_encoding_components::types::{ diff --git a/crates/cosmos/cosmos-wasm-relayer/src/encoding/encode_mut.rs b/crates/cosmos/cosmos-wasm-relayer/src/encoding/encode_mut.rs index 6685012c87..decfab63f4 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/encoding/encode_mut.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/encoding/encode_mut.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use hermes_wasm_encoding_components::components::WasmEncodingComponents; use hermes_wasm_encoding_components::types::{ diff --git a/crates/cosmos/cosmos-wasm-relayer/src/encoding/type_url.rs b/crates/cosmos/cosmos-wasm-relayer/src/encoding/type_url.rs index 8d0055f02f..511924d8a7 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/encoding/type_url.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/encoding/type_url.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::encoding::CosmosClientEncodingComponents; use hermes_cosmos_chain_components::types::{TendermintClientState, TendermintConsensusState}; +use hermes_prelude::*; use hermes_wasm_encoding_components::components::WasmEncodingComponents; use hermes_wasm_encoding_components::types::{ WasmClientMessage, WasmClientState, WasmConsensusState, diff --git a/crates/cosmos/cosmos-wasm-relayer/src/impls/client_state.rs b/crates/cosmos/cosmos-wasm-relayer/src/impls/client_state.rs index 4d8d95a879..d1bdac0ba3 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/impls/client_state.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/impls/client_state.rs @@ -1,10 +1,10 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ ClientStateFieldsComponent, ClientStateFieldsGetter, ClientStateTypeComponent, HasChainIdType, HasClientStateType, HasHeightType, ProvideClientStateType, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::ChainId; diff --git a/crates/cosmos/cosmos-wasm-relayer/src/impls/create_client_message.rs b/crates/cosmos/cosmos-wasm-relayer/src/impls/create_client_message.rs index fde2c0a223..0c5bb27f5b 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/impls/create_client_message.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/impls/create_client_message.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvert, CanEncode, HasDefaultEncoding, HasEncodedType, }; @@ -12,6 +11,7 @@ use hermes_cosmos_chain_components::types::{ CosmosCreateClientMessage, CosmosCreateClientPayload, TendermintClientState, TendermintConsensusState, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::strategy::ViaAny; use hermes_wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; use ibc::core::client::types::Height; diff --git a/crates/cosmos/cosmos-wasm-relayer/src/impls/update_client_message.rs b/crates/cosmos/cosmos-wasm-relayer/src/impls/update_client_message.rs index 8a09abfbe8..89bf423aa0 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/impls/update_client_message.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/impls/update_client_message.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ HasIbcChainTypes, HasUpdateClientPayloadType, UpdateClientMessageBuilder, UpdateClientMessageBuilderComponent, }; use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; use hermes_cosmos_chain_components::types::{CosmosUpdateClientMessage, CosmosUpdateClientPayload}; +use hermes_prelude::*; use ibc::clients::wasm_types::client_message::{ClientMessage, WASM_CLIENT_MESSAGE_TYPE_URL}; use ibc::core::host::types::identifiers::ClientId; use ibc_proto::google::protobuf::Any as IbcProtoAny; diff --git a/crates/cosmos/cosmos-wasm-relayer/src/types/client_state.rs b/crates/cosmos/cosmos-wasm-relayer/src/types/client_state.rs index 793fca8e23..b5f3cd78b8 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/types/client_state.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/types/client_state.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvert, CanDecode, CanEncode, Converter, ConverterComponent, HasEncodedType, }; use hermes_cosmos_chain_components::types::TendermintClientState; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::strategy::ViaAny; use hermes_wasm_encoding_components::types::WasmClientState; use ibc::core::client::types::Height; diff --git a/crates/cosmos/cosmos-wasm-relayer/src/types/create_client.rs b/crates/cosmos/cosmos-wasm-relayer/src/types/create_client.rs index 43a976e8ed..0f7ae5a4d3 100644 --- a/crates/cosmos/cosmos-wasm-relayer/src/types/create_client.rs +++ b/crates/cosmos/cosmos-wasm-relayer/src/types/create_client.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ CreateClientMessageOptionsTypeComponent, ProvideCreateClientMessageOptionsType, }; +use hermes_prelude::*; #[derive(Clone)] pub struct CreateWasmTendermintMessageOptions { diff --git a/crates/encoding/encoding-components/Cargo.toml b/crates/encoding/encoding-components/Cargo.toml index a84033d622..f83bc67159 100644 --- a/crates/encoding/encoding-components/Cargo.toml +++ b/crates/encoding/encoding-components/Cargo.toml @@ -12,4 +12,5 @@ description = """ """ [dependencies] -cgp = { workspace = true, default-features = false } +cgp = { workspace = true } +hermes-prelude = { workspace = true } diff --git a/crates/encoding/encoding-components/src/impls/convert.rs b/crates/encoding/encoding-components/src/impls/convert.rs index 27358df0c8..1787a46207 100644 --- a/crates/encoding/encoding-components/src/impls/convert.rs +++ b/crates/encoding/encoding-components/src/impls/convert.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{Converter, ConverterComponent}; diff --git a/crates/encoding/encoding-components/src/impls/default_encoding.rs b/crates/encoding/encoding-components/src/impls/default_encoding.rs index 1a66dbfb6e..e217a66b09 100644 --- a/crates/encoding/encoding-components/src/impls/default_encoding.rs +++ b/crates/encoding/encoding-components/src/impls/default_encoding.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{EncodingGetter, EncodingGetterComponent, HasDefaultEncoding}; diff --git a/crates/encoding/encoding-components/src/impls/delegate.rs b/crates/encoding/encoding-components/src/impls/delegate.rs index 48c51b1bd8..0c01dc9c50 100644 --- a/crates/encoding/encoding-components/src/impls/delegate.rs +++ b/crates/encoding/encoding-components/src/impls/delegate.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::component::UseDelegate; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ Converter, ConverterComponent, Decoder, DecoderComponent, Encoder, EncoderComponent, diff --git a/crates/encoding/encoding-components/src/impls/encode/convert_and_encode.rs b/crates/encoding/encoding-components/src/impls/encode/convert_and_encode.rs index 3a8ba3569a..ba6a006943 100644 --- a/crates/encoding/encoding-components/src/impls/encode/convert_and_encode.rs +++ b/crates/encoding/encoding-components/src/impls/encode/convert_and_encode.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ CanConvert, CanDecode, CanEncode, Decoder, DecoderComponent, Encoder, EncoderComponent, diff --git a/crates/encoding/encoding-components/src/impls/encode/return_encoded.rs b/crates/encoding/encoding-components/src/impls/encode/return_encoded.rs index 209924d552..de16d11107 100644 --- a/crates/encoding/encoding-components/src/impls/encode/return_encoded.rs +++ b/crates/encoding/encoding-components/src/impls/encode/return_encoded.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{Decoder, DecoderComponent, Encoder, EncoderComponent, HasEncodedType}; diff --git a/crates/encoding/encoding-components/src/impls/encode/use_strategy.rs b/crates/encoding/encoding-components/src/impls/encode/use_strategy.rs index e88833729a..c3f819a2f2 100644 --- a/crates/encoding/encoding-components/src/impls/encode/use_strategy.rs +++ b/crates/encoding/encoding-components/src/impls/encode/use_strategy.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{CanDecode, CanEncode, Decoder, DecoderComponent, Encoder, EncoderComponent}; diff --git a/crates/encoding/encoding-components/src/impls/encode_mut/combine.rs b/crates/encoding/encoding-components/src/impls/encode_mut/combine.rs index 899ae184d8..93e9dbc400 100644 --- a/crates/encoding/encoding-components/src/impls/encode_mut/combine.rs +++ b/crates/encoding/encoding-components/src/impls/encode_mut/combine.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, diff --git a/crates/encoding/encoding-components/src/impls/encode_mut/field.rs b/crates/encoding/encoding-components/src/impls/encode_mut/field.rs index 3aece22d5a..c8a04f910b 100644 --- a/crates/encoding/encoding-components/src/impls/encode_mut/field.rs +++ b/crates/encoding/encoding-components/src/impls/encode_mut/field.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::component::UseContext; use cgp::core::field::FieldGetter; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasEncodeBufferType, MutEncoder, MutEncoderComponent}; diff --git a/crates/encoding/encoding-components/src/impls/encode_mut/from.rs b/crates/encoding/encoding-components/src/impls/encode_mut/from.rs index 9888fad512..a29ee0bddd 100644 --- a/crates/encoding/encoding-components/src/impls/encode_mut/from.rs +++ b/crates/encoding/encoding-components/src/impls/encode_mut/from.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{HasDecodeBufferType, MutDecoder, MutDecoderComponent, Transformer}; diff --git a/crates/encoding/encoding-components/src/impls/encode_mut/pair.rs b/crates/encoding/encoding-components/src/impls/encode_mut/pair.rs index 23bf812529..585ab8c38c 100644 --- a/crates/encoding/encoding-components/src/impls/encode_mut/pair.rs +++ b/crates/encoding/encoding-components/src/impls/encode_mut/pair.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, diff --git a/crates/encoding/encoding-components/src/impls/encode_mut/unit.rs b/crates/encoding/encoding-components/src/impls/encode_mut/unit.rs index 59d185c4ee..83b2846512 100644 --- a/crates/encoding/encoding-components/src/impls/encode_mut/unit.rs +++ b/crates/encoding/encoding-components/src/impls/encode_mut/unit.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, diff --git a/crates/encoding/encoding-components/src/impls/fields.rs b/crates/encoding/encoding-components/src/impls/fields.rs index ee8d671aad..f923d22e71 100644 --- a/crates/encoding/encoding-components/src/impls/fields.rs +++ b/crates/encoding/encoding-components/src/impls/fields.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ CanDecodeMut, CanEncodeMut, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, diff --git a/crates/encoding/encoding-components/src/impls/tagged.rs b/crates/encoding/encoding-components/src/impls/tagged.rs index 7f18144447..8d7db2d578 100644 --- a/crates/encoding/encoding-components/src/impls/tagged.rs +++ b/crates/encoding/encoding-components/src/impls/tagged.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, diff --git a/crates/encoding/encoding-components/src/impls/types/encoded.rs b/crates/encoding/encoding-components/src/impls/types/encoded.rs index 4e9dfda247..6912b63460 100644 --- a/crates/encoding/encoding-components/src/impls/types/encoded.rs +++ b/crates/encoding/encoding-components/src/impls/types/encoded.rs @@ -1,6 +1,6 @@ use alloc::vec::Vec; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{EncodedTypeComponent, ProvideEncodedType}; diff --git a/crates/encoding/encoding-components/src/impls/types/schema.rs b/crates/encoding/encoding-components/src/impls/types/schema.rs index 9eeb71e61a..110a9f46f0 100644 --- a/crates/encoding/encoding-components/src/impls/types/schema.rs +++ b/crates/encoding/encoding-components/src/impls/types/schema.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ProvideSchemaType, SchemaTypeComponent}; diff --git a/crates/encoding/encoding-components/src/impls/with_context.rs b/crates/encoding/encoding-components/src/impls/with_context.rs index 1270e06210..83edabda30 100644 --- a/crates/encoding/encoding-components/src/impls/with_context.rs +++ b/crates/encoding/encoding-components/src/impls/with_context.rs @@ -1,5 +1,5 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ CanConvert, CanDecode, CanDecodeMut, CanEncode, CanEncodeMut, Converter, ConverterComponent, diff --git a/crates/encoding/encoding-components/src/traits/convert.rs b/crates/encoding/encoding-components/src/traits/convert.rs index c2384f6e7c..d38ffadf0a 100644 --- a/crates/encoding/encoding-components/src/traits/convert.rs +++ b/crates/encoding/encoding-components/src/traits/convert.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: Converter, diff --git a/crates/encoding/encoding-components/src/traits/decode.rs b/crates/encoding/encoding-components/src/traits/decode.rs index 288d25ede8..3f19b14e92 100644 --- a/crates/encoding/encoding-components/src/traits/decode.rs +++ b/crates/encoding/encoding-components/src/traits/decode.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasEncodedType; diff --git a/crates/encoding/encoding-components/src/traits/decode_mut.rs b/crates/encoding/encoding-components/src/traits/decode_mut.rs index dcf64ad012..c1232d0aca 100644 --- a/crates/encoding/encoding-components/src/traits/decode_mut.rs +++ b/crates/encoding/encoding-components/src/traits/decode_mut.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasDecodeBufferType; diff --git a/crates/encoding/encoding-components/src/traits/encode.rs b/crates/encoding/encoding-components/src/traits/encode.rs index f269d68e67..2499cb2e0d 100644 --- a/crates/encoding/encoding-components/src/traits/encode.rs +++ b/crates/encoding/encoding-components/src/traits/encode.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasEncodedType; diff --git a/crates/encoding/encoding-components/src/traits/encode_mut.rs b/crates/encoding/encoding-components/src/traits/encode_mut.rs index 70fcbe53da..839e8e86f9 100644 --- a/crates/encoding/encoding-components/src/traits/encode_mut.rs +++ b/crates/encoding/encoding-components/src/traits/encode_mut.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasEncodeBufferType; diff --git a/crates/encoding/encoding-components/src/traits/has_encoding.rs b/crates/encoding/encoding-components/src/traits/has_encoding.rs index 5d122c6230..1a79c69565 100644 --- a/crates/encoding/encoding-components/src/traits/has_encoding.rs +++ b/crates/encoding/encoding-components/src/traits/has_encoding.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type { name: EncodingTypeProviderComponent diff --git a/crates/encoding/encoding-components/src/traits/schema.rs b/crates/encoding/encoding-components/src/traits/schema.rs index 1268989b24..bc4061ace0 100644 --- a/crates/encoding/encoding-components/src/traits/schema.rs +++ b/crates/encoding/encoding-components/src/traits/schema.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasSchemaType; diff --git a/crates/encoding/encoding-components/src/traits/types/decode_buffer.rs b/crates/encoding/encoding-components/src/traits/types/decode_buffer.rs index 6d25482739..9be70c770d 100644 --- a/crates/encoding/encoding-components/src/traits/types/decode_buffer.rs +++ b/crates/encoding/encoding-components/src/traits/types/decode_buffer.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasEncodedType; diff --git a/crates/encoding/encoding-components/src/traits/types/encode_buffer.rs b/crates/encoding/encoding-components/src/traits/types/encode_buffer.rs index 4322eba156..340e719941 100644 --- a/crates/encoding/encoding-components/src/traits/types/encode_buffer.rs +++ b/crates/encoding/encoding-components/src/traits/types/encode_buffer.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasEncodedType; diff --git a/crates/encoding/encoding-components/src/traits/types/encoded.rs b/crates/encoding/encoding-components/src/traits/types/encoded.rs index 0524c72267..8d9f2dc314 100644 --- a/crates/encoding/encoding-components/src/traits/types/encoded.rs +++ b/crates/encoding/encoding-components/src/traits/types/encoded.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: EncodedTypeComponent, diff --git a/crates/encoding/encoding-components/src/traits/types/schema.rs b/crates/encoding/encoding-components/src/traits/types/schema.rs index 0f8eccf17c..e4797e898c 100644 --- a/crates/encoding/encoding-components/src/traits/types/schema.rs +++ b/crates/encoding/encoding-components/src/traits/types/schema.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: SchemaTypeComponent, diff --git a/crates/encoding/protobuf-encoding-components/Cargo.toml b/crates/encoding/protobuf-encoding-components/Cargo.toml index e6cf07fd5a..91f0c91351 100644 --- a/crates/encoding/protobuf-encoding-components/Cargo.toml +++ b/crates/encoding/protobuf-encoding-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-encoding-components = { workspace = true } prost = { workspace = true } diff --git a/crates/encoding/protobuf-encoding-components/src/components.rs b/crates/encoding/protobuf-encoding-components/src/components.rs index 5dd2148842..3fb2d7bf4f 100644 --- a/crates/encoding/protobuf-encoding-components/src/components.rs +++ b/crates/encoding/protobuf-encoding-components/src/components.rs @@ -1,13 +1,13 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::UseDelegate; - use cgp::prelude::*; use hermes_encoding_components::impls::{ProvideEncodedBytes, ProvideStringSchema}; use hermes_encoding_components::traits::{ DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent, EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, SchemaTypeComponent, }; + use hermes_prelude::*; use prost_types::Any; use crate::impls::encode::buffer::EncodeProtoWithMutBuffer; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/any.rs b/crates/encoding/protobuf-encoding-components/src/impls/any.rs index 74f393e71e..60fdaee104 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/any.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/any.rs @@ -1,11 +1,11 @@ use core::fmt::Display; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{ Converter, ConverterComponent, Decoder, DecoderComponent, Encoder, EncoderComponent, HasEncodedType, HasSchema, }; +use hermes_prelude::*; use prost::{DecodeError, Message}; use prost_types::Any; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode/buffer.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode/buffer.rs index de6826cff8..a442781ef5 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode/buffer.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode/buffer.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, Decoder, DecoderComponent, Encoder, EncoderComponent, HasEncodeBufferType, HasEncodedType, }; +use hermes_prelude::*; use crate::impls::encode_mut::chunk::{CanDecodeProtoChunks, HasProtoChunksDecodeBuffer}; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/any.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/any.rs index a81767d2d6..e4cb04c5b9 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/any.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/any.rs @@ -1,9 +1,9 @@ use core::marker::PhantomData; use cgp::core::field::FieldGetter; -use cgp::prelude::*; use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeFieldWithGetter}; use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer}; +use hermes_prelude::*; use prost_types::Any; use crate::impls::encode_mut::proto_field::bytes::EncodeByteField; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/chunk.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/chunk.rs index 244ff37d99..6d6c615f23 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/chunk.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/chunk.rs @@ -1,8 +1,8 @@ use core::array::TryFromSliceError; use std::collections::BTreeMap; -use cgp::prelude::{CanRaiseAsyncError, HasAsyncErrorType}; use hermes_encoding_components::traits::HasDecodeBufferType; +use hermes_prelude::{CanRaiseAsyncError, HasAsyncErrorType}; use prost::bytes::Buf; use prost::encoding::{decode_key, decode_varint, WireType}; use prost::DecodeError; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/message.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/message.rs index 1fbdc8f7b8..492099b6f3 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/message.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/message.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use prost::bytes::BufMut; use prost::encoding::{encode_varint, WireType}; use prost::{DecodeError, Message}; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/option.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/option.rs index 0c7bdf6415..aecd938601 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/option.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/option.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{HasEncodeBufferType, MutEncoder, MutEncoderComponent}; +use hermes_prelude::*; pub struct EncodeOption(pub PhantomData); diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/bytes.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/bytes.rs index f64463c339..eff186a3f9 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/bytes.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/bytes.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use prost::bytes::BufMut; use crate::impls::encode_mut::chunk::{HasProtoChunksDecodeBuffer, InvalidWireType, ProtoChunks}; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/decode_optional.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/decode_optional.rs index 20e5a2f9c1..8ad3504e76 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/decode_optional.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/decode_optional.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{MutDecoder, MutDecoderComponent}; +use hermes_prelude::*; use crate::impls::encode_mut::chunk::{ CanDecodeProtoChunks, HasProtoChunksDecodeBuffer, InvalidWireType, ProtoChunks, diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/decode_required.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/decode_required.rs index 7be83b132f..6ea63e729f 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/decode_required.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/decode_required.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{MutDecoder, MutDecoderComponent}; +use hermes_prelude::*; use crate::impls::encode_mut::chunk::{ CanDecodeProtoChunks, HasProtoChunksDecodeBuffer, InvalidWireType, ProtoChunks, diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/encode.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/encode.rs index 72a493289c..4d9d4e5488 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/encode.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/encode.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{HasEncodeBufferType, MutEncoder, MutEncoderComponent}; +use hermes_prelude::*; use crate::impls::encode_mut::proto_field::length_delim::EncodeLengthDelimitedHeader; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/encode_len.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/encode_len.rs index 1fbd46c0e3..a9f0309b5b 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/encode_len.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/encode_len.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{HasEncodeBufferType, MutEncoder, MutEncoderComponent}; +use hermes_prelude::*; use prost::bytes::BufMut; use prost::encoding::{encode_key, encode_varint, encoded_len_varint, key_len, WireType}; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/length_delim.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/length_delim.rs index 5b9edc39c6..22688ebf14 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/length_delim.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/length_delim.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{HasEncodeBufferType, MutEncoder, MutEncoderComponent}; +use hermes_prelude::*; use prost::bytes::BufMut; use prost::encoding::{encode_key, encode_varint, WireType}; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/string.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/string.rs index 553432c54d..19126ea069 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/string.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/string.rs @@ -1,9 +1,9 @@ use core::str::{self, Utf8Error}; -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasDecodeBufferType, MutDecoder, MutDecoderComponent, MutEncoderComponent, }; +use hermes_prelude::*; use crate::impls::encode_mut::proto_field::bytes::EncodeByteField; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/u64.rs b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/u64.rs index 684eda892d..71f030d9e7 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/u64.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/encode_mut/proto_field/u64.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use prost::bytes::BufMut; use prost::encoding::{encode_key, encode_varint, WireType}; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/protobuf.rs b/crates/encoding/protobuf-encoding-components/src/impls/protobuf.rs index d355f1624b..8c38514d07 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/protobuf.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/protobuf.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ Decoder, DecoderComponent, Encoder, EncoderComponent, HasEncodedType, }; +use hermes_prelude::*; use prost::{DecodeError, Message}; pub struct EncodeAsProtobuf; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/types/decode_buffer.rs b/crates/encoding/protobuf-encoding-components/src/impls/types/decode_buffer.rs index 52b468d5b9..6b0a36821d 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/types/decode_buffer.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/types/decode_buffer.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ DecodeBufferTypeComponent, HasEncodedType, ProvideDecodeBufferType, }; +use hermes_prelude::*; use crate::impls::encode_mut::chunk::{CanDecodeProtoChunks, ProtoChunks}; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/types/encode_buffer.rs b/crates/encoding/protobuf-encoding-components/src/impls/types/encode_buffer.rs index fa15d8ccb7..efe5dfe2b3 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/types/encode_buffer.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/types/encode_buffer.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ EncodeBufferTypeComponent, HasEncodedType, ProvideEncodeBufferType, }; +use hermes_prelude::*; pub struct ProvideBytesEncodeBuffer; diff --git a/crates/encoding/protobuf-encoding-components/src/impls/via_any.rs b/crates/encoding/protobuf-encoding-components/src/impls/via_any.rs index 70cd6c448b..70e0b4c448 100644 --- a/crates/encoding/protobuf-encoding-components/src/impls/via_any.rs +++ b/crates/encoding/protobuf-encoding-components/src/impls/via_any.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_encoding_components::traits::{ Decoder, DecoderComponent, Encoder, EncoderComponent, HasEncodedType, }; +use hermes_prelude::*; use crate::impls::any::{DecodeAsAnyProtobuf, EncodeAsAnyProtobuf}; diff --git a/crates/encoding/protobuf-encoding-components/src/traits/length.rs b/crates/encoding/protobuf-encoding-components/src/traits/length.rs index 61b80e6014..f9b4f543db 100644 --- a/crates/encoding/protobuf-encoding-components/src/traits/length.rs +++ b/crates/encoding/protobuf-encoding-components/src/traits/length.rs @@ -1,5 +1,5 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: EncodedLengthGetter, diff --git a/crates/error/Cargo.toml b/crates/error/Cargo.toml index 216de1757f..5fc7b76118 100644 --- a/crates/error/Cargo.toml +++ b/crates/error/Cargo.toml @@ -14,5 +14,6 @@ description = """ [dependencies] eyre = { workspace = true } cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-relayer-components = { workspace = true } hermes-core = { workspace = true } diff --git a/crates/error/src/handlers/debug.rs b/crates/error/src/handlers/debug.rs index 796624a45c..ab6cf4caae 100644 --- a/crates/error/src/handlers/debug.rs +++ b/crates/error/src/handlers/debug.rs @@ -2,8 +2,8 @@ use alloc::sync::Arc; use core::fmt::Debug; use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent}; -use cgp::prelude::*; use eyre::eyre; +use hermes_prelude::*; use crate::types::{Error, ErrorDetail}; diff --git a/crates/error/src/handlers/display.rs b/crates/error/src/handlers/display.rs index 01046f0cb8..dfb6798dae 100644 --- a/crates/error/src/handlers/display.rs +++ b/crates/error/src/handlers/display.rs @@ -2,8 +2,8 @@ use alloc::sync::Arc; use core::fmt::Display; use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent}; -use cgp::prelude::*; use eyre::eyre; +use hermes_prelude::*; use crate::types::{Error, ErrorDetail}; diff --git a/crates/error/src/handlers/identity.rs b/crates/error/src/handlers/identity.rs index 07b6224b2a..5ed0f8dbbb 100644 --- a/crates/error/src/handlers/identity.rs +++ b/crates/error/src/handlers/identity.rs @@ -1,5 +1,5 @@ use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent, HasAsyncErrorType}; -use cgp::prelude::*; +use hermes_prelude::*; use crate::types::Error; diff --git a/crates/error/src/handlers/infallible.rs b/crates/error/src/handlers/infallible.rs index 0d322426e0..6a95f72591 100644 --- a/crates/error/src/handlers/infallible.rs +++ b/crates/error/src/handlers/infallible.rs @@ -1,7 +1,7 @@ use core::convert::Infallible; use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent, HasAsyncErrorType}; -use cgp::prelude::*; +use hermes_prelude::*; pub struct HandleInfallible; diff --git a/crates/error/src/handlers/report.rs b/crates/error/src/handlers/report.rs index 9c660fd1b6..26c1272248 100644 --- a/crates/error/src/handlers/report.rs +++ b/crates/error/src/handlers/report.rs @@ -1,8 +1,8 @@ use alloc::sync::Arc; use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent, HasAsyncErrorType}; -use cgp::prelude::*; use eyre::Report; +use hermes_prelude::*; use crate::types::{Error, ErrorDetail}; diff --git a/crates/error/src/handlers/wrap.rs b/crates/error/src/handlers/wrap.rs index 8287c2e905..cc4258cee7 100644 --- a/crates/error/src/handlers/wrap.rs +++ b/crates/error/src/handlers/wrap.rs @@ -3,7 +3,7 @@ use alloc::sync::Arc; use core::fmt::Debug; use cgp::core::error::{ErrorWrapper, ErrorWrapperComponent, HasAsyncErrorType}; -use cgp::prelude::*; +use hermes_prelude::*; use crate::types::{Error, ErrorDetail}; diff --git a/crates/error/src/impls.rs b/crates/error/src/impls.rs index 4bec6e436a..b984e42b64 100644 --- a/crates/error/src/impls.rs +++ b/crates/error/src/impls.rs @@ -1,6 +1,6 @@ use cgp::core::error::{ErrorTypeProviderComponent, ErrorWrapperComponent, HasAsyncErrorType}; use cgp::core::types::WithType; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::error::traits::{ProvideRetryableError, RetryableErrorComponent}; use crate::handlers::WrapErrorDetail; diff --git a/crates/ibc/ibc-components/Cargo.toml b/crates/ibc/ibc-components/Cargo.toml index ad21b62a77..84cf4a9fac 100644 --- a/crates/ibc/ibc-components/Cargo.toml +++ b/crates/ibc/ibc-components/Cargo.toml @@ -12,6 +12,7 @@ description = """ """ [dependencies] -cgp = { workspace = true, default-features = false } +cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-chain-type-components = { workspace = true } hermes-encoding-components = { workspace = true } diff --git a/crates/ibc/ibc-components/src/components/chain.rs b/crates/ibc/ibc-components/src/components/chain.rs index 4d91fe6e70..038d71c338 100644 --- a/crates/ibc/ibc-components/src/components/chain.rs +++ b/crates/ibc/ibc-components/src/components/chain.rs @@ -1,7 +1,7 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::WithContext; - use cgp::prelude::*; + use hermes_prelude::*; use crate::impls::handlers::incoming::packet::full::FullIncomingPacketHandler; use crate::impls::handlers::outgoing::packet::build::AllocateNonceAndBuildPacket; diff --git a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/commit.rs b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/commit.rs index 762d8f1182..cfefb2f92c 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/commit.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/commit.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::commitment::path::receive_packet::CanBuildReceivePacketCommitmentPath; use crate::traits::commitment::store::CanStoreCommitment; diff --git a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/full.rs b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/full.rs index b4af7c8cb7..d478d5fcf3 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/full.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/full.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; // use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; // use crate::impls::handlers::incoming::packet::error_ack::WrapHandlerErrorAsAck; use crate::impls::handlers::incoming::packet::commit::CommitReceivePacket; diff --git a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/ignore_replay.rs b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/ignore_replay.rs index e0a2225c21..cead780d90 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/ignore_replay.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/ignore_replay.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::fields::packet::header::channel_id::HasPacketChannelIds; use crate::traits::fields::packet::packet::header::HasPacketHeader; diff --git a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/no_replay.rs b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/no_replay.rs index 3804c08c49..eb3bc5f81b 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/no_replay.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/no_replay.rs @@ -1,8 +1,8 @@ use core::fmt::Debug; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::fields::packet::header::channel_id::HasPacketChannelIds; use crate::traits::fields::packet::packet::header::HasPacketHeader; diff --git a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/payloads.rs b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/payloads.rs index a992bd215e..a002bb1ce7 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/payloads.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/payloads.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::fields::packet::packet::header::HasPacketHeader; use crate::traits::fields::packet::packet::payloads::HasPacketPayloads; diff --git a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/timeout.rs b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/timeout.rs index 5c686921ba..5fa011069a 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/timeout.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/timeout.rs @@ -1,8 +1,8 @@ use core::fmt::Debug; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasTimeType; +use hermes_prelude::*; use crate::traits::fields::packet::header::timeout::HasPacketTimeout; use crate::traits::fields::packet::packet::header::HasPacketHeader; diff --git a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/verify_commitment.rs b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/verify_commitment.rs index 9b1b7a8f1c..0573d3faeb 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/verify_commitment.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/incoming/packet/verify_commitment.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasConsensusStateType, HasHeightType}; +use hermes_prelude::*; use crate::traits::commitment::path::send_packet::CanBuildSendPacketCommitmentPath; use crate::traits::commitment::value::send_packet::CanBuildSendPacketCommitmentValue; diff --git a/crates/ibc/ibc-components/src/impls/handlers/incoming/payload/convert.rs b/crates/ibc/ibc-components/src/impls/handlers/incoming/payload/convert.rs index fdfebb0d0b..2d85624d68 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/incoming/payload/convert.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/incoming/payload/convert.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; use cgp::core::error::ErrorOf; -use cgp::prelude::*; use hermes_encoding_components::traits::{CanConvert, HasDefaultEncoding, HasEncoding}; +use hermes_prelude::*; use crate::traits::handlers::incoming::payload::{ IncomingPayloadHandler, IncomingPayloadHandlerComponent, diff --git a/crates/ibc/ibc-components/src/impls/handlers/outgoing/message/convert.rs b/crates/ibc/ibc-components/src/impls/handlers/outgoing/message/convert.rs index 8d91fe695c..11a29f5d9e 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/outgoing/message/convert.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/outgoing/message/convert.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; use cgp::core::error::ErrorOf; -use cgp::prelude::*; use hermes_encoding_components::traits::{CanConvert, HasEncoding}; +use hermes_prelude::*; use crate::traits::handlers::outgoing::message::{IbcMessageHandler, IbcMessageHandlerComponent}; use crate::traits::types::message::HasIbcMessageType; diff --git a/crates/ibc/ibc-components/src/impls/handlers/outgoing/message/validate_header.rs b/crates/ibc/ibc-components/src/impls/handlers/outgoing/message/validate_header.rs index 9551ff186f..73e2629e97 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/outgoing/message/validate_header.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/outgoing/message/validate_header.rs @@ -1,7 +1,7 @@ use core::fmt::Debug; use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::fields::message::app_id::HasIbcMessageAppIds; use crate::traits::fields::payload::app_id::HasPayloadAppIds; diff --git a/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/build.rs b/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/build.rs index 6737046283..69d91106a1 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/build.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/build.rs @@ -1,7 +1,7 @@ use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::builders::packet::CanBuildPacket; use crate::traits::fields::packet::header::channel_id::HasPacketChannelIds; diff --git a/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/commit.rs b/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/commit.rs index d1cdabe3ab..8f90f52414 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/commit.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/commit.rs @@ -1,8 +1,8 @@ use alloc::vec::Vec; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::commitment::path::send_packet::CanBuildSendPacketCommitmentPath; use crate::traits::commitment::store::CanStoreCommitment; diff --git a/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/permission.rs b/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/permission.rs index 179b4a348f..5f26b38bbd 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/permission.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/outgoing/packet/permission.rs @@ -1,7 +1,7 @@ use alloc::vec::Vec; use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::fields::caller::HasCaller; use crate::traits::fields::payload::header::HasPayloadHeader; diff --git a/crates/ibc/ibc-components/src/impls/handlers/outgoing/transaction/send.rs b/crates/ibc/ibc-components/src/impls/handlers/outgoing/transaction/send.rs index 62cc81f2e8..6f35a2a71e 100644 --- a/crates/ibc/ibc-components/src/impls/handlers/outgoing/transaction/send.rs +++ b/crates/ibc/ibc-components/src/impls/handlers/outgoing/transaction/send.rs @@ -1,8 +1,8 @@ use alloc::vec::Vec; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::builders::payload::CanBuildPayload; use crate::traits::fields::packet::header::channel_id::HasPacketChannelIds; diff --git a/crates/ibc/ibc-components/src/traits/builders/packet.rs b/crates/ibc/ibc-components/src/traits/builders/packet.rs index 68bb81b7c7..373065c6ff 100644 --- a/crates/ibc/ibc-components/src/traits/builders/packet.rs +++ b/crates/ibc/ibc-components/src/traits/builders/packet.rs @@ -1,6 +1,6 @@ use alloc::vec::Vec; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::packet::header::HasPacketHeaderType; use crate::traits::types::packet::nonce::HasPacketNonceType; diff --git a/crates/ibc/ibc-components/src/traits/builders/payload.rs b/crates/ibc/ibc-components/src/traits/builders/payload.rs index 5ed480c173..ce3141bf39 100644 --- a/crates/ibc/ibc-components/src/traits/builders/payload.rs +++ b/crates/ibc/ibc-components/src/traits/builders/payload.rs @@ -1,4 +1,4 @@ -use cgp::prelude::HasAsyncErrorType; +use hermes_prelude::HasAsyncErrorType; use crate::traits::types::payload::data::HasPayloadDataType; use crate::traits::types::payload::header::HasPayloadHeaderType; diff --git a/crates/ibc/ibc-components/src/traits/commitment/path/receive_packet.rs b/crates/ibc/ibc-components/src/traits/commitment/path/receive_packet.rs index 3c91b06eee..0855d9b183 100644 --- a/crates/ibc/ibc-components/src/traits/commitment/path/receive_packet.rs +++ b/crates/ibc/ibc-components/src/traits/commitment/path/receive_packet.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::types::commitment::path::HasCommitmentPathType; use crate::traits::types::packet::nonce::HasPacketNonceType; diff --git a/crates/ibc/ibc-components/src/traits/commitment/path/send_packet.rs b/crates/ibc/ibc-components/src/traits/commitment/path/send_packet.rs index 90710450c5..da46302259 100644 --- a/crates/ibc/ibc-components/src/traits/commitment/path/send_packet.rs +++ b/crates/ibc/ibc-components/src/traits/commitment/path/send_packet.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::types::commitment::path::HasCommitmentPathType; use crate::traits::types::packet::nonce::HasPacketNonceType; diff --git a/crates/ibc/ibc-components/src/traits/commitment/store.rs b/crates/ibc/ibc-components/src/traits/commitment/store.rs index 6f67a74003..ebecc2adca 100644 --- a/crates/ibc/ibc-components/src/traits/commitment/store.rs +++ b/crates/ibc/ibc-components/src/traits/commitment/store.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::commitment::path::HasCommitmentPathType; use crate::traits::types::commitment::value::HasCommitmentValueType; diff --git a/crates/ibc/ibc-components/src/traits/commitment/value/receive_packet.rs b/crates/ibc/ibc-components/src/traits/commitment/value/receive_packet.rs index 7e00fe99c2..d775d75cd6 100644 --- a/crates/ibc/ibc-components/src/traits/commitment/value/receive_packet.rs +++ b/crates/ibc/ibc-components/src/traits/commitment/value/receive_packet.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::commitment::value::HasCommitmentValueType; use crate::traits::types::packet::packet::HasPacketType; diff --git a/crates/ibc/ibc-components/src/traits/commitment/value/send_packet.rs b/crates/ibc/ibc-components/src/traits/commitment/value/send_packet.rs index 1d5cecda1a..0894fc1a8c 100644 --- a/crates/ibc/ibc-components/src/traits/commitment/value/send_packet.rs +++ b/crates/ibc/ibc-components/src/traits/commitment/value/send_packet.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::commitment::value::HasCommitmentValueType; use crate::traits::types::packet::packet::HasPacketType; diff --git a/crates/ibc/ibc-components/src/traits/commitment/verify.rs b/crates/ibc/ibc-components/src/traits/commitment/verify.rs index 8ae8584604..40aae6158d 100644 --- a/crates/ibc/ibc-components/src/traits/commitment/verify.rs +++ b/crates/ibc/ibc-components/src/traits/commitment/verify.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasConsensusStateType}; +use hermes_prelude::*; use crate::traits::types::commitment::path::HasCommitmentPathType; use crate::traits::types::commitment::proof::HasCommitmentProofType; diff --git a/crates/ibc/ibc-components/src/traits/fields/caller.rs b/crates/ibc/ibc-components/src/traits/fields/caller.rs index d39a2ba100..52a2ff0fc4 100644 --- a/crates/ibc/ibc-components/src/traits/fields/caller.rs +++ b/crates/ibc/ibc-components/src/traits/fields/caller.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAddressType; +use hermes_prelude::*; /** A global-level caller associated with the abstract chain context. diff --git a/crates/ibc/ibc-components/src/traits/fields/commitment/proof_height.rs b/crates/ibc/ibc-components/src/traits/fields/commitment/proof_height.rs index f4a0315210..25722ad58b 100644 --- a/crates/ibc/ibc-components/src/traits/fields/commitment/proof_height.rs +++ b/crates/ibc/ibc-components/src/traits/fields/commitment/proof_height.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasHeightType; +use hermes_prelude::*; use crate::traits::types::commitment::proof::HasCommitmentProofType; diff --git a/crates/ibc/ibc-components/src/traits/fields/message/app_id.rs b/crates/ibc/ibc-components/src/traits/fields/message/app_id.rs index c3800ac214..6176a67ba8 100644 --- a/crates/ibc/ibc-components/src/traits/fields/message/app_id.rs +++ b/crates/ibc/ibc-components/src/traits/fields/message/app_id.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::app_id::HasAppIdType; use crate::traits::types::message_header::HasIbcMessageHeaderType; diff --git a/crates/ibc/ibc-components/src/traits/fields/packet/header/channel_id.rs b/crates/ibc/ibc-components/src/traits/fields/packet/header/channel_id.rs index bebd4ba5ec..6c9d4f7ead 100644 --- a/crates/ibc/ibc-components/src/traits/fields/packet/header/channel_id.rs +++ b/crates/ibc/ibc-components/src/traits/fields/packet/header/channel_id.rs @@ -2,8 +2,8 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::types::packet::header::HasPacketHeaderType; diff --git a/crates/ibc/ibc-components/src/traits/fields/packet/header/timeout.rs b/crates/ibc/ibc-components/src/traits/fields/packet/header/timeout.rs index 904bea6aa0..e63c237fee 100644 --- a/crates/ibc/ibc-components/src/traits/fields/packet/header/timeout.rs +++ b/crates/ibc/ibc-components/src/traits/fields/packet/header/timeout.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::packet::header::HasPacketHeaderType; use crate::traits::types::packet::timeout::HasPacketTimeoutType; diff --git a/crates/ibc/ibc-components/src/traits/fields/packet/packet/header.rs b/crates/ibc/ibc-components/src/traits/fields/packet/packet/header.rs index 13a2f9ae27..f93d7dc9bd 100644 --- a/crates/ibc/ibc-components/src/traits/fields/packet/packet/header.rs +++ b/crates/ibc/ibc-components/src/traits/fields/packet/packet/header.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::packet::header::HasPacketHeaderType; use crate::traits::types::packet::packet::HasPacketType; diff --git a/crates/ibc/ibc-components/src/traits/fields/packet/packet/nonce.rs b/crates/ibc/ibc-components/src/traits/fields/packet/packet/nonce.rs index 75a6598957..5cb8b998f6 100644 --- a/crates/ibc/ibc-components/src/traits/fields/packet/packet/nonce.rs +++ b/crates/ibc/ibc-components/src/traits/fields/packet/packet/nonce.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::packet::nonce::HasPacketNonceType; use crate::traits::types::packet::packet::HasPacketType; diff --git a/crates/ibc/ibc-components/src/traits/fields/packet/packet/payloads.rs b/crates/ibc/ibc-components/src/traits/fields/packet/packet/payloads.rs index 04f3e24bd4..ff02a4f4d1 100644 --- a/crates/ibc/ibc-components/src/traits/fields/packet/packet/payloads.rs +++ b/crates/ibc/ibc-components/src/traits/fields/packet/packet/payloads.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::packet::packet::HasPacketType; use crate::traits::types::payload::payload::HasPayloadType; diff --git a/crates/ibc/ibc-components/src/traits/fields/payload/app_id.rs b/crates/ibc/ibc-components/src/traits/fields/payload/app_id.rs index 4c2f8b73d5..bd663e48cf 100644 --- a/crates/ibc/ibc-components/src/traits/fields/payload/app_id.rs +++ b/crates/ibc/ibc-components/src/traits/fields/payload/app_id.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::app_id::HasAppIdType; use crate::traits::types::payload::header::HasPayloadHeaderType; diff --git a/crates/ibc/ibc-components/src/traits/fields/payload/data.rs b/crates/ibc/ibc-components/src/traits/fields/payload/data.rs index b0e363eba7..916d3985a6 100644 --- a/crates/ibc/ibc-components/src/traits/fields/payload/data.rs +++ b/crates/ibc/ibc-components/src/traits/fields/payload/data.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::payload::data::HasPayloadDataType; use crate::traits::types::payload::payload::HasPayloadType; diff --git a/crates/ibc/ibc-components/src/traits/fields/payload/header.rs b/crates/ibc/ibc-components/src/traits/fields/payload/header.rs index 4bda8970f9..57e168251e 100644 --- a/crates/ibc/ibc-components/src/traits/fields/payload/header.rs +++ b/crates/ibc/ibc-components/src/traits/fields/payload/header.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::payload::header::HasPayloadHeaderType; use crate::traits::types::payload::payload::HasPayloadType; diff --git a/crates/ibc/ibc-components/src/traits/fields/timeout.rs b/crates/ibc/ibc-components/src/traits/fields/timeout.rs index 2398496d3b..46426860ef 100644 --- a/crates/ibc/ibc-components/src/traits/fields/timeout.rs +++ b/crates/ibc/ibc-components/src/traits/fields/timeout.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasTimeType; +use hermes_prelude::*; use crate::traits::types::packet::timeout::HasPacketTimeoutType; diff --git a/crates/ibc/ibc-components/src/traits/fields/transaction/header.rs b/crates/ibc/ibc-components/src/traits/fields/transaction/header.rs index 95ac4dcd7e..99272eeaf5 100644 --- a/crates/ibc/ibc-components/src/traits/fields/transaction/header.rs +++ b/crates/ibc/ibc-components/src/traits/fields/transaction/header.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::packet::header::HasPacketHeaderType; use crate::traits::types::transaction::HasIbcTransactionType; diff --git a/crates/ibc/ibc-components/src/traits/fields/transaction/messages.rs b/crates/ibc/ibc-components/src/traits/fields/transaction/messages.rs index 0d9d03e40e..f923ac04c4 100644 --- a/crates/ibc/ibc-components/src/traits/fields/transaction/messages.rs +++ b/crates/ibc/ibc-components/src/traits/fields/transaction/messages.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::app_id::HasAppIdType; use crate::traits::types::message::HasIbcMessageType; diff --git a/crates/ibc/ibc-components/src/traits/handlers/incoming/packet.rs b/crates/ibc/ibc-components/src/traits/handlers/incoming/packet.rs index 996e0f6d12..9d173f0599 100644 --- a/crates/ibc/ibc-components/src/traits/handlers/incoming/packet.rs +++ b/crates/ibc/ibc-components/src/traits/handlers/incoming/packet.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::commitment::proof::HasCommitmentProofType; use crate::traits::types::packet::packet::HasPacketType; diff --git a/crates/ibc/ibc-components/src/traits/handlers/incoming/payload.rs b/crates/ibc/ibc-components/src/traits/handlers/incoming/payload.rs index 75f0ced2b1..25a8edb443 100644 --- a/crates/ibc/ibc-components/src/traits/handlers/incoming/payload.rs +++ b/crates/ibc/ibc-components/src/traits/handlers/incoming/payload.rs @@ -1,5 +1,5 @@ use cgp::core::component::{UseContext, UseDelegate}; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::packet::header::HasPacketHeaderType; use crate::traits::types::payload::data::HasPayloadDataType; diff --git a/crates/ibc/ibc-components/src/traits/handlers/outgoing/message.rs b/crates/ibc/ibc-components/src/traits/handlers/outgoing/message.rs index 65dba556c5..fba370a1b8 100644 --- a/crates/ibc/ibc-components/src/traits/handlers/outgoing/message.rs +++ b/crates/ibc/ibc-components/src/traits/handlers/outgoing/message.rs @@ -1,5 +1,5 @@ use cgp::core::component::{UseContext, UseDelegate}; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::message::HasIbcMessageType; use crate::traits::types::message_header::HasIbcMessageHeaderType; diff --git a/crates/ibc/ibc-components/src/traits/handlers/outgoing/packet.rs b/crates/ibc/ibc-components/src/traits/handlers/outgoing/packet.rs index 4663fa98b5..9cbb668803 100644 --- a/crates/ibc/ibc-components/src/traits/handlers/outgoing/packet.rs +++ b/crates/ibc/ibc-components/src/traits/handlers/outgoing/packet.rs @@ -1,6 +1,6 @@ use alloc::vec::Vec; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::packet::header::HasPacketHeaderType; use crate::traits::types::packet::packet::HasPacketType; diff --git a/crates/ibc/ibc-components/src/traits/handlers/outgoing/permission.rs b/crates/ibc/ibc-components/src/traits/handlers/outgoing/permission.rs index 199060a4af..04fc4c3836 100644 --- a/crates/ibc/ibc-components/src/traits/handlers/outgoing/permission.rs +++ b/crates/ibc/ibc-components/src/traits/handlers/outgoing/permission.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use crate::traits::types::payload::header::HasPayloadHeaderType; diff --git a/crates/ibc/ibc-components/src/traits/handlers/outgoing/transaction.rs b/crates/ibc/ibc-components/src/traits/handlers/outgoing/transaction.rs index 01d625364d..d09dd2a0d2 100644 --- a/crates/ibc/ibc-components/src/traits/handlers/outgoing/transaction.rs +++ b/crates/ibc/ibc-components/src/traits/handlers/outgoing/transaction.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::packet::packet::HasPacketType; use crate::traits::types::transaction::HasIbcTransactionType; diff --git a/crates/ibc/ibc-components/src/traits/nonce.rs b/crates/ibc/ibc-components/src/traits/nonce.rs index 6b977ff8c6..106b8ffbc8 100644 --- a/crates/ibc/ibc-components/src/traits/nonce.rs +++ b/crates/ibc/ibc-components/src/traits/nonce.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::types::packet::nonce::HasPacketNonceType; diff --git a/crates/ibc/ibc-components/src/traits/queries/client_id.rs b/crates/ibc/ibc-components/src/traits/queries/client_id.rs index 28b9086253..6e1c86be72 100644 --- a/crates/ibc/ibc-components/src/traits/queries/client_id.rs +++ b/crates/ibc/ibc-components/src/traits/queries/client_id.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasClientIdType}; +use hermes_prelude::*; #[cgp_component { provider: ClientIdFromChannelIdQuerier, diff --git a/crates/ibc/ibc-components/src/traits/queries/consensus_state.rs b/crates/ibc/ibc-components/src/traits/queries/consensus_state.rs index bfd52421f2..d7cf9036a6 100644 --- a/crates/ibc/ibc-components/src/traits/queries/consensus_state.rs +++ b/crates/ibc/ibc-components/src/traits/queries/consensus_state.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasClientIdType, HasConsensusStateType, HasHeightType}; +use hermes_prelude::*; #[cgp_component { provider: ConsensusStateQuerier, diff --git a/crates/ibc/ibc-components/src/traits/queries/recv_packet_commitment.rs b/crates/ibc/ibc-components/src/traits/queries/recv_packet_commitment.rs index 22b5801930..bf86d2864f 100644 --- a/crates/ibc/ibc-components/src/traits/queries/recv_packet_commitment.rs +++ b/crates/ibc/ibc-components/src/traits/queries/recv_packet_commitment.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::types::packet::nonce::HasPacketNonceType; diff --git a/crates/ibc/ibc-components/src/traits/queries/send_packet_commitment.rs b/crates/ibc/ibc-components/src/traits/queries/send_packet_commitment.rs index b241c3b9ac..16cb7f92d3 100644 --- a/crates/ibc/ibc-components/src/traits/queries/send_packet_commitment.rs +++ b/crates/ibc/ibc-components/src/traits/queries/send_packet_commitment.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::types::packet::nonce::HasPacketNonceType; use crate::traits::types::packet::packet::HasPacketType; diff --git a/crates/ibc/ibc-components/src/traits/queries/time.rs b/crates/ibc/ibc-components/src/traits/queries/time.rs index 208a2f917a..01a56c048e 100644 --- a/crates/ibc/ibc-components/src/traits/queries/time.rs +++ b/crates/ibc/ibc-components/src/traits/queries/time.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasTimeType; +use hermes_prelude::*; #[cgp_component { provider: CurrentTimeQuerier, diff --git a/crates/ibc/ibc-components/src/traits/types/app_id.rs b/crates/ibc/ibc-components/src/traits/types/app_id.rs index 9ebc52d4ce..a13d0e767a 100644 --- a/crates/ibc/ibc-components/src/traits/types/app_id.rs +++ b/crates/ibc/ibc-components/src/traits/types/app_id.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: AppIdTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/commitment/path.rs b/crates/ibc/ibc-components/src/traits/types/commitment/path.rs index 0314ff4cfd..a6686da16d 100644 --- a/crates/ibc/ibc-components/src/traits/types/commitment/path.rs +++ b/crates/ibc/ibc-components/src/traits/types/commitment/path.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: CommitmentPathTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/commitment/proof.rs b/crates/ibc/ibc-components/src/traits/types/commitment/proof.rs index afb392df14..9b31dc5da7 100644 --- a/crates/ibc/ibc-components/src/traits/types/commitment/proof.rs +++ b/crates/ibc/ibc-components/src/traits/types/commitment/proof.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: CommitmentProofTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/commitment/value.rs b/crates/ibc/ibc-components/src/traits/types/commitment/value.rs index 57ae30d0a5..3e2a5d9de5 100644 --- a/crates/ibc/ibc-components/src/traits/types/commitment/value.rs +++ b/crates/ibc/ibc-components/src/traits/types/commitment/value.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: CommitmentValueTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/message.rs b/crates/ibc/ibc-components/src/traits/types/message.rs index 23f6804c64..a02d42dded 100644 --- a/crates/ibc/ibc-components/src/traits/types/message.rs +++ b/crates/ibc/ibc-components/src/traits/types/message.rs @@ -1,5 +1,5 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: IbcMessageTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/message_header.rs b/crates/ibc/ibc-components/src/traits/types/message_header.rs index 3deb4eea50..493210a6b2 100644 --- a/crates/ibc/ibc-components/src/traits/types/message_header.rs +++ b/crates/ibc/ibc-components/src/traits/types/message_header.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: IbcMessageHeaderTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/packet/header.rs b/crates/ibc/ibc-components/src/traits/types/packet/header.rs index 8edd44fa77..15d673ead9 100644 --- a/crates/ibc/ibc-components/src/traits/types/packet/header.rs +++ b/crates/ibc/ibc-components/src/traits/types/packet/header.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: PacketHeaderTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/packet/nonce.rs b/crates/ibc/ibc-components/src/traits/types/packet/nonce.rs index 33e533fb31..0c8e8f12f9 100644 --- a/crates/ibc/ibc-components/src/traits/types/packet/nonce.rs +++ b/crates/ibc/ibc-components/src/traits/types/packet/nonce.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: PacketNonceTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/packet/packet.rs b/crates/ibc/ibc-components/src/traits/types/packet/packet.rs index 36bea7c38f..5677786676 100644 --- a/crates/ibc/ibc-components/src/traits/types/packet/packet.rs +++ b/crates/ibc/ibc-components/src/traits/types/packet/packet.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; /** This is an abstract type for an outgoing IBC packet. Incoming IBC packets diff --git a/crates/ibc/ibc-components/src/traits/types/packet/timeout.rs b/crates/ibc/ibc-components/src/traits/types/packet/timeout.rs index fb8d91a97d..2812d72622 100644 --- a/crates/ibc/ibc-components/src/traits/types/packet/timeout.rs +++ b/crates/ibc/ibc-components/src/traits/types/packet/timeout.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: PacketTimeoutTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/payload/data.rs b/crates/ibc/ibc-components/src/traits/types/payload/data.rs index c61c807d3e..5d6ef6ae54 100644 --- a/crates/ibc/ibc-components/src/traits/types/payload/data.rs +++ b/crates/ibc/ibc-components/src/traits/types/payload/data.rs @@ -1,6 +1,6 @@ use cgp::core::component::{UseDelegate, WithProvider}; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; use crate::types::with_app_provider::WithAppProvider; diff --git a/crates/ibc/ibc-components/src/traits/types/payload/header.rs b/crates/ibc/ibc-components/src/traits/types/payload/header.rs index 4c232c7023..e933000e45 100644 --- a/crates/ibc/ibc-components/src/traits/types/payload/header.rs +++ b/crates/ibc/ibc-components/src/traits/types/payload/header.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: PayloadHeaderTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/payload/payload.rs b/crates/ibc/ibc-components/src/traits/types/payload/payload.rs index de9f80dc28..1b2a88924d 100644 --- a/crates/ibc/ibc-components/src/traits/types/payload/payload.rs +++ b/crates/ibc/ibc-components/src/traits/types/payload/payload.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: PayloadTypeComponent, diff --git a/crates/ibc/ibc-components/src/traits/types/transaction.rs b/crates/ibc/ibc-components/src/traits/types/transaction.rs index 21d7fa82ea..65345515ac 100644 --- a/crates/ibc/ibc-components/src/traits/types/transaction.rs +++ b/crates/ibc/ibc-components/src/traits/types/transaction.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: IbcTransactionTypeComponent, diff --git a/crates/ibc/ibc-components/src/types/message_header.rs b/crates/ibc/ibc-components/src/types/message_header.rs index 97788abdd5..ad041725a1 100644 --- a/crates/ibc/ibc-components/src/types/message_header.rs +++ b/crates/ibc/ibc-components/src/types/message_header.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::app_id::HasAppIdType; use crate::traits::types::message_header::{ diff --git a/crates/ibc/ibc-components/src/types/packet.rs b/crates/ibc/ibc-components/src/types/packet.rs index fdc391621d..aa1ba496ff 100644 --- a/crates/ibc/ibc-components/src/types/packet.rs +++ b/crates/ibc/ibc-components/src/types/packet.rs @@ -1,6 +1,6 @@ use alloc::vec::Vec; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::builders::packet::{PacketBuilder, PacketBuilderComponent}; use crate::traits::types::packet::header::HasPacketHeaderType; diff --git a/crates/ibc/ibc-components/src/types/packet_header.rs b/crates/ibc/ibc-components/src/types/packet_header.rs index add513d0a7..45fe3b862f 100644 --- a/crates/ibc/ibc-components/src/types/packet_header.rs +++ b/crates/ibc/ibc-components/src/types/packet_header.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChannelIdType; +use hermes_prelude::*; use crate::traits::types::packet::header::{PacketHeaderTypeComponent, ProvidePacketHeaderType}; use crate::traits::types::packet::timeout::HasPacketTimeoutType; diff --git a/crates/ibc/ibc-components/src/types/payload.rs b/crates/ibc/ibc-components/src/types/payload.rs index 06a906a80e..d900107a0a 100644 --- a/crates/ibc/ibc-components/src/types/payload.rs +++ b/crates/ibc/ibc-components/src/types/payload.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::payload::data::HasPayloadDataType; use crate::traits::types::payload::header::HasPayloadHeaderType; diff --git a/crates/ibc/ibc-components/src/types/payload_header.rs b/crates/ibc/ibc-components/src/types/payload_header.rs index 4c53e8a950..06b0adec49 100644 --- a/crates/ibc/ibc-components/src/types/payload_header.rs +++ b/crates/ibc/ibc-components/src/types/payload_header.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::app_id::HasAppIdType; use crate::traits::types::payload::header::{PayloadHeaderTypeComponent, ProvidePayloadHeaderType}; diff --git a/crates/ibc/ibc-mock-chain/Cargo.toml b/crates/ibc/ibc-mock-chain/Cargo.toml index ae1c21aca8..d788b473f2 100644 --- a/crates/ibc/ibc-mock-chain/Cargo.toml +++ b/crates/ibc/ibc-mock-chain/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-chain-type-components = { workspace = true } hermes-encoding-components = { workspace = true } hermes-ibc-components = { workspace = true } diff --git a/crates/ibc/ibc-mock-chain/src/components/chain.rs b/crates/ibc/ibc-mock-chain/src/components/chain.rs index 6cd6e4f003..c6ef042a63 100644 --- a/crates/ibc/ibc-mock-chain/src/components/chain.rs +++ b/crates/ibc/ibc-mock-chain/src/components/chain.rs @@ -3,7 +3,6 @@ use alloc::string::String; use cgp::core::component::{UseDelegate, WithProvider}; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::types::{UseDelegatedType, WithType}; -use cgp::prelude::*; use hermes_chain_type_components::traits::{ AddressTypeProviderComponent, ChannelIdTypeComponent, ClientIdTypeComponent, HeightTypeProviderComponent, QuantityTypeComponent, TimeTypeComponent, @@ -41,6 +40,7 @@ use hermes_ibc_token_transfer_components::traits::fields::message::receiver::Mes use hermes_ibc_token_transfer_components::traits::fields::payload_data::mint_amount::PayloadMintAmountGetterComponent; use hermes_ibc_token_transfer_components::traits::fields::payload_data::receiver::IbcTransferReceiverGetterComponent; use hermes_ibc_token_transfer_components::traits::fields::payload_data::unescrow_amount::PayloadUnescrowAmountGetterComponent; +use hermes_prelude::*; use crate::components::handlers::incoming_payload::MockPayloadHandlers; use crate::components::handlers::outgoing_message::MockIbcMessageHandlers; diff --git a/crates/ibc/ibc-mock-chain/src/components/handlers/incoming_payload.rs b/crates/ibc/ibc-mock-chain/src/components/handlers/incoming_payload.rs index 2868825988..c9ea6e010d 100644 --- a/crates/ibc/ibc-mock-chain/src/components/handlers/incoming_payload.rs +++ b/crates/ibc/ibc-mock-chain/src/components/handlers/incoming_payload.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_ibc_components::types::tags::apps::any::AnyApp; use hermes_ibc_token_transfer_components::components::chain::IbcTokenTransferChainComponents; use hermes_ibc_token_transfer_components::types::tags::{ IbcTransferApp, IbcTransferMintApp, IbcTransferUnescrowApp, }; +use hermes_prelude::*; use crate::impls::handlers::incoming::HandleMockAnyPayloadData; diff --git a/crates/ibc/ibc-mock-chain/src/components/handlers/outgoing_message.rs b/crates/ibc/ibc-mock-chain/src/components/handlers/outgoing_message.rs index 87082ba625..950474a5ed 100644 --- a/crates/ibc/ibc-mock-chain/src/components/handlers/outgoing_message.rs +++ b/crates/ibc/ibc-mock-chain/src/components/handlers/outgoing_message.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_ibc_token_transfer_components::impls::handlers::outgoing::message::HandleOutgoingIbcTransfer; use hermes_ibc_token_transfer_components::types::tags::IbcTransferApp; +use hermes_prelude::*; pub struct MockIbcMessageHandlers; diff --git a/crates/ibc/ibc-mock-chain/src/components/ibc_message.rs b/crates/ibc/ibc-mock-chain/src/components/ibc_message.rs index ffca4cdc46..8b0f2fdbc0 100644 --- a/crates/ibc/ibc-mock-chain/src/components/ibc_message.rs +++ b/crates/ibc/ibc-mock-chain/src/components/ibc_message.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_ibc_token_transfer_components::components::chain::IbcTokenTransferChainComponents; use hermes_ibc_token_transfer_components::types::tags::IbcTransferApp; +use hermes_prelude::*; pub struct MockIbcMessageTypes; diff --git a/crates/ibc/ibc-mock-chain/src/components/ibc_types.rs b/crates/ibc/ibc-mock-chain/src/components/ibc_types.rs index 343818b73f..100e94e2ab 100644 --- a/crates/ibc/ibc-mock-chain/src/components/ibc_types.rs +++ b/crates/ibc/ibc-mock-chain/src/components/ibc_types.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{ AddressTypeProviderComponent, ChannelIdTypeComponent, ClientIdTypeComponent, HeightTypeProviderComponent, TimeTypeComponent, @@ -6,6 +5,7 @@ use hermes_chain_type_components::traits::{ use hermes_ibc_components::traits::types::app_id::AppIdTypeComponent; use hermes_ibc_components::traits::types::packet::nonce::PacketNonceTypeComponent; use hermes_ibc_components::traits::types::packet::timeout::PacketTimeoutTypeComponent; +use hermes_prelude::*; use crate::types::address::MockAddress; use crate::types::app_id::MockAppId; diff --git a/crates/ibc/ibc-mock-chain/src/components/payload_data.rs b/crates/ibc/ibc-mock-chain/src/components/payload_data.rs index 82777409fe..ecf9895c20 100644 --- a/crates/ibc/ibc-mock-chain/src/components/payload_data.rs +++ b/crates/ibc/ibc-mock-chain/src/components/payload_data.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_ibc_components::types::tags::apps::any::AnyApp; use hermes_ibc_token_transfer_components::components::chain::IbcTokenTransferChainComponents; use hermes_ibc_token_transfer_components::types::tags::{ IbcTransferApp, IbcTransferMintApp, IbcTransferUnescrowApp, }; +use hermes_prelude::*; use crate::types::packet_data::UseMockAnyPayloadData; diff --git a/crates/ibc/ibc-mock-chain/src/contexts/chain.rs b/crates/ibc/ibc-mock-chain/src/contexts/chain.rs index 1fbdce4e0e..f0626ec0aa 100644 --- a/crates/ibc/ibc-mock-chain/src/contexts/chain.rs +++ b/crates/ibc/ibc-mock-chain/src/contexts/chain.rs @@ -4,7 +4,6 @@ use alloc::string::String; use alloc::sync::Arc; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::{ CanBuildAmount, HasAddressType, HasAmountDenom, HasAmountQuantity, HasAmountType, HasChannelIdType, HasClientIdType, HasConsensusStateType, HasDenomType, HasHeightType, @@ -70,6 +69,7 @@ use hermes_ibc_token_transfer_components::types::packet_data::unescrow::IbcTrans use hermes_ibc_token_transfer_components::types::tags::{ IbcTransferApp, IbcTransferMintApp, IbcTransferUnescrowApp, }; +use hermes_prelude::*; use crate::types::address::MockAddress; use crate::types::amount::MockAmount; diff --git a/crates/ibc/ibc-mock-chain/src/impls/caller.rs b/crates/ibc/ibc-mock-chain/src/impls/caller.rs index 83f63f0752..5b555f81e1 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/caller.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/caller.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_ibc_components::traits::fields::caller::{CallerGetter, CallerGetterComponent}; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/impls/commitment/path.rs b/crates/ibc/ibc-mock-chain/src/impls/commitment/path.rs index 7ef6f2653e..2590c9a357 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/commitment/path.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/commitment/path.rs @@ -1,12 +1,12 @@ use alloc::string::String; -use cgp::prelude::*; use hermes_ibc_components::traits::commitment::path::receive_packet::{ ReceivePacketCommitmentPathBuilder, ReceivePacketCommitmentPathBuilderComponent, }; use hermes_ibc_components::traits::commitment::path::send_packet::{ SendPacketCommitmentPathBuilder, SendPacketCommitmentPathBuilderComponent, }; +use hermes_prelude::*; use crate::contexts::chain::{MockChain, MockChainComponents}; use crate::types::channel_id::MockChannelId; diff --git a/crates/ibc/ibc-mock-chain/src/impls/commitment/store.rs b/crates/ibc/ibc-mock-chain/src/impls/commitment/store.rs index 3adcb1d11a..f7305d8370 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/commitment/store.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/commitment/store.rs @@ -1,13 +1,13 @@ use alloc::borrow::ToOwned; use alloc::string::String; -use cgp::prelude::*; use hermes_ibc_components::traits::commitment::store::{ CommitmentStorage, CommitmentStorageComponent, }; use hermes_ibc_components::types::packet::IbcPacket; use hermes_ibc_components::types::tags::commitment::receive::ReceivePacket; use hermes_ibc_components::types::tags::commitment::send::SendPacket; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/impls/commitment/value.rs b/crates/ibc/ibc-mock-chain/src/impls/commitment/value.rs index d4302c35e3..cbef5bb414 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/commitment/value.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/commitment/value.rs @@ -1,6 +1,5 @@ use alloc::string::String; -use cgp::prelude::*; use hermes_ibc_components::traits::commitment::value::receive_packet::{ ReceivePacketCommitmentValueBuilder, ReceivePacketCommitmentValueBuilderComponent, }; @@ -8,6 +7,7 @@ use hermes_ibc_components::traits::commitment::value::send_packet::{ SendPacketCommitmentValueBuilder, SendPacketCommitmentValueBuilderComponent, }; use hermes_ibc_components::types::packet::IbcPacket; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/impls/commitment/verify.rs b/crates/ibc/ibc-mock-chain/src/impls/commitment/verify.rs index 8c5d713808..f28176779e 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/commitment/verify.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/commitment/verify.rs @@ -2,13 +2,13 @@ use alloc::borrow::ToOwned; use alloc::string::String; use alloc::sync::Arc; -use cgp::prelude::*; use hermes_ibc_components::traits::commitment::verify::{ CommitmentVerifier, CommitmentVerifierComponent, }; use hermes_ibc_components::types::packet::IbcPacket; use hermes_ibc_components::types::tags::commitment::receive::ReceivePacket; use hermes_ibc_components::types::tags::commitment::send::SendPacket; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::{MockChain, MockChainState}; diff --git a/crates/ibc/ibc-mock-chain/src/impls/consensus_state.rs b/crates/ibc/ibc-mock-chain/src/impls/consensus_state.rs index f6d89c23a1..f927cb4bfb 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/consensus_state.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/consensus_state.rs @@ -2,13 +2,13 @@ use alloc::borrow::ToOwned; use alloc::string::String; use alloc::sync::Arc; -use cgp::prelude::*; use hermes_chain_type_components::traits::{ ConsensusStateTypeComponent, ProvideConsensusStateType, }; use hermes_ibc_components::traits::queries::consensus_state::{ ConsensusStateQuerier, ConsensusStateQuerierComponent, }; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::{MockChain, MockChainState}; diff --git a/crates/ibc/ibc-mock-chain/src/impls/error.rs b/crates/ibc/ibc-mock-chain/src/impls/error.rs index f6a087cb0f..cc61289f8a 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/error.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/error.rs @@ -3,7 +3,7 @@ use alloc::string::String; use core::fmt::Debug; use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent}; -use cgp::prelude::*; +use hermes_prelude::*; pub struct RaiseDebugString; diff --git a/crates/ibc/ibc-mock-chain/src/impls/escrow_registry.rs b/crates/ibc/ibc-mock-chain/src/impls/escrow_registry.rs index dc52e519b1..f57675dfad 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/escrow_registry.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/escrow_registry.rs @@ -1,13 +1,13 @@ use alloc::borrow::ToOwned; use alloc::string::String; -use cgp::prelude::*; use hermes_ibc_token_transfer_components::traits::escrow_registry::escrow::{ EscrowTokenRegistrar, EscrowTokenRegistrarComponent, }; use hermes_ibc_token_transfer_components::traits::escrow_registry::unescrow::{ UnescrowTokenRegistrar, UnescrowTokenRegistrarComponent, }; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/impls/handlers/incoming.rs b/crates/ibc/ibc-mock-chain/src/impls/handlers/incoming.rs index e77da092c6..4a21099624 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/handlers/incoming.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/handlers/incoming.rs @@ -1,6 +1,5 @@ use alloc::string::String; -use cgp::prelude::*; use hermes_ibc_components::traits::handlers::incoming::payload::{ CanHandleIncomingPayload, IncomingPayloadHandler, IncomingPayloadHandlerComponent, }; @@ -8,6 +7,7 @@ use hermes_ibc_components::types::packet_header::IbcPacketHeader; use hermes_ibc_components::types::payload_header::IbcPayloadHeader; use hermes_ibc_components::types::tags::apps::any::AnyApp; use hermes_ibc_token_transfer_components::types::tags::IbcTransferApp; +use hermes_prelude::*; use crate::contexts::chain::MockChain; use crate::types::packet_data::MockAnyPayloadData; diff --git a/crates/ibc/ibc-mock-chain/src/impls/mint_registry.rs b/crates/ibc/ibc-mock-chain/src/impls/mint_registry.rs index 6705828587..fc8557373e 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/mint_registry.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/mint_registry.rs @@ -1,7 +1,6 @@ use alloc::boxed::Box; use alloc::string::String; -use cgp::prelude::*; use hermes_ibc_token_transfer_components::traits::mint_registry::lookup_incoming::{ IncomingMintedTokenQuerier, IncomingMintedTokenQuerierComponent, }; @@ -14,6 +13,7 @@ use hermes_ibc_token_transfer_components::traits::mint_registry::register::{ use hermes_ibc_token_transfer_components::traits::token::create::{ CanCreateToken, TokenCreator, TokenCreatorComponent, }; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/impls/nonce.rs b/crates/ibc/ibc-mock-chain/src/impls/nonce.rs index 4176e89f5a..ce0630ca80 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/nonce.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/nonce.rs @@ -1,7 +1,7 @@ use alloc::string::String; -use cgp::prelude::*; use hermes_ibc_components::traits::nonce::{PacketNonceAllocator, PacketNonceAllocatorComponent}; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/impls/queries/client_id.rs b/crates/ibc/ibc-mock-chain/src/impls/queries/client_id.rs index ba40c64eab..b0d40ef478 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/queries/client_id.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/queries/client_id.rs @@ -1,10 +1,10 @@ use alloc::borrow::ToOwned; use alloc::string::String; -use cgp::prelude::*; use hermes_ibc_components::traits::queries::client_id::{ ClientIdFromChannelIdQuerier, ClientIdFromChannelIdQuerierComponent, }; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/impls/queries/packet_received.rs b/crates/ibc/ibc-mock-chain/src/impls/queries/packet_received.rs index 47f0201fb6..bad968c2c1 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/queries/packet_received.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/queries/packet_received.rs @@ -1,9 +1,9 @@ use alloc::string::String; -use cgp::prelude::*; use hermes_ibc_components::traits::queries::recv_packet_commitment::{ HasPacketReceivedQuerier, HasPacketReceivedQuerierComponent, }; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/impls/queries/time.rs b/crates/ibc/ibc-mock-chain/src/impls/queries/time.rs index 63b08cb812..99e76c648d 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/queries/time.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/queries/time.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_ibc_components::traits::fields::timeout::{ TimeoutTimeComparer, TimeoutTimeComparerComponent, }; use hermes_ibc_components::traits::queries::time::{ CurrentTimeQuerier, CurrentTimeQuerierComponent, }; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/impls/tagged.rs b/crates/ibc/ibc-mock-chain/src/impls/tagged.rs index 4e215600d2..ac2936db4f 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/tagged.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/tagged.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::types::{ProvideType, TypeComponent}; -use cgp::prelude::*; +use hermes_prelude::*; use crate::contexts::chain::MockChain; use crate::types::tagged::Tagged; diff --git a/crates/ibc/ibc-mock-chain/src/impls/transfer.rs b/crates/ibc/ibc-mock-chain/src/impls/transfer.rs index db8cb6164c..d19a00e30b 100644 --- a/crates/ibc/ibc-mock-chain/src/impls/transfer.rs +++ b/crates/ibc/ibc-mock-chain/src/impls/transfer.rs @@ -1,10 +1,10 @@ use alloc::borrow::ToOwned; use alloc::string::String; -use cgp::prelude::*; use hermes_ibc_token_transfer_components::traits::token::transfer::{ Burn, Escrow, Mint, TokenTransferer, TokenTransfererComponent, Unescrow, }; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/types/amount.rs b/crates/ibc/ibc-mock-chain/src/types/amount.rs index ca62111f38..49f6b8adf2 100644 --- a/crates/ibc/ibc-mock-chain/src/types/amount.rs +++ b/crates/ibc/ibc-mock-chain/src/types/amount.rs @@ -1,12 +1,12 @@ use core::cmp::Ordering; use core::fmt::{Debug, Display}; -use cgp::prelude::*; use hermes_chain_type_components::traits::{ AmountBuilder, AmountBuilderComponent, AmountDenomGetter, AmountDenomGetterComponent, AmountQuantityGetter, AmountQuantityGetterComponent, AmountTypeProvider, AmountTypeProviderComponent, }; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/types/commitment/path.rs b/crates/ibc/ibc-mock-chain/src/types/commitment/path.rs index 6b39c555f9..4e0a9508e2 100644 --- a/crates/ibc/ibc-mock-chain/src/types/commitment/path.rs +++ b/crates/ibc/ibc-mock-chain/src/types/commitment/path.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_ibc_components::traits::types::commitment::path::{ CommitmentPathTypeComponent, ProvideCommitmentPathType, }; use hermes_ibc_components::types::tags::commitment::receive::ReceivePacket; use hermes_ibc_components::types::tags::commitment::send::SendPacket; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/types/commitment/proof.rs b/crates/ibc/ibc-mock-chain/src/types/commitment/proof.rs index f884ec543a..40d6c2e7b3 100644 --- a/crates/ibc/ibc-mock-chain/src/types/commitment/proof.rs +++ b/crates/ibc/ibc-mock-chain/src/types/commitment/proof.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_ibc_components::traits::fields::commitment::proof_height::{ CommitmentProofHeightGetter, CommitmentProofHeightGetterComponent, }; use hermes_ibc_components::traits::types::commitment::proof::{ CommitmentProofTypeComponent, ProvideCommitmentProofType, }; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/types/commitment/value.rs b/crates/ibc/ibc-mock-chain/src/types/commitment/value.rs index b8baace75b..1195d6c8d0 100644 --- a/crates/ibc/ibc-mock-chain/src/types/commitment/value.rs +++ b/crates/ibc/ibc-mock-chain/src/types/commitment/value.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_ibc_components::traits::types::commitment::value::{ CommitmentValueTypeComponent, ProvideCommitmentValueType, }; use hermes_ibc_components::types::packet::IbcPacket; use hermes_ibc_components::types::tags::commitment::receive::ReceivePacket; use hermes_ibc_components::types::tags::commitment::send::SendPacket; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/types/denom.rs b/crates/ibc/ibc-mock-chain/src/types/denom.rs index f6471034f1..0caedcafd4 100644 --- a/crates/ibc/ibc-mock-chain/src/types/denom.rs +++ b/crates/ibc/ibc-mock-chain/src/types/denom.rs @@ -2,8 +2,8 @@ use alloc::boxed::Box; use core::cmp::Ordering; use core::fmt::{Debug, Display}; -use cgp::prelude::*; use hermes_chain_type_components::traits::{DenomTypeComponent, ProvideDenomType}; +use hermes_prelude::*; use crate::components::chain::MockChainComponents; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-mock-chain/src/types/packet_data.rs b/crates/ibc/ibc-mock-chain/src/types/packet_data.rs index d82e1b8fb2..b3f48b2917 100644 --- a/crates/ibc/ibc-mock-chain/src/types/packet_data.rs +++ b/crates/ibc/ibc-mock-chain/src/types/packet_data.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_ibc_components::traits::types::payload::data::{ PayloadDataTypeComponent, ProvidePayloadDataType, }; use hermes_ibc_token_transfer_components::types::packet_data::transfer::IbcTransferPayloadData; +use hermes_prelude::*; use crate::contexts::chain::MockChain; diff --git a/crates/ibc/ibc-token-transfer-components/Cargo.toml b/crates/ibc/ibc-token-transfer-components/Cargo.toml index bc78f37c15..04948e45bf 100644 --- a/crates/ibc/ibc-token-transfer-components/Cargo.toml +++ b/crates/ibc/ibc-token-transfer-components/Cargo.toml @@ -12,7 +12,8 @@ description = """ """ [dependencies] -cgp = { workspace = true, features = [ "full" ] } +cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-chain-type-components = { workspace = true } hermes-encoding-components = { workspace = true } hermes-ibc-components = { workspace = true } diff --git a/crates/ibc/ibc-token-transfer-components/src/components/chain.rs b/crates/ibc/ibc-token-transfer-components/src/components/chain.rs index 8b5eb8de40..035b7def39 100644 --- a/crates/ibc/ibc-token-transfer-components/src/components/chain.rs +++ b/crates/ibc/ibc-token-transfer-components/src/components/chain.rs @@ -1,8 +1,8 @@ use cgp::core::component::{UseDelegate, WithContext}; -use cgp::prelude::*; use hermes_ibc_components::traits::handlers::incoming::payload::IncomingPayloadHandlerComponent; use hermes_ibc_components::traits::types::message::IbcMessageTypeComponent; use hermes_ibc_components::traits::types::payload::data::PayloadDataTypeComponent; +use hermes_prelude::*; use crate::components::incoming_payload::IbcTransferIncomingPayloadHandlers; use crate::components::payload_data::IbcTokenTransferPayloadDataTypes; diff --git a/crates/ibc/ibc-token-transfer-components/src/components/incoming_payload.rs b/crates/ibc/ibc-token-transfer-components/src/components/incoming_payload.rs index 98855fe7d3..801ad77885 100644 --- a/crates/ibc/ibc-token-transfer-components/src/components/incoming_payload.rs +++ b/crates/ibc/ibc-token-transfer-components/src/components/incoming_payload.rs @@ -1,5 +1,5 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; use crate::impls::handlers::incoming::dispatch::DispatchMintOrUnescrow; use crate::impls::handlers::incoming::mint::HandleIncomingMintTransfer; diff --git a/crates/ibc/ibc-token-transfer-components/src/components/payload_data.rs b/crates/ibc/ibc-token-transfer-components/src/components/payload_data.rs index 9ac6628def..71cb730761 100644 --- a/crates/ibc/ibc-token-transfer-components/src/components/payload_data.rs +++ b/crates/ibc/ibc-token-transfer-components/src/components/payload_data.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::types::packet_data::mint::UseIbcTransferMintPayloadData; use crate::types::packet_data::transfer::UseIbcTransferPayloadData; diff --git a/crates/ibc/ibc-token-transfer-components/src/impls/builders/mint.rs b/crates/ibc/ibc-token-transfer-components/src/impls/builders/mint.rs index 99de37f96c..9b02b6b88c 100644 --- a/crates/ibc/ibc-token-transfer-components/src/impls/builders/mint.rs +++ b/crates/ibc/ibc-token-transfer-components/src/impls/builders/mint.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_ibc_components::traits::types::message::HasIbcMessageType; use hermes_ibc_components::traits::types::message_header::HasIbcMessageHeaderType; use hermes_ibc_components::traits::types::payload::data::HasPayloadDataType; use hermes_ibc_components::traits::types::payload::header::HasPayloadHeaderType; +use hermes_prelude::*; use crate::traits::builders::mint::{MintPayloadBuilder, MintPayloadBuilderComponent}; use crate::traits::fields::message::receiver::HasMessageTransferReceiver; diff --git a/crates/ibc/ibc-token-transfer-components/src/impls/builders/unescrow.rs b/crates/ibc/ibc-token-transfer-components/src/impls/builders/unescrow.rs index 7feee89a79..cb8ad7fa73 100644 --- a/crates/ibc/ibc-token-transfer-components/src/impls/builders/unescrow.rs +++ b/crates/ibc/ibc-token-transfer-components/src/impls/builders/unescrow.rs @@ -1,11 +1,11 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_ibc_components::traits::types::message::HasIbcMessageType; use hermes_ibc_components::traits::types::message_header::HasIbcMessageHeaderType; use hermes_ibc_components::traits::types::payload::data::HasPayloadDataType; use hermes_ibc_components::traits::types::payload::header::HasPayloadHeaderType; +use hermes_prelude::*; use crate::traits::builders::unescrow::{UnescrowPayloadBuilder, UnescrowPayloadBuilderComponent}; use crate::traits::fields::message::receiver::HasMessageTransferReceiver; diff --git a/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/dispatch.rs b/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/dispatch.rs index a0b64e3dfb..cecad7cdd8 100644 --- a/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/dispatch.rs +++ b/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/dispatch.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_ibc_components::traits::handlers::incoming::payload::{ IncomingPayloadHandler, IncomingPayloadHandlerComponent, @@ -8,6 +7,7 @@ use hermes_ibc_components::traits::handlers::incoming::payload::{ use hermes_ibc_components::traits::types::packet::header::HasPacketHeaderType; use hermes_ibc_components::traits::types::payload::data::HasPayloadDataType; use hermes_ibc_components::traits::types::payload::header::HasPayloadHeaderType; +use hermes_prelude::*; use crate::types::packet_data::mint::IbcTransferMintPayloadData; use crate::types::packet_data::transfer::IbcTransferPayloadData; diff --git a/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/mint.rs b/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/mint.rs index cef9828df2..0fa85920d3 100644 --- a/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/mint.rs +++ b/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/mint.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{CanBuildAmount, HasAmountDenom, HasAmountQuantity}; use hermes_ibc_components::traits::fields::packet::header::channel_id::HasPacketChannelIds; use hermes_ibc_components::traits::fields::payload::app_id::HasPayloadAppIds; use hermes_ibc_components::traits::handlers::incoming::payload::{ IncomingPayloadHandler, IncomingPayloadHandlerComponent, }; +use hermes_prelude::*; use crate::traits::fields::payload_data::mint_amount::HasPayloadMintAmount; use crate::traits::fields::payload_data::receiver::HasIbcTransferReceiver; diff --git a/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/unescrow.rs b/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/unescrow.rs index d7e7d8302b..e73e6e0661 100644 --- a/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/unescrow.rs +++ b/crates/ibc/ibc-token-transfer-components/src/impls/handlers/incoming/unescrow.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAmountDenom, HasAmountQuantity}; use hermes_ibc_components::traits::fields::packet::header::channel_id::HasPacketChannelIds; use hermes_ibc_components::traits::fields::payload::app_id::HasPayloadAppIds; @@ -6,6 +5,7 @@ use hermes_ibc_components::traits::handlers::incoming::payload::{ IncomingPayloadHandler, IncomingPayloadHandlerComponent, }; use hermes_ibc_components::traits::types::payload::data::HasPayloadDataType; +use hermes_prelude::*; use crate::traits::escrow_registry::unescrow::CanRegisterUnescrowToken; use crate::traits::fields::payload_data::receiver::HasIbcTransferReceiver; diff --git a/crates/ibc/ibc-token-transfer-components/src/impls/handlers/outgoing/message.rs b/crates/ibc/ibc-token-transfer-components/src/impls/handlers/outgoing/message.rs index 232be77751..b8e46e77ff 100644 --- a/crates/ibc/ibc-token-transfer-components/src/impls/handlers/outgoing/message.rs +++ b/crates/ibc/ibc-token-transfer-components/src/impls/handlers/outgoing/message.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{ CanBuildAmount, HasAmountDenom, HasAmountQuantity, HasChannelIdType, }; @@ -9,6 +8,7 @@ use hermes_ibc_components::traits::handlers::outgoing::message::{ IbcMessageHandler, IbcMessageHandlerComponent, }; use hermes_ibc_components::traits::types::app_id::HasAppIdType; +use hermes_prelude::*; use crate::traits::builders::mint::CanBuildMintPayload; use crate::traits::builders::unescrow::CanBuildUnescrowPayload; diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/builders/mint.rs b/crates/ibc/ibc-token-transfer-components/src/traits/builders/mint.rs index c99f1be98c..44b303b94a 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/builders/mint.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/builders/mint.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAmountType; use hermes_ibc_components::traits::types::message::HasIbcMessageType; use hermes_ibc_components::traits::types::message_header::HasIbcMessageHeaderType; use hermes_ibc_components::traits::types::payload::data::HasPayloadDataType; use hermes_ibc_components::traits::types::payload::header::HasPayloadHeaderType; +use hermes_prelude::*; #[cgp_component { provider: MintPayloadBuilder, diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/builders/unescrow.rs b/crates/ibc/ibc-token-transfer-components/src/traits/builders/unescrow.rs index 2ec718079c..d027bd87d7 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/builders/unescrow.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/builders/unescrow.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAmountType; use hermes_ibc_components::traits::types::message::HasIbcMessageType; use hermes_ibc_components::traits::types::message_header::HasIbcMessageHeaderType; use hermes_ibc_components::traits::types::payload::data::HasPayloadDataType; use hermes_ibc_components::traits::types::payload::header::HasPayloadHeaderType; +use hermes_prelude::*; #[cgp_component { provider: UnescrowPayloadBuilder, diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/escrow_registry/escrow.rs b/crates/ibc/ibc-token-transfer-components/src/traits/escrow_registry/escrow.rs index 919b5e85f5..3ae8c902f2 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/escrow_registry/escrow.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/escrow_registry/escrow.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAmountType, HasChannelIdType, HasQuantityType}; use hermes_ibc_components::traits::types::app_id::HasAppIdType; +use hermes_prelude::*; /** A token transfer module may escrow tokens on behalf of multiple diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/escrow_registry/unescrow.rs b/crates/ibc/ibc-token-transfer-components/src/traits/escrow_registry/unescrow.rs index d082091919..07595dd923 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/escrow_registry/unescrow.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/escrow_registry/unescrow.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAmountType, HasChannelIdType}; use hermes_ibc_components::traits::types::app_id::HasAppIdType; +use hermes_prelude::*; /** A token transfer module may escrow tokens on behalf of multiple diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/fields/message/amount.rs b/crates/ibc/ibc-token-transfer-components/src/traits/fields/message/amount.rs index ebf5c4d331..fa1623bf75 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/fields/message/amount.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/fields/message/amount.rs @@ -2,9 +2,9 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAmountType; use hermes_ibc_components::traits::types::message::HasIbcMessageType; +use hermes_prelude::*; #[cgp_component { provider: MessageTransferAmountGetter, diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/fields/message/receiver.rs b/crates/ibc/ibc-token-transfer-components/src/traits/fields/message/receiver.rs index a366f50af1..2659470cac 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/fields/message/receiver.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/fields/message/receiver.rs @@ -2,9 +2,9 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAddressType; use hermes_ibc_components::traits::types::message::HasIbcMessageType; +use hermes_prelude::*; #[cgp_component { provider: MessageTransferAddressGetter, diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/mint_amount.rs b/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/mint_amount.rs index 3fd1db362e..aba883e4c3 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/mint_amount.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/mint_amount.rs @@ -2,9 +2,9 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAmountType; use hermes_ibc_components::traits::types::payload::data::HasPayloadDataType; +use hermes_prelude::*; #[cgp_component { provider: PayloadMintAmountGetter, diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/receiver.rs b/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/receiver.rs index fa42a54129..c810ae3c79 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/receiver.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/receiver.rs @@ -2,9 +2,9 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAddressType; use hermes_ibc_components::traits::types::payload::data::HasPayloadDataType; +use hermes_prelude::*; #[cgp_component { provider: IbcTransferReceiverGetter, diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/unescrow_amount.rs b/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/unescrow_amount.rs index 5362572e85..dc7cdc3d2e 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/unescrow_amount.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/fields/payload_data/unescrow_amount.rs @@ -2,9 +2,9 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::FieldGetter; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAmountType; use hermes_ibc_components::traits::types::payload::data::HasPayloadDataType; +use hermes_prelude::*; #[cgp_component { provider: PayloadUnescrowAmountGetter, diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/lookup_incoming.rs b/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/lookup_incoming.rs index 1b7597492f..e96c821a7d 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/lookup_incoming.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/lookup_incoming.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasDenomType}; use hermes_ibc_components::traits::types::app_id::HasAppIdType; +use hermes_prelude::*; #[cgp_component { provider: IncomingMintedTokenQuerier, diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/lookup_outgoing.rs b/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/lookup_outgoing.rs index c9c07b44fd..f5bfe8e342 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/lookup_outgoing.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/lookup_outgoing.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasDenomType}; use hermes_ibc_components::traits::types::app_id::HasAppIdType; +use hermes_prelude::*; #[cgp_component { provider: OutgoingBurnTokenQuerier, diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/register.rs b/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/register.rs index 83be2eaf18..801888069e 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/register.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/mint_registry/register.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasDenomType}; use hermes_ibc_components::traits::types::app_id::HasAppIdType; +use hermes_prelude::*; #[cgp_component { provider: MintedTokenRegistrar, diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/token/create.rs b/crates/ibc/ibc-token-transfer-components/src/traits/token/create.rs index f87bca0a89..cdcb0f41f1 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/token/create.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/token/create.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasChannelIdType, HasDenomType}; use hermes_ibc_components::traits::types::app_id::HasAppIdType; +use hermes_prelude::*; /** Create a new token address used for minting an IBC denom with the given channels. diff --git a/crates/ibc/ibc-token-transfer-components/src/traits/token/transfer.rs b/crates/ibc/ibc-token-transfer-components/src/traits/token/transfer.rs index c6a3b4d243..cdd9fe0f06 100644 --- a/crates/ibc/ibc-token-transfer-components/src/traits/token/transfer.rs +++ b/crates/ibc/ibc-token-transfer-components/src/traits/token/transfer.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_prelude::*; pub struct Mint; diff --git a/crates/ibc/ibc-token-transfer-components/src/types/message.rs b/crates/ibc/ibc-token-transfer-components/src/types/message.rs index 31aad01dab..fa2330bc04 100644 --- a/crates/ibc/ibc-token-transfer-components/src/types/message.rs +++ b/crates/ibc/ibc-token-transfer-components/src/types/message.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_ibc_components::traits::types::message::{ IbcMessageTypeComponent, ProvideIbcMessageType, }; +use hermes_prelude::*; #[derive(HasField)] pub struct IbcTransferMessage diff --git a/crates/ibc/ibc-token-transfer-components/src/types/packet_data/mint.rs b/crates/ibc/ibc-token-transfer-components/src/types/packet_data/mint.rs index 3bd0110c0f..994561681d 100644 --- a/crates/ibc/ibc-token-transfer-components/src/types/packet_data/mint.rs +++ b/crates/ibc/ibc-token-transfer-components/src/types/packet_data/mint.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_ibc_components::traits::types::payload::data::{ PayloadDataTypeComponent, ProvidePayloadDataType, }; +use hermes_prelude::*; #[derive(HasField)] pub struct IbcTransferMintPayloadData diff --git a/crates/ibc/ibc-token-transfer-components/src/types/packet_data/transfer.rs b/crates/ibc/ibc-token-transfer-components/src/types/packet_data/transfer.rs index 44d918cf2b..65e9a5391e 100644 --- a/crates/ibc/ibc-token-transfer-components/src/types/packet_data/transfer.rs +++ b/crates/ibc/ibc-token-transfer-components/src/types/packet_data/transfer.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_ibc_components::traits::types::payload::data::{ PayloadDataTypeComponent, ProvidePayloadDataType, }; +use hermes_prelude::*; use crate::types::packet_data::mint::IbcTransferMintPayloadData; use crate::types::packet_data::unescrow::IbcTransferUnescrowPayloadData; diff --git a/crates/ibc/ibc-token-transfer-components/src/types/packet_data/unescrow.rs b/crates/ibc/ibc-token-transfer-components/src/types/packet_data/unescrow.rs index d69177d95e..a4519dda69 100644 --- a/crates/ibc/ibc-token-transfer-components/src/types/packet_data/unescrow.rs +++ b/crates/ibc/ibc-token-transfer-components/src/types/packet_data/unescrow.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_ibc_components::traits::types::payload::data::{ PayloadDataTypeComponent, ProvidePayloadDataType, }; +use hermes_prelude::*; #[derive(HasField)] pub struct IbcTransferUnescrowPayloadData diff --git a/crates/logging/logging-components/Cargo.toml b/crates/logging/logging-components/Cargo.toml index b8f3d8d622..bef283d117 100644 --- a/crates/logging/logging-components/Cargo.toml +++ b/crates/logging/logging-components/Cargo.toml @@ -12,4 +12,5 @@ description = """ """ [dependencies] -cgp = { workspace = true } +cgp = { workspace = true } +hermes-prelude = { workspace = true } diff --git a/crates/logging/logging-components/src/impls/ignore.rs b/crates/logging/logging-components/src/impls/ignore.rs index bd7308e355..849963dca0 100644 --- a/crates/logging/logging-components/src/impls/ignore.rs +++ b/crates/logging/logging-components/src/impls/ignore.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{Logger, LoggerComponent}; diff --git a/crates/logging/logging-components/src/traits/logger.rs b/crates/logging/logging-components/src/traits/logger.rs index 58a659bf99..488d963578 100644 --- a/crates/logging/logging-components/src/traits/logger.rs +++ b/crates/logging/logging-components/src/traits/logger.rs @@ -1,5 +1,5 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: Logger, diff --git a/crates/logging/tracing-logging-components/Cargo.toml b/crates/logging/tracing-logging-components/Cargo.toml index 25c9cec131..579629d4b9 100644 --- a/crates/logging/tracing-logging-components/Cargo.toml +++ b/crates/logging/tracing-logging-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-relayer-components = { workspace = true } hermes-core = { workspace = true } hermes-relayer-components-extra = { workspace = true } diff --git a/crates/logging/tracing-logging-components/src/contexts/message_only.rs b/crates/logging/tracing-logging-components/src/contexts/message_only.rs index 9a029f9e87..c0d1d53400 100644 --- a/crates/logging/tracing-logging-components/src/contexts/message_only.rs +++ b/crates/logging/tracing-logging-components/src/contexts/message_only.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_logging_components::traits::{Logger, LoggerComponent}; use hermes_logging_components::types::{LevelDebug, LevelError, LevelInfo, LevelTrace, LevelWarn}; +use hermes_prelude::*; use tracing::{debug, error, info, trace, warn}; pub struct LogMessageOnly(pub PhantomData); diff --git a/crates/logging/tracing-logging-components/src/impls/chain.rs b/crates/logging/tracing-logging-components/src/impls/chain.rs index 9fa3426834..7d274244c3 100644 --- a/crates/logging/tracing-logging-components/src/impls/chain.rs +++ b/crates/logging/tracing-logging-components/src/impls/chain.rs @@ -1,7 +1,7 @@ use core::fmt::{Debug, Display}; -use cgp::prelude::*; use hermes_logging_components::traits::{Logger, LoggerComponent}; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{HasChainId, HasMessageType}; use hermes_relayer_components::transaction::impls::{ LogRetryQueryTxResponse, LogSendMessagesWithSignerAndNonce, TxNoResponseError, diff --git a/crates/logging/tracing-logging-components/src/impls/core.rs b/crates/logging/tracing-logging-components/src/impls/core.rs index 2466ea0c7f..24a9976b47 100644 --- a/crates/logging/tracing-logging-components/src/impls/core.rs +++ b/crates/logging/tracing-logging-components/src/impls/core.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_logging_components::traits::{Logger, LoggerComponent}; use hermes_logging_components::types::{LevelDebug, LevelError, LevelInfo, LevelTrace, LevelWarn}; +use hermes_prelude::*; use hermes_relayer_components::error::impls::retry::LogPerformRetry; use tracing::{debug, error, info, trace, warn}; diff --git a/crates/logging/tracing-logging-components/src/impls/relay.rs b/crates/logging/tracing-logging-components/src/impls/relay.rs index b060c7da4b..eb7adae0d9 100644 --- a/crates/logging/tracing-logging-components/src/impls/relay.rs +++ b/crates/logging/tracing-logging-components/src/impls/relay.rs @@ -1,8 +1,8 @@ use core::fmt::{Debug, Display}; -use cgp::prelude::*; use hermes_logging_components::traits::{Logger, LoggerComponent}; use hermes_logging_components::types::LogLevel; +use hermes_prelude::*; use hermes_relayer_components::birelay::impls::LogAutoBiRelay; use hermes_relayer_components::birelay::traits::{HasBiRelayTypes, HasTwoWayRelay}; use hermes_relayer_components::chain::traits::{HasChainId, HasClientIdType, HasHeightType}; diff --git a/crates/mock/mock-relayer/Cargo.toml b/crates/mock/mock-relayer/Cargo.toml index ce7323480a..6bc8899d36 100644 --- a/crates/mock/mock-relayer/Cargo.toml +++ b/crates/mock/mock-relayer/Cargo.toml @@ -22,8 +22,9 @@ hermes-runtime = { workspace = true } hermes-cosmos-chain-components = { workspace = true } hermes-chain-type-components = { workspace = true } -eyre = { workspace = true } -flex-error = { workspace = true } -cgp = { workspace = true } -tokio = { workspace = true, features = [ "full" ] } -tracing = { workspace = true } +eyre = { workspace = true } +flex-error = { workspace = true } +cgp = { workspace = true } +hermes-prelude = { workspace = true } +tokio = { workspace = true, features = [ "full" ] } +tracing = { workspace = true } diff --git a/crates/mock/mock-relayer/src/relayer_mock/base/impls/chain.rs b/crates/mock/mock-relayer/src/relayer_mock/base/impls/chain.rs index c8905daf62..3481aea171 100644 --- a/crates/mock/mock-relayer/src/relayer_mock/base/impls/chain.rs +++ b/crates/mock/mock-relayer/src/relayer_mock/base/impls/chain.rs @@ -13,7 +13,6 @@ use core::marker::PhantomData; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::WithField; use cgp::core::types::WithType; -use cgp::prelude::*; use hermes_chain_type_components::impls::UseEventsMessageResponse; use hermes_chain_type_components::traits::{ ChainIdGetterComponent, ChainIdTypeProviderComponent, CommitmentProofTypeProvider, @@ -22,6 +21,7 @@ use hermes_chain_type_components::traits::{ MessageResponseTypeComponent, MessageTypeProviderComponent, TimeTypeComponent, TimeoutTypeComponent, }; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ AckPacketMessageBuilder, AckPacketMessageBuilderComponent, AckPacketPayloadBuilder, AckPacketPayloadBuilderComponent, AckPacketPayloadTypeProvider, diff --git a/crates/mock/mock-relayer/src/relayer_mock/base/impls/error.rs b/crates/mock/mock-relayer/src/relayer_mock/base/impls/error.rs index 99cafb9212..63d3c4643a 100644 --- a/crates/mock/mock-relayer/src/relayer_mock/base/impls/error.rs +++ b/crates/mock/mock-relayer/src/relayer_mock/base/impls/error.rs @@ -1,8 +1,8 @@ use cgp::core::error::{ ErrorRaiser, ErrorRaiserComponent, ErrorTypeProvider, ErrorTypeProviderComponent, }; -use cgp::prelude::*; use eyre::eyre; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::EmptyMessageResponse; use hermes_runtime::types::error::TokioRuntimeError; diff --git a/crates/mock/mock-relayer/src/relayer_mock/base/impls/relay.rs b/crates/mock/mock-relayer/src/relayer_mock/base/impls/relay.rs index 3a7f0a55db..ca0cae9b9b 100644 --- a/crates/mock/mock-relayer/src/relayer_mock/base/impls/relay.rs +++ b/crates/mock/mock-relayer/src/relayer_mock/base/impls/relay.rs @@ -4,7 +4,7 @@ use std::vec; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::{UseField, WithField}; use cgp::core::types::WithType; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::multi::traits::chain_at::{ ChainGetterAtComponent, ChainTypeProviderAtComponent, }; diff --git a/crates/mock/mock-relayer/src/relayer_mock/base/types/runtime.rs b/crates/mock/mock-relayer/src/relayer_mock/base/types/runtime.rs index 25c7414a2b..88ff13bf2e 100644 --- a/crates/mock/mock-relayer/src/relayer_mock/base/types/runtime.rs +++ b/crates/mock/mock-relayer/src/relayer_mock/base/types/runtime.rs @@ -1,7 +1,7 @@ use alloc::sync::Arc; use core::time::Duration; -use cgp::prelude::HasErrorType; +use hermes_prelude::HasErrorType; use hermes_runtime::types::error::TokioRuntimeError; use hermes_runtime_components::traits::{CanSleep, HasTime}; diff --git a/crates/mock/mock-relayer/src/relayer_mock/components/chain.rs b/crates/mock/mock-relayer/src/relayer_mock/components/chain.rs index dbe887d7b1..dacf43882f 100644 --- a/crates/mock/mock-relayer/src/relayer_mock/components/chain.rs +++ b/crates/mock/mock-relayer/src/relayer_mock/components/chain.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_logging_components::impls::IgnoreLog; use hermes_logging_components::traits::LoggerComponent; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ AckCommitmentHashTypeProviderComponent, AcknowledgementTypeProviderComponent, }; diff --git a/crates/mock/mock-relayer/src/relayer_mock/components/relay.rs b/crates/mock/mock-relayer/src/relayer_mock/components/relay.rs index a5ae7d59a8..f7b899fffb 100644 --- a/crates/mock/mock-relayer/src/relayer_mock/components/relay.rs +++ b/crates/mock/mock-relayer/src/relayer_mock/components/relay.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_logging_components::impls::IgnoreLog; use hermes_logging_components::traits::LoggerComponent; +use hermes_prelude::*; use hermes_relayer_components::relay::impls::{ BaseAckPacketRelayer, BaseReceivePacketRelayer, BaseTimeoutUnorderedPacketRelayer, PerformFullRelay, SendIbcMessagesToChain, SendIbcMessagesWithUpdateClient, SkipReceivedPacket, diff --git a/crates/mock/mock-relayer/src/relayer_mock/contexts/chain.rs b/crates/mock/mock-relayer/src/relayer_mock/contexts/chain.rs index 02e5ab4137..ea2d7d5d30 100644 --- a/crates/mock/mock-relayer/src/relayer_mock/contexts/chain.rs +++ b/crates/mock/mock-relayer/src/relayer_mock/contexts/chain.rs @@ -17,8 +17,8 @@ use std::sync::{Arc, Mutex}; use std::vec; use cgp::core::field::HasField; -use cgp::prelude::*; use eyre::eyre; +use hermes_prelude::*; use crate::relayer_mock::base::error::{BaseError, Error}; use crate::relayer_mock::base::types::aliases::{ diff --git a/crates/mock/mock-relayer/src/relayer_mock/contexts/relay.rs b/crates/mock/mock-relayer/src/relayer_mock/contexts/relay.rs index b92b054686..d9e79e5278 100644 --- a/crates/mock/mock-relayer/src/relayer_mock/contexts/relay.rs +++ b/crates/mock/mock-relayer/src/relayer_mock/contexts/relay.rs @@ -1,6 +1,6 @@ use alloc::string::String; -use cgp::prelude::*; +use hermes_prelude::*; use crate::relayer_mock::base::types::runtime::MockRuntimeContext; use crate::relayer_mock::contexts::chain::MockChainContext; diff --git a/crates/prelude/Cargo.toml b/crates/prelude/Cargo.toml new file mode 100644 index 0000000000..0ec1e3611f --- /dev/null +++ b/crates/prelude/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "hermes-prelude" +version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +keywords = { workspace = true } +repository = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +description = """ + Implementation of an IBC Relayer in Rust, as a library +""" + +[dependencies] +cgp = { workspace = true } +cgp-async = { workspace = true } diff --git a/crates/prelude/src/lib.rs b/crates/prelude/src/lib.rs new file mode 100644 index 0000000000..83a2637c65 --- /dev/null +++ b/crates/prelude/src/lib.rs @@ -0,0 +1,6 @@ +pub use cgp::prelude::*; +pub use cgp_async::async_trait; + +pub trait Async: Send + Sync + 'static {} + +impl Async for A where A: Send + Sync + 'static {} diff --git a/crates/relayer/relayer-components-extra/Cargo.toml b/crates/relayer/relayer-components-extra/Cargo.toml index 816d1e3ac2..c132429309 100644 --- a/crates/relayer/relayer-components-extra/Cargo.toml +++ b/crates/relayer/relayer-components-extra/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-relayer-components = { workspace = true } hermes-chain-type-components = { workspace = true } hermes-runtime-components = { workspace = true } diff --git a/crates/relayer/relayer-components-extra/src/batch/impls/message_sender.rs b/crates/relayer/relayer-components-extra/src/batch/impls/message_sender.rs index 7abf5edb3d..f20b68cc37 100644 --- a/crates/relayer/relayer-components-extra/src/batch/impls/message_sender.rs +++ b/crates/relayer/relayer-components-extra/src/batch/impls/message_sender.rs @@ -1,11 +1,11 @@ use alloc::vec::Vec; use core::marker::PhantomData; -use cgp::prelude::*; use futures::channel::mpsc::{SendError, TrySendError}; use futures::channel::oneshot; use futures::channel::oneshot::Canceled; use hermes_chain_type_components::traits::MessageResponseOf; +use hermes_prelude::*; use hermes_relayer_components::chain::types::aliases::MessageOf; use hermes_relayer_components::relay::traits::{ CanSendIbcMessages, HasTargetChainTypes, IbcMessageSender, IbcMessageSenderComponent, diff --git a/crates/relayer/relayer-components-extra/src/batch/traits/channel.rs b/crates/relayer/relayer-components-extra/src/batch/traits/channel.rs index 40bb443378..fa4bdb0021 100644 --- a/crates/relayer/relayer-components-extra/src/batch/traits/channel.rs +++ b/crates/relayer/relayer-components-extra/src/batch/traits/channel.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::field::UseField; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::multi::types::tags::{Dst, Src}; use hermes_relayer_components::relay::impls::SelectRelayChains; diff --git a/crates/relayer/relayer-components-extra/src/batch/traits/types.rs b/crates/relayer/relayer-components-extra/src/batch/traits/types.rs index 6defeee835..9edf4a8dcf 100644 --- a/crates/relayer/relayer-components-extra/src/batch/traits/types.rs +++ b/crates/relayer/relayer-components-extra/src/batch/traits/types.rs @@ -2,13 +2,13 @@ use alloc::sync::Arc; use alloc::vec::Vec; use cgp::core::Async; -use cgp::prelude::HasAsyncErrorType; use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender}; use futures::channel::oneshot; use futures::lock::Mutex; use hermes_chain_type_components::traits::{ HasMessageResponseType, HasMessageType, MessageResponseOf, }; +use hermes_prelude::HasAsyncErrorType; use hermes_relayer_components::chain::types::aliases::MessageOf; use hermes_relayer_components::multi::traits::chain_at::HasChainTypeAt; diff --git a/crates/relayer/relayer-components-extra/src/batch/worker.rs b/crates/relayer/relayer-components-extra/src/batch/worker.rs index bb2396f0f9..3f4538a887 100644 --- a/crates/relayer/relayer-components-extra/src/batch/worker.rs +++ b/crates/relayer/relayer-components-extra/src/batch/worker.rs @@ -4,9 +4,9 @@ use alloc::vec::Vec; use core::marker::PhantomData; use core::mem; -use cgp::prelude::*; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LogLevel; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{CanEstimateMessageSize, HasMessageType}; use hermes_relayer_components::multi::traits::chain_at::HasChainAt; use hermes_relayer_components::relay::traits::{CanSendIbcMessages, RelayTarget}; diff --git a/crates/relayer/relayer-components-extra/src/build/impls/relay/batch.rs b/crates/relayer/relayer-components-extra/src/build/impls/relay/batch.rs index 471d74746a..40bef8d7a3 100644 --- a/crates/relayer/relayer-components-extra/src/build/impls/relay/batch.rs +++ b/crates/relayer/relayer-components-extra/src/build/impls/relay/batch.rs @@ -2,12 +2,12 @@ use alloc::sync::Arc; use core::marker::PhantomData; use cgp::core::Async; -use cgp::prelude::*; use futures::channel::mpsc::unbounded; use futures::lock::Mutex; use hermes_chain_type_components::traits::{ HasChainIdType, HasMessageResponseType, HasMessageType, }; +use hermes_prelude::*; use hermes_relayer_components::build::traits::builders::relay_from_chains_builder::{ RelayFromChainsBuilder, RelayFromChainsBuilderComponent, }; diff --git a/crates/relayer/relayer-components-extra/src/build/traits/cache.rs b/crates/relayer/relayer-components-extra/src/build/traits/cache.rs index 93518c1e6c..fee201b4d8 100644 --- a/crates/relayer/relayer-components-extra/src/build/traits/cache.rs +++ b/crates/relayer/relayer-components-extra/src/build/traits/cache.rs @@ -4,9 +4,9 @@ use core::marker::PhantomData; use cgp::core::field::UseField; use cgp::core::Async; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_chain_type_components::traits::HasChainIdType; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasClientIdType; use hermes_relayer_components::chain::types::aliases::{ChainIdOf, ClientIdOf}; use hermes_relayer_components::multi::traits::relay_at::HasRelayTypeAt; diff --git a/crates/relayer/relayer-components-extra/src/build/traits/relay_with_batch_builder.rs b/crates/relayer/relayer-components-extra/src/build/traits/relay_with_batch_builder.rs index 7d14037907..fb4f78a4fb 100644 --- a/crates/relayer/relayer-components-extra/src/build/traits/relay_with_batch_builder.rs +++ b/crates/relayer/relayer-components-extra/src/build/traits/relay_with_batch_builder.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasClientIdType; use hermes_relayer_components::multi::traits::chain_at::{ChainAt, HasChainTypeAt}; use hermes_relayer_components::multi::traits::relay_at::{ClientIdAt, HasRelayTypeAt}; diff --git a/crates/relayer/relayer-components-extra/src/components/extra/build.rs b/crates/relayer/relayer-components-extra/src/components/extra/build.rs index abb471f159..6a21717f69 100644 --- a/crates/relayer/relayer-components-extra/src/components/extra/build.rs +++ b/crates/relayer/relayer-components-extra/src/components/extra/build.rs @@ -1,6 +1,6 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; + use hermes_prelude::*; use hermes_relayer_components::build::traits::builders::birelay_builder::BiRelayBuilderComponent; use hermes_relayer_components::build::traits::builders::chain_builder::ChainBuilderComponent; use hermes_relayer_components::build::traits::builders::relay_builder::RelayBuilderComponent; diff --git a/crates/relayer/relayer-components-extra/src/components/extra/chain.rs b/crates/relayer/relayer-components-extra/src/components/extra/chain.rs index 8f40c320f7..b9a415639a 100644 --- a/crates/relayer/relayer-components-extra/src/components/extra/chain.rs +++ b/crates/relayer/relayer-components-extra/src/components/extra/chain.rs @@ -1,6 +1,6 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; + use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ ChainStatusQuerierComponent, ConsensusStateQuerierComponent, }; diff --git a/crates/relayer/relayer-components-extra/src/components/extra/relay.rs b/crates/relayer/relayer-components-extra/src/components/extra/relay.rs index b81c57ef92..ba54015abe 100644 --- a/crates/relayer/relayer-components-extra/src/components/extra/relay.rs +++ b/crates/relayer/relayer-components-extra/src/components/extra/relay.rs @@ -1,7 +1,7 @@ #[cgp::re_export_imports] mod preset { use cgp::extra::run::RunnerComponent; - use cgp::prelude::*; + use hermes_prelude::*; use hermes_relayer_components::components::default::DefaultRelayPreset; use hermes_relayer_components::error::impls::retry::PerformRetryWithRetryableError; use hermes_relayer_components::error::traits::RetryPerformerComponent; diff --git a/crates/relayer/relayer-components-extra/src/relay/impls/packet_relayers/extra.rs b/crates/relayer/relayer-components-extra/src/relay/impls/packet_relayers/extra.rs index b0491cb7d2..0ec3301244 100644 --- a/crates/relayer/relayer-components-extra/src/relay/impls/packet_relayers/extra.rs +++ b/crates/relayer/relayer-components-extra/src/relay/impls/packet_relayers/extra.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ CanBuildPacketFromWriteAck, CanQueryChainStatus, CanQueryPacketIsCleared, CanQueryPacketIsReceived, CanReadPacketFields, HasWriteAckEvent, diff --git a/crates/relayer/relayer-components-extra/src/relay/impls/packet_relayers/retry.rs b/crates/relayer/relayer-components-extra/src/relay/impls/packet_relayers/retry.rs index 98c7a3af25..955ee8f74d 100644 --- a/crates/relayer/relayer-components-extra/src/relay/impls/packet_relayers/retry.rs +++ b/crates/relayer/relayer-components-extra/src/relay/impls/packet_relayers/retry.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::error::traits::{CanPerformRetry, HasMaxErrorRetry}; use hermes_relayer_components::relay::traits::{ HasRelayChains, PacketOf, PacketRelayer, PacketRelayerComponent, diff --git a/crates/relayer/relayer-components-extra/src/telemetry/components/consensus_state.rs b/crates/relayer/relayer-components-extra/src/telemetry/components/consensus_state.rs index 8f3d65fa0b..fe9a2a1978 100644 --- a/crates/relayer/relayer-components-extra/src/telemetry/components/consensus_state.rs +++ b/crates/relayer/relayer-components-extra/src/telemetry/components/consensus_state.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ ConsensusStateQuerier, ConsensusStateQuerierComponent, HasConsensusStateType, HasHeightType, HasIbcChainTypes, diff --git a/crates/relayer/relayer-components-extra/src/telemetry/components/status.rs b/crates/relayer/relayer-components-extra/src/telemetry/components/status.rs index 03d31288a0..0f984121e9 100644 --- a/crates/relayer/relayer-components-extra/src/telemetry/components/status.rs +++ b/crates/relayer/relayer-components-extra/src/telemetry/components/status.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{HasChainStatusType, *}; use crate::telemetry::traits::metrics::{HasMetric, TelemetryCounter}; diff --git a/crates/relayer/relayer-components/Cargo.toml b/crates/relayer/relayer-components/Cargo.toml index aa0451dca6..5002223568 100644 --- a/crates/relayer/relayer-components/Cargo.toml +++ b/crates/relayer/relayer-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime-components = { workspace = true } hermes-logging-components = { workspace = true } hermes-encoding-components = { workspace = true } diff --git a/crates/relayer/relayer-components/src/birelay/impls/auto_birelay.rs b/crates/relayer/relayer-components/src/birelay/impls/auto_birelay.rs index aee9738dc8..8dcb734718 100644 --- a/crates/relayer/relayer-components/src/birelay/impls/auto_birelay.rs +++ b/crates/relayer/relayer-components/src/birelay/impls/auto_birelay.rs @@ -6,11 +6,11 @@ use core::time::Duration; use cgp::core::error::ErrorOf; use cgp::extra::runtime::HasRuntime; -use cgp::prelude::*; use hermes_chain_components::traits::{ CanAdjustHeight, CanQueryBlockTime, CanQueryChainHeight, HasHeightType, HeightOf, }; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use hermes_runtime_components::traits::{CanRunConcurrentTasks, Task}; use crate::birelay::traits::{ diff --git a/crates/relayer/relayer-components/src/birelay/traits/auto_birelay.rs b/crates/relayer/relayer-components/src/birelay/traits/auto_birelay.rs index 563b4e9e65..aa46d50aa4 100644 --- a/crates/relayer/relayer-components/src/birelay/traits/auto_birelay.rs +++ b/crates/relayer/relayer-components/src/birelay/traits/auto_birelay.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: AutoBiRelayer, diff --git a/crates/relayer/relayer-components/src/build/components/birelay.rs b/crates/relayer/relayer-components/src/build/components/birelay.rs index 6afab66a8d..d345872696 100644 --- a/crates/relayer/relayer-components/src/build/components/birelay.rs +++ b/crates/relayer/relayer-components/src/build/components/birelay.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::build::traits::builders::birelay_builder::{BiRelayBuilder, BiRelayBuilderComponent}; use crate::build::traits::builders::birelay_from_relay_builder::CanBuildBiRelayFromRelays; diff --git a/crates/relayer/relayer-components/src/build/components/chain/cache.rs b/crates/relayer/relayer-components/src/build/components/chain/cache.rs index e0c606895d..d2d715facd 100644 --- a/crates/relayer/relayer-components/src/build/components/chain/cache.rs +++ b/crates/relayer/relayer-components/src/build/components/chain/cache.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::build::traits::builders::chain_builder::{ChainBuilder, ChainBuilderComponent}; use crate::build::traits::cache::HasChainCache; diff --git a/crates/relayer/relayer-components/src/build/components/relay/build_from_chain.rs b/crates/relayer/relayer-components/src/build/components/relay/build_from_chain.rs index dde526d76b..888fe6581c 100644 --- a/crates/relayer/relayer-components/src/build/components/relay/build_from_chain.rs +++ b/crates/relayer/relayer-components/src/build/components/relay/build_from_chain.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::build::traits::builders::chain_builder::CanBuildChain; use crate::build::traits::builders::relay_builder::{RelayBuilder, RelayBuilderComponent}; diff --git a/crates/relayer/relayer-components/src/build/components/relay/cache.rs b/crates/relayer/relayer-components/src/build/components/relay/cache.rs index 3647f0cc33..c6ce42a4fc 100644 --- a/crates/relayer/relayer-components/src/build/components/relay/cache.rs +++ b/crates/relayer/relayer-components/src/build/components/relay/cache.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::build::traits::builders::relay_builder::{RelayBuilder, RelayBuilderComponent}; use crate::build::traits::cache::HasRelayCache; diff --git a/crates/relayer/relayer-components/src/build/impls/bootstrap/birelay.rs b/crates/relayer/relayer-components/src/build/impls/bootstrap/birelay.rs index 77faa22793..9a0d551537 100644 --- a/crates/relayer/relayer-components/src/build/impls/bootstrap/birelay.rs +++ b/crates/relayer/relayer-components/src/build/impls/bootstrap/birelay.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::Async; -use cgp::prelude::*; +use hermes_prelude::*; use crate::build::impls::bootstrap::relay::CanBootstrapRelay; use crate::build::traits::builders::birelay_builder::CanBuildBiRelay; diff --git a/crates/relayer/relayer-components/src/build/impls/bootstrap/relay.rs b/crates/relayer/relayer-components/src/build/impls/bootstrap/relay.rs index 0de8aa8374..c31c1ee38b 100644 --- a/crates/relayer/relayer-components/src/build/impls/bootstrap/relay.rs +++ b/crates/relayer/relayer-components/src/build/impls/bootstrap/relay.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::Async; -use cgp::prelude::*; +use hermes_prelude::*; use crate::build::traits::builders::chain_builder::CanBuildChain; use crate::build::traits::builders::relay_builder::CanBuildRelay; diff --git a/crates/relayer/relayer-components/src/build/traits/builders/birelay_builder.rs b/crates/relayer/relayer-components/src/build/traits/builders/birelay_builder.rs index d3c92c12cb..b7771fda05 100644 --- a/crates/relayer/relayer-components/src/build/traits/builders/birelay_builder.rs +++ b/crates/relayer/relayer-components/src/build/traits/builders/birelay_builder.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasClientIdType; +use hermes_prelude::*; use crate::chain::traits::HasChainIdType; use crate::multi::traits::birelay_at::HasBiRelayTypeAt; diff --git a/crates/relayer/relayer-components/src/build/traits/builders/birelay_from_relay_builder.rs b/crates/relayer/relayer-components/src/build/traits/builders/birelay_from_relay_builder.rs index 661439cea4..ac1c95b6e9 100644 --- a/crates/relayer/relayer-components/src/build/traits/builders/birelay_from_relay_builder.rs +++ b/crates/relayer/relayer-components/src/build/traits/builders/birelay_from_relay_builder.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::multi::traits::birelay_at::HasBiRelayTypeAt; use crate::multi::traits::relay_at::{HasRelayTypeAt, RelayAt}; diff --git a/crates/relayer/relayer-components/src/build/traits/builders/chain_builder.rs b/crates/relayer/relayer-components/src/build/traits/builders/chain_builder.rs index 90e7dc99c9..3da1165c42 100644 --- a/crates/relayer/relayer-components/src/build/traits/builders/chain_builder.rs +++ b/crates/relayer/relayer-components/src/build/traits/builders/chain_builder.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::HasChainIdType; use crate::chain::types::aliases::ChainIdOf; diff --git a/crates/relayer/relayer-components/src/build/traits/builders/relay_builder.rs b/crates/relayer/relayer-components/src/build/traits/builders/relay_builder.rs index 3fb60a5bb7..0214537129 100644 --- a/crates/relayer/relayer-components/src/build/traits/builders/relay_builder.rs +++ b/crates/relayer/relayer-components/src/build/traits/builders/relay_builder.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::HasClientIdType; +use hermes_prelude::*; use crate::chain::traits::HasChainIdType; use crate::multi::traits::chain_at::{ChainAt, ChainIdAt, HasChainTypeAt}; diff --git a/crates/relayer/relayer-components/src/build/traits/builders/relay_from_chains_builder.rs b/crates/relayer/relayer-components/src/build/traits/builders/relay_from_chains_builder.rs index 94e986f3c1..89a24bbb13 100644 --- a/crates/relayer/relayer-components/src/build/traits/builders/relay_from_chains_builder.rs +++ b/crates/relayer/relayer-components/src/build/traits/builders/relay_from_chains_builder.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::HasClientIdType; +use hermes_prelude::*; use crate::multi::traits::chain_at::{ChainAt, HasChainTypeAt}; use crate::multi::traits::relay_at::{ClientIdAt, HasRelayTypeAt}; diff --git a/crates/relayer/relayer-components/src/components/default/birelay.rs b/crates/relayer/relayer-components/src/components/default/birelay.rs index f483d42a99..b152bd76aa 100644 --- a/crates/relayer/relayer-components/src/components/default/birelay.rs +++ b/crates/relayer/relayer-components/src/components/default/birelay.rs @@ -1,7 +1,7 @@ #[cgp::re_export_imports] mod preset { use cgp::extra::run::RunnerComponent; - use cgp::prelude::*; + use hermes_prelude::*; use crate::birelay::impls::PerformAutoBiRelay; use crate::birelay::traits::AutoBiRelayerComponent; diff --git a/crates/relayer/relayer-components/src/components/default/build.rs b/crates/relayer/relayer-components/src/components/default/build.rs index ba6059b947..5de4341b3d 100644 --- a/crates/relayer/relayer-components/src/components/default/build.rs +++ b/crates/relayer/relayer-components/src/components/default/build.rs @@ -1,6 +1,6 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; + use hermes_prelude::*; use crate::build::components::{ BuildBiRelayFromRelays, BuildChainWithCache, BuildRelayFromChains, BuildRelayWithCache, diff --git a/crates/relayer/relayer-components/src/components/default/relay.rs b/crates/relayer/relayer-components/src/components/default/relay.rs index 6216b0e588..7b6598b289 100644 --- a/crates/relayer/relayer-components/src/components/default/relay.rs +++ b/crates/relayer/relayer-components/src/components/default/relay.rs @@ -1,7 +1,7 @@ #[cgp::re_export_imports] mod preset { use cgp::extra::run::RunnerComponent; - use cgp::prelude::*; + use hermes_prelude::*; use crate::error::impls::retry::ReturnMaxRetry; use crate::error::traits::MaxErrorRetryGetterComponent; diff --git a/crates/relayer/relayer-components/src/components/default/transaction.rs b/crates/relayer/relayer-components/src/components/default/transaction.rs index c11379e519..a96418d1a0 100644 --- a/crates/relayer/relayer-components/src/components/default/transaction.rs +++ b/crates/relayer/relayer-components/src/components/default/transaction.rs @@ -1,6 +1,6 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; + use hermes_prelude::*; use crate::chain::traits::MessageSenderComponent; use crate::transaction::impls::{ diff --git a/crates/relayer/relayer-components/src/error/impls/retry/max_retry.rs b/crates/relayer/relayer-components/src/error/impls/retry/max_retry.rs index b5fab5fbec..1e11b44010 100644 --- a/crates/relayer/relayer-components/src/error/impls/retry/max_retry.rs +++ b/crates/relayer/relayer-components/src/error/impls/retry/max_retry.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::error::traits::{MaxErrorRetryGetter, MaxErrorRetryGetterComponent}; diff --git a/crates/relayer/relayer-components/src/error/impls/retry/perform.rs b/crates/relayer/relayer-components/src/error/impls/retry/perform.rs index e58b5abd02..9696686b3f 100644 --- a/crates/relayer/relayer-components/src/error/impls/retry/perform.rs +++ b/crates/relayer/relayer-components/src/error/impls/retry/perform.rs @@ -2,8 +2,8 @@ use core::fmt::Debug; use core::time::Duration; use cgp::extra::runtime::HasRuntime; -use cgp::prelude::*; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use hermes_runtime_components::traits::CanSleep; use crate::error::traits::{AsyncCont, HasRetryableError, RetryPerformer, RetryPerformerComponent}; diff --git a/crates/relayer/relayer-components/src/error/impls/retry/retryable.rs b/crates/relayer/relayer-components/src/error/impls/retry/retryable.rs index 0cd89cc3e6..dc53770f0a 100644 --- a/crates/relayer/relayer-components/src/error/impls/retry/retryable.rs +++ b/crates/relayer/relayer-components/src/error/impls/retry/retryable.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::error::traits::{ProvideRetryableError, RetryableErrorComponent}; diff --git a/crates/relayer/relayer-components/src/error/traits/retry.rs b/crates/relayer/relayer-components/src/error/traits/retry.rs index 39cf8ae4d9..e6c0c3b848 100644 --- a/crates/relayer/relayer-components/src/error/traits/retry.rs +++ b/crates/relayer/relayer-components/src/error/traits/retry.rs @@ -1,6 +1,6 @@ use core::future::Future; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: RetryPerformer, diff --git a/crates/relayer/relayer-components/src/multi/traits/birelay_at.rs b/crates/relayer/relayer-components/src/multi/traits/birelay_at.rs index 7a7d2e1340..771b122795 100644 --- a/crates/relayer/relayer-components/src/multi/traits/birelay_at.rs +++ b/crates/relayer/relayer-components/src/multi/traits/birelay_at.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type { name: BiRelayTypeProviderAtComponent, diff --git a/crates/relayer/relayer-components/src/multi/traits/chain_at.rs b/crates/relayer/relayer-components/src/multi/traits/chain_at.rs index 1574c3399d..95cf493078 100644 --- a/crates/relayer/relayer-components/src/multi/traits/chain_at.rs +++ b/crates/relayer/relayer-components/src/multi/traits/chain_at.rs @@ -3,7 +3,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::field::UseField; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::types::aliases::ChainIdOf; diff --git a/crates/relayer/relayer-components/src/multi/traits/client_id_at.rs b/crates/relayer/relayer-components/src/multi/traits/client_id_at.rs index c083f93ef1..590cecb38f 100644 --- a/crates/relayer/relayer-components/src/multi/traits/client_id_at.rs +++ b/crates/relayer/relayer-components/src/multi/traits/client_id_at.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; use cgp::core::field::UseField; -use cgp::prelude::*; use hermes_chain_components::traits::HasClientIdType; +use hermes_prelude::*; use crate::multi::traits::chain_at::{ChainAt, HasChainTypeAt}; use crate::multi::traits::relay_at::ClientIdAt; diff --git a/crates/relayer/relayer-components/src/multi/traits/relay_at.rs b/crates/relayer/relayer-components/src/multi/traits/relay_at.rs index 99c91825bb..111854427a 100644 --- a/crates/relayer/relayer-components/src/multi/traits/relay_at.rs +++ b/crates/relayer/relayer-components/src/multi/traits/relay_at.rs @@ -3,7 +3,7 @@ use core::marker::PhantomData; use cgp::core::component::WithProvider; use cgp::core::macros::blanket_trait; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::HasIbcChainTypes; use crate::chain::types::aliases::ClientIdOf; diff --git a/crates/relayer/relayer-components/src/relay/impls/auto_relayers/both_targets.rs b/crates/relayer/relayer-components/src/relay/impls/auto_relayers/both_targets.rs index 7625fe2f43..6a2254a47b 100644 --- a/crates/relayer/relayer-components/src/relay/impls/auto_relayers/both_targets.rs +++ b/crates/relayer/relayer-components/src/relay/impls/auto_relayers/both_targets.rs @@ -2,7 +2,7 @@ use alloc::boxed::Box; use alloc::vec; use cgp::extra::run::{Runner, RunnerComponent}; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{CanRunConcurrentTasks, HasRuntime, Task}; use crate::relay::traits::{ diff --git a/crates/relayer/relayer-components/src/relay/impls/auto_relayers/both_ways.rs b/crates/relayer/relayer-components/src/relay/impls/auto_relayers/both_ways.rs index 71fcabf765..6c7a648557 100644 --- a/crates/relayer/relayer-components/src/relay/impls/auto_relayers/both_ways.rs +++ b/crates/relayer/relayer-components/src/relay/impls/auto_relayers/both_ways.rs @@ -3,7 +3,7 @@ use alloc::vec; use cgp::core::field::Index; use cgp::extra::run::{CanRun, Runner, RunnerComponent}; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{CanRunConcurrentTasks, HasRuntime, Task}; use crate::birelay::traits::HasTwoWayRelay; diff --git a/crates/relayer/relayer-components/src/relay/impls/auto_relayers/poll_event.rs b/crates/relayer/relayer-components/src/relay/impls/auto_relayers/poll_event.rs index b041874004..8a0d3e45cd 100644 --- a/crates/relayer/relayer-components/src/relay/impls/auto_relayers/poll_event.rs +++ b/crates/relayer/relayer-components/src/relay/impls/auto_relayers/poll_event.rs @@ -3,13 +3,13 @@ use alloc::format; use core::marker::PhantomData; use cgp::core::error::ErrorOf; -use cgp::prelude::*; use hermes_chain_components::traits::{ CanIncrementHeight, CanQueryBlockEvents, HasEventType, HasHeightType, }; use hermes_chain_components::types::aliases::{EventOf, HeightOf}; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::{LevelInfo, LevelTrace}; +use hermes_prelude::*; use hermes_runtime_components::traits::{CanRunConcurrentTasks, HasRuntime, Task}; use crate::relay::traits::{ diff --git a/crates/relayer/relayer-components/src/relay/impls/auto_relayers/starting_current_height.rs b/crates/relayer/relayer-components/src/relay/impls/auto_relayers/starting_current_height.rs index 67aea7cbce..17ddd095f5 100644 --- a/crates/relayer/relayer-components/src/relay/impls/auto_relayers/starting_current_height.rs +++ b/crates/relayer/relayer-components/src/relay/impls/auto_relayers/starting_current_height.rs @@ -1,6 +1,6 @@ use cgp::core::error::ErrorOf; -use cgp::prelude::*; use hermes_chain_components::traits::CanQueryChainHeight; +use hermes_prelude::*; use crate::relay::traits::{ CanAutoRelayWithHeights, HasTargetChains, RelayTarget, TargetAutoRelayer, diff --git a/crates/relayer/relayer-components/src/relay/impls/channel/bootstrap.rs b/crates/relayer/relayer-components/src/relay/impls/channel/bootstrap.rs index 5c03c09985..d9f5ebf6cd 100644 --- a/crates/relayer/relayer-components/src/relay/impls/channel/bootstrap.rs +++ b/crates/relayer/relayer-components/src/relay/impls/channel/bootstrap.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::{HasIbcChainTypes, HasInitChannelOptionsType, InitChannelOptions}; use crate::relay::traits::{CanInitChannel, CanRelayChannelOpenHandshake, HasRelayChains}; diff --git a/crates/relayer/relayer-components/src/relay/impls/channel/open_ack.rs b/crates/relayer/relayer-components/src/relay/impls/channel/open_ack.rs index 553fd051a9..734a396dc0 100644 --- a/crates/relayer/relayer-components/src/relay/impls/channel/open_ack.rs +++ b/crates/relayer/relayer-components/src/relay/impls/channel/open_ack.rs @@ -1,10 +1,10 @@ use alloc::format; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::HasChainId; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LevelInfo; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildChannelOpenAckMessage, CanBuildChannelOpenAckPayload, CanQueryChainHeight, diff --git a/crates/relayer/relayer-components/src/relay/impls/channel/open_confirm.rs b/crates/relayer/relayer-components/src/relay/impls/channel/open_confirm.rs index be2367958e..a0428905ee 100644 --- a/crates/relayer/relayer-components/src/relay/impls/channel/open_confirm.rs +++ b/crates/relayer/relayer-components/src/relay/impls/channel/open_confirm.rs @@ -1,10 +1,10 @@ use alloc::format; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::HasChainId; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LevelInfo; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildChannelOpenConfirmMessage, CanBuildChannelOpenConfirmPayload, CanQueryChainHeight, diff --git a/crates/relayer/relayer-components/src/relay/impls/channel/open_handshake.rs b/crates/relayer/relayer-components/src/relay/impls/channel/open_handshake.rs index 20843f9e92..51cef62dc7 100644 --- a/crates/relayer/relayer-components/src/relay/impls/channel/open_handshake.rs +++ b/crates/relayer/relayer-components/src/relay/impls/channel/open_handshake.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::HasIbcChainTypes; use crate::relay::traits::{ diff --git a/crates/relayer/relayer-components/src/relay/impls/channel/open_init.rs b/crates/relayer/relayer-components/src/relay/impls/channel/open_init.rs index 2812936afb..133d27fea2 100644 --- a/crates/relayer/relayer-components/src/relay/impls/channel/open_init.rs +++ b/crates/relayer/relayer-components/src/relay/impls/channel/open_init.rs @@ -2,10 +2,10 @@ use alloc::format; use core::fmt::Debug; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::{CanExtractFromMessageResponse, HasChainId}; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LevelInfo; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildChannelOpenInitMessage, CanSendSingleMessage, HasChannelOpenInitEvent, diff --git a/crates/relayer/relayer-components/src/relay/impls/channel/open_try.rs b/crates/relayer/relayer-components/src/relay/impls/channel/open_try.rs index a6bca12ed3..8f729347ac 100644 --- a/crates/relayer/relayer-components/src/relay/impls/channel/open_try.rs +++ b/crates/relayer/relayer-components/src/relay/impls/channel/open_try.rs @@ -2,10 +2,10 @@ use alloc::format; use core::fmt::Debug; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::{CanExtractFromMessageResponse, HasChainId}; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LevelInfo; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildChannelOpenTryMessage, CanBuildChannelOpenTryPayload, CanQueryChainHeight, diff --git a/crates/relayer/relayer-components/src/relay/impls/connection/bootstrap.rs b/crates/relayer/relayer-components/src/relay/impls/connection/bootstrap.rs index 9f17962f6c..0ce06c357f 100644 --- a/crates/relayer/relayer-components/src/relay/impls/connection/bootstrap.rs +++ b/crates/relayer/relayer-components/src/relay/impls/connection/bootstrap.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasConnectionIdType; +use hermes_prelude::*; use crate::chain::traits::{HasInitConnectionOptionsType, InitConnectionOptionsOf}; use crate::relay::traits::{CanInitConnection, CanRelayConnectionOpenHandshake, HasRelayChains}; diff --git a/crates/relayer/relayer-components/src/relay/impls/connection/open_ack.rs b/crates/relayer/relayer-components/src/relay/impls/connection/open_ack.rs index f18b84de79..0b08dc4c4c 100644 --- a/crates/relayer/relayer-components/src/relay/impls/connection/open_ack.rs +++ b/crates/relayer/relayer-components/src/relay/impls/connection/open_ack.rs @@ -1,10 +1,10 @@ use alloc::format; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::HasChainId; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LevelInfo; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildConnectionOpenAckMessage, CanBuildConnectionOpenAckPayload, CanQueryChainHeight, diff --git a/crates/relayer/relayer-components/src/relay/impls/connection/open_confirm.rs b/crates/relayer/relayer-components/src/relay/impls/connection/open_confirm.rs index 1d022d23b5..0f018c8e3c 100644 --- a/crates/relayer/relayer-components/src/relay/impls/connection/open_confirm.rs +++ b/crates/relayer/relayer-components/src/relay/impls/connection/open_confirm.rs @@ -1,10 +1,10 @@ use alloc::format; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::HasChainId; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LevelInfo; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildConnectionOpenConfirmMessage, CanBuildConnectionOpenConfirmPayload, diff --git a/crates/relayer/relayer-components/src/relay/impls/connection/open_handshake.rs b/crates/relayer/relayer-components/src/relay/impls/connection/open_handshake.rs index 9822e8825e..bf0f97315c 100644 --- a/crates/relayer/relayer-components/src/relay/impls/connection/open_handshake.rs +++ b/crates/relayer/relayer-components/src/relay/impls/connection/open_handshake.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::HasIbcChainTypes; use crate::relay::traits::{ diff --git a/crates/relayer/relayer-components/src/relay/impls/connection/open_init.rs b/crates/relayer/relayer-components/src/relay/impls/connection/open_init.rs index b7e569d3cf..7856afbb75 100644 --- a/crates/relayer/relayer-components/src/relay/impls/connection/open_init.rs +++ b/crates/relayer/relayer-components/src/relay/impls/connection/open_init.rs @@ -2,10 +2,10 @@ use alloc::format; use core::fmt::Debug; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::{CanExtractFromMessageResponse, HasChainId}; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LevelInfo; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildConnectionOpenInitMessage, CanBuildConnectionOpenInitPayload, diff --git a/crates/relayer/relayer-components/src/relay/impls/connection/open_try.rs b/crates/relayer/relayer-components/src/relay/impls/connection/open_try.rs index 7fff6f55a1..981c45e88a 100644 --- a/crates/relayer/relayer-components/src/relay/impls/connection/open_try.rs +++ b/crates/relayer/relayer-components/src/relay/impls/connection/open_try.rs @@ -2,10 +2,10 @@ use alloc::format; use core::fmt::Debug; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::{CanExtractFromMessageResponse, HasChainId}; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LevelInfo; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildConnectionOpenTryMessage, CanBuildConnectionOpenTryPayload, CanQueryChainHeight, diff --git a/crates/relayer/relayer-components/src/relay/impls/create_client.rs b/crates/relayer/relayer-components/src/relay/impls/create_client.rs index ed8fe368cc..4e71454148 100644 --- a/crates/relayer/relayer-components/src/relay/impls/create_client.rs +++ b/crates/relayer/relayer-components/src/relay/impls/create_client.rs @@ -1,9 +1,9 @@ use core::fmt::Debug; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::CanExtractFromMessageResponse; use hermes_chain_type_components::traits::HasMessageResponseEvents; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildCreateClientMessage, CanBuildCreateClientPayload, CanSendSingleMessage, HasChainId, diff --git a/crates/relayer/relayer-components/src/relay/impls/event_relayers/packet_event.rs b/crates/relayer/relayer-components/src/relay/impls/event_relayers/packet_event.rs index dbd0b32693..3ee491ee23 100644 --- a/crates/relayer/relayer-components/src/relay/impls/event_relayers/packet_event.rs +++ b/crates/relayer/relayer-components/src/relay/impls/event_relayers/packet_event.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::{ CanBuildPacketFromSendPacket, CanExtractFromEvent, CanQueryChainHeight, }; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use crate::chain::traits::{CanBuildPacketFromWriteAck, HasSendPacketEvent}; use crate::chain::types::aliases::EventOf; diff --git a/crates/relayer/relayer-components/src/relay/impls/message_senders/chain_sender.rs b/crates/relayer/relayer-components/src/relay/impls/message_senders/chain_sender.rs index 5d0f4c5f9d..2823be3ce1 100644 --- a/crates/relayer/relayer-components/src/relay/impls/message_senders/chain_sender.rs +++ b/crates/relayer/relayer-components/src/relay/impls/message_senders/chain_sender.rs @@ -1,6 +1,6 @@ use alloc::vec::Vec; -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::CanSendMessages; use crate::relay::traits::{ diff --git a/crates/relayer/relayer-components/src/relay/impls/message_senders/update_client.rs b/crates/relayer/relayer-components/src/relay/impls/message_senders/update_client.rs index 8917302afa..40b00a05e9 100644 --- a/crates/relayer/relayer-components/src/relay/impls/message_senders/update_client.rs +++ b/crates/relayer/relayer-components/src/relay/impls/message_senders/update_client.rs @@ -1,8 +1,8 @@ use alloc::collections::BTreeSet; use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_prelude::*; use crate::chain::traits::{HasCounterpartyMessageHeight, HasIbcChainTypes}; use crate::relay::traits::{ diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_filters/allow_all.rs b/crates/relayer/relayer-components/src/relay/impls/packet_filters/allow_all.rs index 85d034e7a3..cef1c12ff3 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_filters/allow_all.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_filters/allow_all.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::{ HasRelayChains, PacketOf, RelayPacketFilter, RelayPacketFilterComponent, diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_filters/and.rs b/crates/relayer/relayer-components/src/relay/impls/packet_filters/and.rs index 366aebcaa4..1888db03c9 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_filters/and.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_filters/and.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::{ HasRelayChains, PacketOf, RelayPacketFilter, RelayPacketFilterComponent, diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_filters/chain.rs b/crates/relayer/relayer-components/src/relay/impls/packet_filters/chain.rs index 84d8253775..2ec7f91b92 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_filters/chain.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_filters/chain.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_components::traits::{CanFilterIncomingPacket, CanFilterOutgoingPacket}; +use hermes_prelude::*; use crate::relay::traits::{ CanRaiseRelayChainErrors, HasRelayChains, PacketOf, RelayPacketFilter, diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_filters/target.rs b/crates/relayer/relayer-components/src/relay/impls/packet_filters/target.rs index 117c55c038..5ecec6edb2 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_filters/target.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_filters/target.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_chain_components::traits::{ HasPacketDstChannelId, HasPacketDstPortId, HasPacketSrcChannelId, HasPacketSrcPortId, }; +use hermes_prelude::*; use crate::chain::traits::{CanQueryCounterpartyChainId, HasChainId}; use crate::relay::traits::{ diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_lock.rs b/crates/relayer/relayer-components/src/relay/impls/packet_lock.rs index 7d9044b143..f4dcf1d9b7 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_lock.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_lock.rs @@ -4,13 +4,13 @@ use core::marker::PhantomData; use cgp::core::field::UseField; use cgp::core::macros::blanket_trait; -use cgp::prelude::*; use futures::channel::oneshot::{channel, Receiver, Sender}; use futures::lock::Mutex; use hermes_chain_components::traits::{ HasChannelIdType, HasPacketDstChannelId, HasPacketDstPortId, HasPacketSequence, HasPacketSrcChannelId, HasPacketSrcPortId, HasPortIdType, HasSequenceType, }; +use hermes_prelude::*; use hermes_runtime_components::traits::{CanSpawnTask, HasRuntime, HasRuntimeType, Task}; use crate::chain::types::aliases::{ChannelIdOf, PortIdOf, SequenceOf}; diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/ack/base_ack_packet.rs b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/ack/base_ack_packet.rs index d153ccb06f..4f67640220 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/ack/base_ack_packet.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/ack/base_ack_packet.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::{AcknowledgementOf, HasOutgoingPacketType}; use hermes_chain_components::types::aliases::HeightOf; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildAckPacketMessage, CanBuildAckPacketPayload, CanQueryClientStateWithLatestHeight, diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/default.rs b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/default.rs index 943bccd292..50bd630ad7 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/default.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/default.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_chain_components::traits::{ CanBuildPacketFromWriteAck, CanQueryPacketIsCleared, CanQueryPacketIsReceived, CanReadPacketFields, }; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use crate::chain::traits::{CanQueryChainStatus, HasWriteAckEvent}; use crate::relay::impls::{ diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/filter_relayer.rs b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/filter_relayer.rs index e94b150b7c..04215e0fc8 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/filter_relayer.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/filter_relayer.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::{ CanFilterRelayPackets, PacketOf, PacketRelayer, PacketRelayerComponent, diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/full_relay.rs b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/full_relay.rs index d7a3f4b967..38884dff01 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/full_relay.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/full_relay.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_chain_components::traits::{ CanBuildPacketFromWriteAck, CanQueryChainHeight, CanQueryPacketIsReceived, CanReadPacketFields, }; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use crate::chain::traits::{CanQueryChainStatus, HasWriteAckEvent}; use crate::relay::traits::{ diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/lock.rs b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/lock.rs index ee2df28000..0f5f1f0438 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/lock.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/lock.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use crate::relay::traits::{ HasPacketLock, HasRelayChains, PacketOf, PacketRelayer, PacketRelayerComponent, diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/log.rs b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/log.rs index 7ef65cbaf4..149a4a3e06 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/log.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/log.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use crate::relay::traits::{HasRelayChains, PacketOf, PacketRelayer, PacketRelayerComponent}; diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/receive/base_receive_packet.rs b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/receive/base_receive_packet.rs index 1fa21e3f94..cb9cfe8d5a 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/receive/base_receive_packet.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/receive/base_receive_packet.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::{ CanBuildPacketFromWriteAck, CanExtractFromEvent, HasAcknowledgementType, }; use hermes_chain_type_components::traits::HasMessageResponseEvents; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildReceivePacketMessage, CanBuildReceivePacketPayload, diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/receive/skip_received_packet.rs b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/receive/skip_received_packet.rs index 9d2428cd54..37a708ec28 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/receive/skip_received_packet.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/receive/skip_received_packet.rs @@ -1,9 +1,9 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::{ HasAcknowledgementType, HasPacketDstChannelId, HasPacketDstPortId, HasPacketSequence, }; +use hermes_prelude::*; use crate::chain::traits::CanQueryPacketIsReceived; use crate::chain::types::aliases::HeightOf; diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/skip_cleared.rs b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/skip_cleared.rs index cb78cbd232..0ecce5c293 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/skip_cleared.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/skip_cleared.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::{ CanQueryPacketIsCleared, HasAcknowledgementType, HasHeightType, HasOutgoingPacketType, HasPacketSequence, HasPacketSrcChannelId, HasPacketSrcPortId, }; +use hermes_prelude::*; use crate::relay::traits::{ AckPacketRelayer, AckPacketRelayerComponent, HasRelayChains, PacketRelayer, diff --git a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/timeout_unordered_packet.rs b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/timeout_unordered_packet.rs index e73822e7e5..1f68726d4a 100644 --- a/crates/relayer/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/timeout_unordered_packet.rs +++ b/crates/relayer/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/timeout_unordered_packet.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::error::ErrorOf; -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildTimeoutUnorderedPacketMessage, CanBuildTimeoutUnorderedPacketPayload, diff --git a/crates/relayer/relayer-components/src/relay/impls/selector.rs b/crates/relayer/relayer-components/src/relay/impls/selector.rs index f831769ef1..b5199443b4 100644 --- a/crates/relayer/relayer-components/src/relay/impls/selector.rs +++ b/crates/relayer/relayer-components/src/relay/impls/selector.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; +use hermes_prelude::*; use crate::multi::traits::chain_at::{ ChainGetterAt, ChainGetterAtComponent, ChainTypeProviderAt, ChainTypeProviderAtComponent, diff --git a/crates/relayer/relayer-components/src/relay/impls/update_client/build.rs b/crates/relayer/relayer-components/src/relay/impls/update_client/build.rs index 9ccda7dc79..746e7a5d18 100644 --- a/crates/relayer/relayer-components/src/relay/impls/update_client/build.rs +++ b/crates/relayer/relayer-components/src/relay/impls/update_client/build.rs @@ -1,10 +1,10 @@ use alloc::vec::Vec; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::{HasClientIdType, HasHeightType}; use hermes_chain_components::types::aliases::ClientIdOf; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildUpdateClientMessage, CanBuildUpdateClientPayload, CanQueryClientStateWithLatestHeight, diff --git a/crates/relayer/relayer-components/src/relay/impls/update_client/default.rs b/crates/relayer/relayer-components/src/relay/impls/update_client/default.rs index 2fa8cc5c4b..dea2f7a33d 100644 --- a/crates/relayer/relayer-components/src/relay/impls/update_client/default.rs +++ b/crates/relayer/relayer-components/src/relay/impls/update_client/default.rs @@ -1,9 +1,9 @@ use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_components::impls::CanWaitChainReachHeight; use hermes_chain_components::traits::CanQueryConsensusStateWithLatestHeight; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use crate::chain::traits::{ CanBuildUpdateClientMessage, CanBuildUpdateClientPayload, CanQueryClientStateWithLatestHeight, diff --git a/crates/relayer/relayer-components/src/relay/impls/update_client/skip.rs b/crates/relayer/relayer-components/src/relay/impls/update_client/skip.rs index 1b4d4a824d..9fd5b3707c 100644 --- a/crates/relayer/relayer-components/src/relay/impls/update_client/skip.rs +++ b/crates/relayer/relayer-components/src/relay/impls/update_client/skip.rs @@ -1,9 +1,9 @@ use alloc::vec::Vec; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_components::traits::HasMessageType; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use crate::chain::traits::{ CanQueryConsensusStateWithLatestHeight, HasConsensusStateType, HasHeightType, diff --git a/crates/relayer/relayer-components/src/relay/impls/update_client/wait.rs b/crates/relayer/relayer-components/src/relay/impls/update_client/wait.rs index f7ea71df40..707d9679a6 100644 --- a/crates/relayer/relayer-components/src/relay/impls/update_client/wait.rs +++ b/crates/relayer/relayer-components/src/relay/impls/update_client/wait.rs @@ -1,8 +1,8 @@ use alloc::vec::Vec; -use cgp::prelude::{CanRaiseAsyncError, *}; use hermes_chain_components::traits::{HasHeightType, HasMessageType}; use hermes_logging_components::traits::CanLog; +use hermes_prelude::{CanRaiseAsyncError, *}; use crate::chain::impls::CanWaitChainReachHeight; use crate::chain::types::aliases::HeightOf; diff --git a/crates/relayer/relayer-components/src/relay/traits/auto_relayer.rs b/crates/relayer/relayer-components/src/relay/traits/auto_relayer.rs index 1eec144b2e..e1d2087dbe 100644 --- a/crates/relayer/relayer-components/src/relay/traits/auto_relayer.rs +++ b/crates/relayer/relayer-components/src/relay/traits/auto_relayer.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasHeightType; use hermes_chain_components::types::aliases::HeightOf; +use hermes_prelude::*; use crate::relay::traits::{HasTargetChainTypes, RelayTarget}; diff --git a/crates/relayer/relayer-components/src/relay/traits/chains/error.rs b/crates/relayer/relayer-components/src/relay/traits/chains/error.rs index 3d2cbc9c1f..edce5b6041 100644 --- a/crates/relayer/relayer-components/src/relay/traits/chains/error.rs +++ b/crates/relayer/relayer-components/src/relay/traits/chains/error.rs @@ -1,6 +1,6 @@ use cgp::core::error::ErrorOf; use cgp::core::macros::blanket_trait; -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayChainTypes; diff --git a/crates/relayer/relayer-components/src/relay/traits/chains/types.rs b/crates/relayer/relayer-components/src/relay/traits/chains/types.rs index 9db192cd89..903560032f 100644 --- a/crates/relayer/relayer-components/src/relay/traits/chains/types.rs +++ b/crates/relayer/relayer-components/src/relay/traits/chains/types.rs @@ -1,6 +1,6 @@ use cgp::core::macros::blanket_trait; -use cgp::prelude::{HasAsyncErrorType, HasErrorType}; use hermes_chain_components::traits::HasOutgoingPacketType; +use hermes_prelude::{HasAsyncErrorType, HasErrorType}; use crate::chain::traits::HasIbcChainTypes; use crate::multi::traits::chain_at::HasChainTypeAt; diff --git a/crates/relayer/relayer-components/src/relay/traits/channel/open_ack.rs b/crates/relayer/relayer-components/src/relay/traits/channel/open_ack.rs index 3dbd3841ad..4969163e8f 100644 --- a/crates/relayer/relayer-components/src/relay/traits/channel/open_ack.rs +++ b/crates/relayer/relayer-components/src/relay/traits/channel/open_ack.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayChains; use crate::relay::types::{DstChannelId, DstPortId, SrcChannelId, SrcPortId}; diff --git a/crates/relayer/relayer-components/src/relay/traits/channel/open_confirm.rs b/crates/relayer/relayer-components/src/relay/traits/channel/open_confirm.rs index 359cacb7b2..4cda3ea58b 100644 --- a/crates/relayer/relayer-components/src/relay/traits/channel/open_confirm.rs +++ b/crates/relayer/relayer-components/src/relay/traits/channel/open_confirm.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayChains; use crate::relay::types::{DstChannelId, DstPortId, SrcChannelId, SrcPortId}; diff --git a/crates/relayer/relayer-components/src/relay/traits/channel/open_handshake.rs b/crates/relayer/relayer-components/src/relay/traits/channel/open_handshake.rs index 529db25492..7ed5983530 100644 --- a/crates/relayer/relayer-components/src/relay/traits/channel/open_handshake.rs +++ b/crates/relayer/relayer-components/src/relay/traits/channel/open_handshake.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayChains; use crate::relay::types::{DstChannelId, DstPortId, SrcChannelId, SrcPortId}; diff --git a/crates/relayer/relayer-components/src/relay/traits/channel/open_init.rs b/crates/relayer/relayer-components/src/relay/traits/channel/open_init.rs index d2cc93eea6..5293a6516f 100644 --- a/crates/relayer/relayer-components/src/relay/traits/channel/open_init.rs +++ b/crates/relayer/relayer-components/src/relay/traits/channel/open_init.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::{HasInitChannelOptionsType, InitChannelOptions}; use crate::relay::traits::HasRelayChains; diff --git a/crates/relayer/relayer-components/src/relay/traits/channel/open_try.rs b/crates/relayer/relayer-components/src/relay/traits/channel/open_try.rs index 1775911598..088bc77145 100644 --- a/crates/relayer/relayer-components/src/relay/traits/channel/open_try.rs +++ b/crates/relayer/relayer-components/src/relay/traits/channel/open_try.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayChains; use crate::relay::types::{DstChannelId, DstPortId, SrcChannelId, SrcPortId}; diff --git a/crates/relayer/relayer-components/src/relay/traits/client_creator.rs b/crates/relayer/relayer-components/src/relay/traits/client_creator.rs index 47163d8f5d..b083945766 100644 --- a/crates/relayer/relayer-components/src/relay/traits/client_creator.rs +++ b/crates/relayer/relayer-components/src/relay/traits/client_creator.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasClientIdType; +use hermes_prelude::*; use crate::chain::traits::{ CreateClientMessageOptionsOf, CreateClientPayloadOptionsOf, HasCreateClientMessageOptionsType, diff --git a/crates/relayer/relayer-components/src/relay/traits/connection/open_ack.rs b/crates/relayer/relayer-components/src/relay/traits/connection/open_ack.rs index c65ebe73a2..e73c8d407f 100644 --- a/crates/relayer/relayer-components/src/relay/traits/connection/open_ack.rs +++ b/crates/relayer/relayer-components/src/relay/traits/connection/open_ack.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayChains; use crate::relay::types::{DstConnectionId, SrcConnectionId}; diff --git a/crates/relayer/relayer-components/src/relay/traits/connection/open_confirm.rs b/crates/relayer/relayer-components/src/relay/traits/connection/open_confirm.rs index 4a5ec26e91..4d40a69fda 100644 --- a/crates/relayer/relayer-components/src/relay/traits/connection/open_confirm.rs +++ b/crates/relayer/relayer-components/src/relay/traits/connection/open_confirm.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayChains; use crate::relay::types::{DstConnectionId, SrcConnectionId}; diff --git a/crates/relayer/relayer-components/src/relay/traits/connection/open_handshake.rs b/crates/relayer/relayer-components/src/relay/traits/connection/open_handshake.rs index 622b37e143..31f0994646 100644 --- a/crates/relayer/relayer-components/src/relay/traits/connection/open_handshake.rs +++ b/crates/relayer/relayer-components/src/relay/traits/connection/open_handshake.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayChains; use crate::relay::types::{DstConnectionId, SrcConnectionId}; diff --git a/crates/relayer/relayer-components/src/relay/traits/connection/open_init.rs b/crates/relayer/relayer-components/src/relay/traits/connection/open_init.rs index cade0b7e4c..69b2f221d8 100644 --- a/crates/relayer/relayer-components/src/relay/traits/connection/open_init.rs +++ b/crates/relayer/relayer-components/src/relay/traits/connection/open_init.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_components::traits::InitConnectionOptionsOf; +use hermes_prelude::*; use crate::chain::traits::HasInitConnectionOptionsType; use crate::relay::traits::HasRelayChains; diff --git a/crates/relayer/relayer-components/src/relay/traits/connection/open_try.rs b/crates/relayer/relayer-components/src/relay/traits/connection/open_try.rs index eef18670a9..d805ed79f4 100644 --- a/crates/relayer/relayer-components/src/relay/traits/connection/open_try.rs +++ b/crates/relayer/relayer-components/src/relay/traits/connection/open_try.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayChains; use crate::relay::types::{DstConnectionId, SrcConnectionId}; diff --git a/crates/relayer/relayer-components/src/relay/traits/event_relayer.rs b/crates/relayer/relayer-components/src/relay/traits/event_relayer.rs index c1c141c7d1..5f142094bc 100644 --- a/crates/relayer/relayer-components/src/relay/traits/event_relayer.rs +++ b/crates/relayer/relayer-components/src/relay/traits/event_relayer.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_components::traits::HasHeightType; +use hermes_prelude::*; use crate::chain::traits::HasEventType; use crate::chain::types::aliases::EventOf; diff --git a/crates/relayer/relayer-components/src/relay/traits/ibc_message_sender.rs b/crates/relayer/relayer-components/src/relay/traits/ibc_message_sender.rs index 3c3e8e4139..adca7ac193 100644 --- a/crates/relayer/relayer-components/src/relay/traits/ibc_message_sender.rs +++ b/crates/relayer/relayer-components/src/relay/traits/ibc_message_sender.rs @@ -1,9 +1,9 @@ use alloc::vec; use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_components::traits::{EmptyMessageResponse, HasMessageType}; use hermes_chain_type_components::traits::{HasMessageResponseType, MessageResponseOf}; +use hermes_prelude::*; use crate::chain::traits::HasIbcChainTypes; use crate::chain::types::aliases::MessageOf; diff --git a/crates/relayer/relayer-components/src/relay/traits/packet_filter.rs b/crates/relayer/relayer-components/src/relay/traits/packet_filter.rs index f1f1233568..ddb82da065 100644 --- a/crates/relayer/relayer-components/src/relay/traits/packet_filter.rs +++ b/crates/relayer/relayer-components/src/relay/traits/packet_filter.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayPacketType; diff --git a/crates/relayer/relayer-components/src/relay/traits/packet_lock.rs b/crates/relayer/relayer-components/src/relay/traits/packet_lock.rs index 465cf2d4c3..f71a8affe8 100644 --- a/crates/relayer/relayer-components/src/relay/traits/packet_lock.rs +++ b/crates/relayer/relayer-components/src/relay/traits/packet_lock.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::{HasRelayChains, PacketOf}; diff --git a/crates/relayer/relayer-components/src/relay/traits/packet_relayer.rs b/crates/relayer/relayer-components/src/relay/traits/packet_relayer.rs index e46d13013b..beab7d5849 100644 --- a/crates/relayer/relayer-components/src/relay/traits/packet_relayer.rs +++ b/crates/relayer/relayer-components/src/relay/traits/packet_relayer.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::relay::traits::HasRelayPacketType; diff --git a/crates/relayer/relayer-components/src/relay/traits/packet_relayers/ack_packet.rs b/crates/relayer/relayer-components/src/relay/traits/packet_relayers/ack_packet.rs index ef047fb7b7..2ddcc9becc 100644 --- a/crates/relayer/relayer-components/src/relay/traits/packet_relayers/ack_packet.rs +++ b/crates/relayer/relayer-components/src/relay/traits/packet_relayers/ack_packet.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::{AcknowledgementOf, HasAcknowledgementType}; use crate::chain::types::aliases::HeightOf; diff --git a/crates/relayer/relayer-components/src/relay/traits/packet_relayers/receive_packet.rs b/crates/relayer/relayer-components/src/relay/traits/packet_relayers/receive_packet.rs index 3fbcc8b18f..215b825efc 100644 --- a/crates/relayer/relayer-components/src/relay/traits/packet_relayers/receive_packet.rs +++ b/crates/relayer/relayer-components/src/relay/traits/packet_relayers/receive_packet.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_components::traits::{AcknowledgementOf, HasAcknowledgementType}; +use hermes_prelude::*; use crate::chain::types::aliases::HeightOf; use crate::relay::traits::{HasRelayChains, PacketOf}; diff --git a/crates/relayer/relayer-components/src/relay/traits/packet_relayers/timeout_unordered_packet.rs b/crates/relayer/relayer-components/src/relay/traits/packet_relayers/timeout_unordered_packet.rs index 7974746979..05e957d7cc 100644 --- a/crates/relayer/relayer-components/src/relay/traits/packet_relayers/timeout_unordered_packet.rs +++ b/crates/relayer/relayer-components/src/relay/traits/packet_relayers/timeout_unordered_packet.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::types::aliases::HeightOf; use crate::relay::traits::{HasRelayChains, PacketOf}; diff --git a/crates/relayer/relayer-components/src/relay/traits/update_client_message_builder.rs b/crates/relayer/relayer-components/src/relay/traits/update_client_message_builder.rs index 741063290b..ca4343bb1c 100644 --- a/crates/relayer/relayer-components/src/relay/traits/update_client_message_builder.rs +++ b/crates/relayer/relayer-components/src/relay/traits/update_client_message_builder.rs @@ -1,8 +1,8 @@ use alloc::vec::Vec; use cgp::core::error::ErrorOf; -use cgp::prelude::*; use hermes_chain_components::traits::{HasHeightType, HasMessageType}; +use hermes_prelude::*; use crate::chain::traits::CanSendMessages; use crate::chain::types::aliases::{HeightOf, MessageOf}; diff --git a/crates/relayer/relayer-components/src/transaction/impls/allocate_nonce_and_send_messages.rs b/crates/relayer/relayer-components/src/transaction/impls/allocate_nonce_and_send_messages.rs index 3304fee3a9..d34b32ea66 100644 --- a/crates/relayer/relayer-components/src/transaction/impls/allocate_nonce_and_send_messages.rs +++ b/crates/relayer/relayer-components/src/transaction/impls/allocate_nonce_and_send_messages.rs @@ -1,7 +1,7 @@ use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_prelude::*; use crate::transaction::traits::{ CanAllocateNonce, CanParseTxMessageResponse, CanSendMessagesWithSignerAndNonce, diff --git a/crates/relayer/relayer-components/src/transaction/impls/allocate_nonce_with_mutex.rs b/crates/relayer/relayer-components/src/transaction/impls/allocate_nonce_with_mutex.rs index 68c6c7657a..6b0bd9166a 100644 --- a/crates/relayer/relayer-components/src/transaction/impls/allocate_nonce_with_mutex.rs +++ b/crates/relayer/relayer-components/src/transaction/impls/allocate_nonce_with_mutex.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use futures::lock::MutexGuard; +use hermes_prelude::*; use crate::transaction::traits::{ CanQueryNonce, HasMutexForNonceAllocation, NonceAllocator, NonceAllocatorComponent, diff --git a/crates/relayer/relayer-components/src/transaction/impls/estimate_fees_and_send_tx.rs b/crates/relayer/relayer-components/src/transaction/impls/estimate_fees_and_send_tx.rs index 0b283be3a0..33177684bf 100644 --- a/crates/relayer/relayer-components/src/transaction/impls/estimate_fees_and_send_tx.rs +++ b/crates/relayer/relayer-components/src/transaction/impls/estimate_fees_and_send_tx.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use crate::chain::traits::HasMessageType; use crate::transaction::traits::{ diff --git a/crates/relayer/relayer-components/src/transaction/impls/estimate_recovery.rs b/crates/relayer/relayer-components/src/transaction/impls/estimate_recovery.rs index 9a2ffb86b2..a9a1e793be 100644 --- a/crates/relayer/relayer-components/src/transaction/impls/estimate_recovery.rs +++ b/crates/relayer/relayer-components/src/transaction/impls/estimate_recovery.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::transaction::traits::{ HasFeeType, HasTransactionType, TxFeeEstimator, TxFeeEstimatorComponent, diff --git a/crates/relayer/relayer-components/src/transaction/impls/global_nonce_mutex.rs b/crates/relayer/relayer-components/src/transaction/impls/global_nonce_mutex.rs index 82f7db6703..9ac93ded43 100644 --- a/crates/relayer/relayer-components/src/transaction/impls/global_nonce_mutex.rs +++ b/crates/relayer/relayer-components/src/transaction/impls/global_nonce_mutex.rs @@ -1,8 +1,8 @@ use alloc::sync::Arc; use core::marker::PhantomData; -use cgp::prelude::*; use futures::lock::Mutex; +use hermes_prelude::*; use crate::transaction::traits::{ HasSignerType, NonceAllocationMutexGetter, NonceAllocationMutexGetterComponent, diff --git a/crates/relayer/relayer-components/src/transaction/impls/limit_tx_size.rs b/crates/relayer/relayer-components/src/transaction/impls/limit_tx_size.rs index 2a0f6f9c5d..3d5f778496 100644 --- a/crates/relayer/relayer-components/src/transaction/impls/limit_tx_size.rs +++ b/crates/relayer/relayer-components/src/transaction/impls/limit_tx_size.rs @@ -7,7 +7,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::HasMessageType; use crate::transaction::traits::{ diff --git a/crates/relayer/relayer-components/src/transaction/impls/poll_tx_response.rs b/crates/relayer/relayer-components/src/transaction/impls/poll_tx_response.rs index 83f7a5e924..2ce72bcdc1 100644 --- a/crates/relayer/relayer-components/src/transaction/impls/poll_tx_response.rs +++ b/crates/relayer/relayer-components/src/transaction/impls/poll_tx_response.rs @@ -2,9 +2,9 @@ use core::fmt::Debug; use core::marker::PhantomData; use core::time::Duration; -use cgp::prelude::*; use hermes_chain_components::traits::HasPollInterval; use hermes_logging_components::traits::CanLog; +use hermes_prelude::*; use hermes_runtime_components::traits::{CanSleep, HasRuntime, HasTime}; use crate::error::traits::HasRetryableError; diff --git a/crates/relayer/relayer-components/src/transaction/impls/send_messages_with_default_signer.rs b/crates/relayer/relayer-components/src/transaction/impls/send_messages_with_default_signer.rs index 0e59ffe3df..8f704dff95 100644 --- a/crates/relayer/relayer-components/src/transaction/impls/send_messages_with_default_signer.rs +++ b/crates/relayer/relayer-components/src/transaction/impls/send_messages_with_default_signer.rs @@ -1,7 +1,7 @@ use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_components::traits::MessageSenderComponent; +use hermes_prelude::*; use crate::chain::traits::MessageSender; use crate::transaction::traits::{CanSendMessagesWithSigner, HasDefaultSigner}; diff --git a/crates/relayer/relayer-components/src/transaction/impls/send_single_message_with_signer.rs b/crates/relayer/relayer-components/src/transaction/impls/send_single_message_with_signer.rs index 850632a5bc..e4b309cd73 100644 --- a/crates/relayer/relayer-components/src/transaction/impls/send_single_message_with_signer.rs +++ b/crates/relayer/relayer-components/src/transaction/impls/send_single_message_with_signer.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_chain_components::traits::EmptyMessageResponse; use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_prelude::*; use crate::chain::traits::HasMessageType; use crate::transaction::traits::{CanSendMessagesWithSigner, HasSignerType}; diff --git a/crates/relayer/relayer-components/src/transaction/traits/default_signer.rs b/crates/relayer/relayer-components/src/transaction/traits/default_signer.rs index 6750f40e1b..76b6648cb1 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/default_signer.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/default_signer.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::transaction::traits::HasSignerType; diff --git a/crates/relayer/relayer-components/src/transaction/traits/encode_tx.rs b/crates/relayer/relayer-components/src/transaction/traits/encode_tx.rs index 54cd4bd062..cb813fd5da 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/encode_tx.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/encode_tx.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::HasMessageType; use crate::transaction::traits::{HasFeeType, HasNonceType, HasSignerType, HasTransactionType}; diff --git a/crates/relayer/relayer-components/src/transaction/traits/estimate_tx_fee.rs b/crates/relayer/relayer-components/src/transaction/traits/estimate_tx_fee.rs index 7d4e0d4eb8..af02439e88 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/estimate_tx_fee.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/estimate_tx_fee.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::transaction::traits::{HasFeeType, HasTransactionType}; diff --git a/crates/relayer/relayer-components/src/transaction/traits/nonce/allocate_nonce.rs b/crates/relayer/relayer-components/src/transaction/traits/nonce/allocate_nonce.rs index 01cba7b2d1..66506d7775 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/nonce/allocate_nonce.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/nonce/allocate_nonce.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use futures::lock::MutexGuard; +use hermes_prelude::*; use crate::transaction::traits::{HasNonceType, HasSignerType}; diff --git a/crates/relayer/relayer-components/src/transaction/traits/nonce/nonce_mutex.rs b/crates/relayer/relayer-components/src/transaction/traits/nonce/nonce_mutex.rs index bee23c498e..e3870fbcc8 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/nonce/nonce_mutex.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/nonce/nonce_mutex.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use futures::lock::Mutex; +use hermes_prelude::*; use crate::transaction::traits::HasSignerType; diff --git a/crates/relayer/relayer-components/src/transaction/traits/nonce/query_nonce.rs b/crates/relayer/relayer-components/src/transaction/traits/nonce/query_nonce.rs index c1525919e3..dea3b1887c 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/nonce/query_nonce.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/nonce/query_nonce.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::transaction::traits::{HasNonceType, HasSignerType}; diff --git a/crates/relayer/relayer-components/src/transaction/traits/parse_events.rs b/crates/relayer/relayer-components/src/transaction/traits/parse_events.rs index 6247d1069a..241b5d6599 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/parse_events.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/parse_events.rs @@ -1,7 +1,7 @@ use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_prelude::*; use crate::transaction::traits::HasTxResponseType; diff --git a/crates/relayer/relayer-components/src/transaction/traits/poll_tx_response.rs b/crates/relayer/relayer-components/src/transaction/traits/poll_tx_response.rs index 0598b63b60..57d0208c42 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/poll_tx_response.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/poll_tx_response.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::transaction::traits::{HasTxHashType, HasTxResponseType}; diff --git a/crates/relayer/relayer-components/src/transaction/traits/query_tx_response.rs b/crates/relayer/relayer-components/src/transaction/traits/query_tx_response.rs index 4ad2cdf2b9..16f44d321a 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/query_tx_response.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/query_tx_response.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::transaction::traits::{HasTxHashType, HasTxResponseType}; diff --git a/crates/relayer/relayer-components/src/transaction/traits/send_messages_with_signer.rs b/crates/relayer/relayer-components/src/transaction/traits/send_messages_with_signer.rs index b1df532deb..884e1cacd1 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/send_messages_with_signer.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/send_messages_with_signer.rs @@ -1,7 +1,7 @@ use alloc::vec::Vec; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_prelude::*; use crate::chain::traits::HasMessageType; use crate::transaction::traits::HasSignerType; diff --git a/crates/relayer/relayer-components/src/transaction/traits/send_messages_with_signer_and_nonce.rs b/crates/relayer/relayer-components/src/transaction/traits/send_messages_with_signer_and_nonce.rs index 442bffb1cc..c9393cc102 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/send_messages_with_signer_and_nonce.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/send_messages_with_signer_and_nonce.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::HasMessageType; use crate::transaction::traits::{HasNonceType, HasSignerType, HasTxResponseType}; diff --git a/crates/relayer/relayer-components/src/transaction/traits/simulation_fee.rs b/crates/relayer/relayer-components/src/transaction/traits/simulation_fee.rs index 77723c20b4..6c85256493 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/simulation_fee.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/simulation_fee.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::transaction::traits::HasFeeType; diff --git a/crates/relayer/relayer-components/src/transaction/traits/submit_tx.rs b/crates/relayer/relayer-components/src/transaction/traits/submit_tx.rs index 1c36334db6..7d06d05882 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/submit_tx.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/submit_tx.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::transaction::traits::{HasTransactionType, HasTxHashType}; diff --git a/crates/relayer/relayer-components/src/transaction/traits/types/fee.rs b/crates/relayer/relayer-components/src/transaction/traits/types/fee.rs index 1b4449f883..de6203038d 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/types/fee.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/types/fee.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasFeeType: Async { diff --git a/crates/relayer/relayer-components/src/transaction/traits/types/nonce.rs b/crates/relayer/relayer-components/src/transaction/traits/types/nonce.rs index e077279d14..f0ffbe18e2 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/types/nonce.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/types/nonce.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasNonceType: Async { diff --git a/crates/relayer/relayer-components/src/transaction/traits/types/signer.rs b/crates/relayer/relayer-components/src/transaction/traits/types/signer.rs index 68e03e58f3..949d3a52cc 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/types/signer.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/types/signer.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasSignerType: Async { diff --git a/crates/relayer/relayer-components/src/transaction/traits/types/transaction.rs b/crates/relayer/relayer-components/src/transaction/traits/types/transaction.rs index ef2f5f2450..6ad24d8e81 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/types/transaction.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/types/transaction.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: TransactionTypeComponent, diff --git a/crates/relayer/relayer-components/src/transaction/traits/types/tx_hash.rs b/crates/relayer/relayer-components/src/transaction/traits/types/tx_hash.rs index f31422dcbc..a5c7ffc5bb 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/types/tx_hash.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/types/tx_hash.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasTxHashType: Async { diff --git a/crates/relayer/relayer-components/src/transaction/traits/types/tx_response.rs b/crates/relayer/relayer-components/src/transaction/traits/types/tx_response.rs index 6eccba90b1..d604f2c44d 100644 --- a/crates/relayer/relayer-components/src/transaction/traits/types/tx_response.rs +++ b/crates/relayer/relayer-components/src/transaction/traits/types/tx_response.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasTxResponseType: Async { diff --git a/crates/runtime/async-runtime-components/Cargo.toml b/crates/runtime/async-runtime-components/Cargo.toml index efddd359d3..99fc65f327 100644 --- a/crates/runtime/async-runtime-components/Cargo.toml +++ b/crates/runtime/async-runtime-components/Cargo.toml @@ -15,6 +15,7 @@ description = """ hermes-runtime-components = { workspace = true } cgp = { workspace = true } +hermes-prelude = { workspace = true } futures-core = { workspace = true } futures-util = { workspace = true, features = [ "io" ] } futures-channel = { workspace = true, features = [ "std" ] } diff --git a/crates/runtime/async-runtime-components/src/task/impls/concurrent.rs b/crates/runtime/async-runtime-components/src/task/impls/concurrent.rs index 0635100f5f..bcb5915c72 100644 --- a/crates/runtime/async-runtime-components/src/task/impls/concurrent.rs +++ b/crates/runtime/async-runtime-components/src/task/impls/concurrent.rs @@ -1,8 +1,8 @@ use alloc::boxed::Box; use alloc::vec::Vec; -use cgp::prelude::*; use futures_util::stream::{self, Stream, StreamExt}; +use hermes_prelude::*; use hermes_runtime_components::traits::{ ConcurrentTaskRunner, ConcurrentTaskRunnerComponent, Task, }; diff --git a/crates/runtime/runtime-components/Cargo.toml b/crates/runtime/runtime-components/Cargo.toml index 8fd17faa74..a2acde2c63 100644 --- a/crates/runtime/runtime-components/Cargo.toml +++ b/crates/runtime/runtime-components/Cargo.toml @@ -12,4 +12,5 @@ description = """ """ [dependencies] -cgp = { workspace = true } +cgp = { workspace = true } +hermes-prelude = { workspace = true } diff --git a/crates/runtime/runtime-components/src/impls/os/exec_command.rs b/crates/runtime/runtime-components/src/impls/os/exec_command.rs index 1e5f4e76bd..0817858bb4 100644 --- a/crates/runtime/runtime-components/src/impls/os/exec_command.rs +++ b/crates/runtime/runtime-components/src/impls/os/exec_command.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::{ CanExecCommandWithEnvs, CommandExecutor, CommandExecutorComponent, ExecOutput, diff --git a/crates/runtime/runtime-components/src/traits/fs/copy_file.rs b/crates/runtime/runtime-components/src/traits/fs/copy_file.rs index 43274fa0f3..343d2b137f 100644 --- a/crates/runtime/runtime-components/src/traits/fs/copy_file.rs +++ b/crates/runtime/runtime-components/src/traits/fs/copy_file.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasFilePathType; diff --git a/crates/runtime/runtime-components/src/traits/fs/create_dir.rs b/crates/runtime/runtime-components/src/traits/fs/create_dir.rs index 548cc3e22d..fa051426cc 100644 --- a/crates/runtime/runtime-components/src/traits/fs/create_dir.rs +++ b/crates/runtime/runtime-components/src/traits/fs/create_dir.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasFilePathType; diff --git a/crates/runtime/runtime-components/src/traits/fs/file_path.rs b/crates/runtime/runtime-components/src/traits/fs/file_path.rs index a378befeb4..f3c0bfdfae 100644 --- a/crates/runtime/runtime-components/src/traits/fs/file_path.rs +++ b/crates/runtime/runtime-components/src/traits/fs/file_path.rs @@ -1,6 +1,6 @@ use alloc::string::String; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: FilePathTypeComponent, diff --git a/crates/runtime/runtime-components/src/traits/fs/read_file.rs b/crates/runtime/runtime-components/src/traits/fs/read_file.rs index 960e3bc050..315a2df8f0 100644 --- a/crates/runtime/runtime-components/src/traits/fs/read_file.rs +++ b/crates/runtime/runtime-components/src/traits/fs/read_file.rs @@ -1,6 +1,6 @@ use alloc::string::String; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasFilePathType; diff --git a/crates/runtime/runtime-components/src/traits/fs/write_file.rs b/crates/runtime/runtime-components/src/traits/fs/write_file.rs index 8396f11cce..dfd5215acf 100644 --- a/crates/runtime/runtime-components/src/traits/fs/write_file.rs +++ b/crates/runtime/runtime-components/src/traits/fs/write_file.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasFilePathType; diff --git a/crates/runtime/runtime-components/src/traits/os/child_process.rs b/crates/runtime/runtime-components/src/traits/os/child_process.rs index e8493c62fa..19bd84a2b7 100644 --- a/crates/runtime/runtime-components/src/traits/os/child_process.rs +++ b/crates/runtime/runtime-components/src/traits/os/child_process.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasFilePathType; diff --git a/crates/runtime/runtime-components/src/traits/os/exec_command.rs b/crates/runtime/runtime-components/src/traits/os/exec_command.rs index ee6cec0834..66f9ca9026 100644 --- a/crates/runtime/runtime-components/src/traits/os/exec_command.rs +++ b/crates/runtime/runtime-components/src/traits/os/exec_command.rs @@ -1,6 +1,6 @@ use alloc::string::String; -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::HasFilePathType; diff --git a/crates/runtime/runtime-components/src/traits/os/reserve_port.rs b/crates/runtime/runtime-components/src/traits/os/reserve_port.rs index f6cd5487d3..806d90a7a9 100644 --- a/crates/runtime/runtime-components/src/traits/os/reserve_port.rs +++ b/crates/runtime/runtime-components/src/traits/os/reserve_port.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: TcpPortReserver, diff --git a/crates/runtime/runtime-components/src/traits/random.rs b/crates/runtime/runtime-components/src/traits/random.rs index 541144ef61..3042f3b022 100644 --- a/crates/runtime/runtime-components/src/traits/random.rs +++ b/crates/runtime/runtime-components/src/traits/random.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: RandomGenerator, diff --git a/crates/runtime/runtime-components/src/traits/sleep.rs b/crates/runtime/runtime-components/src/traits/sleep.rs index e5454b5795..9b042c001c 100644 --- a/crates/runtime/runtime-components/src/traits/sleep.rs +++ b/crates/runtime/runtime-components/src/traits/sleep.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: Sleeper, diff --git a/crates/runtime/runtime-components/src/traits/spawn.rs b/crates/runtime/runtime-components/src/traits/spawn.rs index 18c78e22db..8ae18ff65f 100644 --- a/crates/runtime/runtime-components/src/traits/spawn.rs +++ b/crates/runtime/runtime-components/src/traits/spawn.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::Task; diff --git a/crates/runtime/runtime-components/src/traits/task.rs b/crates/runtime/runtime-components/src/traits/task.rs index 40e73e00a3..cb4ea5a4e2 100644 --- a/crates/runtime/runtime-components/src/traits/task.rs +++ b/crates/runtime/runtime-components/src/traits/task.rs @@ -1,7 +1,7 @@ use alloc::boxed::Box; use alloc::vec::Vec; -use cgp::prelude::*; +use hermes_prelude::*; #[async_trait] pub trait Task: Async { diff --git a/crates/runtime/runtime-components/src/traits/time.rs b/crates/runtime/runtime-components/src/traits/time.rs index b1a5f83612..1aee4d1ad0 100644 --- a/crates/runtime/runtime-components/src/traits/time.rs +++ b/crates/runtime/runtime-components/src/traits/time.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: TimeComponent, diff --git a/crates/runtime/runtime/Cargo.toml b/crates/runtime/runtime/Cargo.toml index 8424bf5e3a..da051954a4 100644 --- a/crates/runtime/runtime/Cargo.toml +++ b/crates/runtime/runtime/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime-components = { workspace = true } hermes-async-runtime-components = { workspace = true } hermes-tokio-runtime-components = { workspace = true } diff --git a/crates/runtime/runtime/src/impls/runtime/error.rs b/crates/runtime/runtime/src/impls/runtime/error.rs index f9918957fd..985a665cb8 100644 --- a/crates/runtime/runtime/src/impls/runtime/error.rs +++ b/crates/runtime/runtime/src/impls/runtime/error.rs @@ -6,7 +6,7 @@ use std::process::ExitStatus; use cgp::core::error::{ ErrorRaiser, ErrorRaiserComponent, ErrorTypeProvider, ErrorTypeProviderComponent, }; -use cgp::prelude::{cgp_provider, *}; +use hermes_prelude::{cgp_provider, *}; use hermes_tokio_runtime_components::impls::{ CommandNotFound, ExecCommandFailure, PrematureChildProcessExitError, }; diff --git a/crates/runtime/runtime/src/impls/types/runtime.rs b/crates/runtime/runtime/src/impls/types/runtime.rs index 0afe5b030c..99dc78143e 100644 --- a/crates/runtime/runtime/src/impls/types/runtime.rs +++ b/crates/runtime/runtime/src/impls/types/runtime.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{RuntimeTypeProvider, RuntimeTypeProviderComponent}; use crate::types::runtime::HermesRuntime; diff --git a/crates/runtime/runtime/src/types/runtime.rs b/crates/runtime/runtime/src/types/runtime.rs index 2258f11349..e5842ac4c0 100644 --- a/crates/runtime/runtime/src/types/runtime.rs +++ b/crates/runtime/runtime/src/types/runtime.rs @@ -1,7 +1,7 @@ use alloc::sync::Arc; -use cgp::prelude::*; use hermes_logging_components::traits::LoggerComponent; +use hermes_prelude::*; use hermes_tokio_runtime_components::components::TokioParallelRuntimeComponents; use hermes_tracing_logging_components::contexts::TracingLogger; use tokio::runtime::Runtime; diff --git a/crates/runtime/tokio-runtime-components/Cargo.toml b/crates/runtime/tokio-runtime-components/Cargo.toml index 975a10670c..438dbb2da5 100644 --- a/crates/runtime/tokio-runtime-components/Cargo.toml +++ b/crates/runtime/tokio-runtime-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime-components = { workspace = true } hermes-async-runtime-components = { workspace = true } hermes-logging-components = { workspace = true } diff --git a/crates/runtime/tokio-runtime-components/src/components/concurrent.rs b/crates/runtime/tokio-runtime-components/src/components/concurrent.rs index db73ddfdd3..37b744f267 100644 --- a/crates/runtime/tokio-runtime-components/src/components/concurrent.rs +++ b/crates/runtime/tokio-runtime-components/src/components/concurrent.rs @@ -1,7 +1,7 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; use hermes_async_runtime_components::task::impls::RunConcurrentTasks; + use hermes_prelude::*; pub use hermes_runtime_components::traits::{ ChildProcessStarterComponent, ChildProcessTypeComponent, ChildProcessWaiterComponent, CommandExecutorComponent, CommandWithEnvsExecutorComponent, ConcurrentTaskRunnerComponent, diff --git a/crates/runtime/tokio-runtime-components/src/components/parallel.rs b/crates/runtime/tokio-runtime-components/src/components/parallel.rs index abb6d3c5c5..719ef60bce 100644 --- a/crates/runtime/tokio-runtime-components/src/components/parallel.rs +++ b/crates/runtime/tokio-runtime-components/src/components/parallel.rs @@ -1,6 +1,6 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; + use hermes_prelude::*; use hermes_runtime_components::impls::ExecCommandWithNoEnv; use hermes_runtime_components::traits::{ ChildProcessStarterComponent, ChildProcessTypeComponent, ChildProcessWaiterComponent, diff --git a/crates/runtime/tokio-runtime-components/src/impls/fs/copy_file.rs b/crates/runtime/tokio-runtime-components/src/impls/fs/copy_file.rs index 60e52740fc..6d198ebbe6 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/fs/copy_file.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/fs/copy_file.rs @@ -1,7 +1,7 @@ use std::io::Error as IoError; use std::path::Path; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{FileCopier, FileCopierComponent, HasFilePathType}; use tokio::fs::copy; diff --git a/crates/runtime/tokio-runtime-components/src/impls/fs/create_dir.rs b/crates/runtime/tokio-runtime-components/src/impls/fs/create_dir.rs index ca87704547..794c7fbe00 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/fs/create_dir.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/fs/create_dir.rs @@ -1,7 +1,7 @@ use std::io::Error as IoError; use std::path::Path; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{DirCreator, DirCreatorComponent, HasFilePathType}; use tokio::fs::create_dir_all; diff --git a/crates/runtime/tokio-runtime-components/src/impls/fs/file_path.rs b/crates/runtime/tokio-runtime-components/src/impls/fs/file_path.rs index c8a1b71f3a..d1f2bd003f 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/fs/file_path.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/fs/file_path.rs @@ -1,6 +1,6 @@ use std::path::PathBuf; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{FilePathTypeComponent, ProvideFilePathType}; pub struct ProvideStdPathType; diff --git a/crates/runtime/tokio-runtime-components/src/impls/fs/read_file.rs b/crates/runtime/tokio-runtime-components/src/impls/fs/read_file.rs index 396948fc47..31fb189db4 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/fs/read_file.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/fs/read_file.rs @@ -1,7 +1,7 @@ use std::io::Error as IoError; use std::path::Path; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{ FileAsStringReader, FileAsStringReaderComponent, HasFilePathType, }; diff --git a/crates/runtime/tokio-runtime-components/src/impls/fs/write_file.rs b/crates/runtime/tokio-runtime-components/src/impls/fs/write_file.rs index 71d4b55e02..ece80dd75f 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/fs/write_file.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/fs/write_file.rs @@ -1,7 +1,7 @@ use std::io::Error as IoError; use std::path::Path; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{ HasFilePathType, StringToFileWriter, StringToFileWriterComponent, }; diff --git a/crates/runtime/tokio-runtime-components/src/impls/os/child_process.rs b/crates/runtime/tokio-runtime-components/src/impls/os/child_process.rs index c5acea6f6a..4850f57046 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/os/child_process.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/os/child_process.rs @@ -3,10 +3,10 @@ use std::io::Error as IoError; use std::path::Path; use std::process::{ExitStatus, Stdio}; -use cgp::prelude::*; use hermes_async_runtime_components::task::types::FutureTask; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LevelDebug; +use hermes_prelude::*; use hermes_runtime_components::traits::{ CanReadFileAsString, CanSleep, CanSpawnTask, ChildProcessStarter, ChildProcessStarterComponent, ChildProcessTypeComponent, ChildProcessWaiter, ChildProcessWaiterComponent, diff --git a/crates/runtime/tokio-runtime-components/src/impls/os/exec_command.rs b/crates/runtime/tokio-runtime-components/src/impls/os/exec_command.rs index ec74ee89e8..2288c5cc53 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/os/exec_command.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/os/exec_command.rs @@ -3,7 +3,7 @@ use core::str::Utf8Error; use std::ffi::OsStr; use std::io::{Error as IoError, ErrorKind}; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{ CommandWithEnvsExecutor, CommandWithEnvsExecutorComponent, ExecOutput, HasFilePathType, }; diff --git a/crates/runtime/tokio-runtime-components/src/impls/os/reserve_port.rs b/crates/runtime/tokio-runtime-components/src/impls/os/reserve_port.rs index c76b491392..c11e1b4217 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/os/reserve_port.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/os/reserve_port.rs @@ -1,7 +1,7 @@ use std::io::Error as IoError; use std::net::{Ipv4Addr, SocketAddrV4}; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{TcpPortReserver, TcpPortReserverComponent}; use rand::Rng; use tokio::net::TcpListener; diff --git a/crates/runtime/tokio-runtime-components/src/impls/parallel_task.rs b/crates/runtime/tokio-runtime-components/src/impls/parallel_task.rs index 9bb800bdb5..9bb2a7ead7 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/parallel_task.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/parallel_task.rs @@ -1,8 +1,8 @@ use core::task::{Context, Poll}; -use cgp::prelude::*; use futures::stream::{Stream, StreamExt}; use futures::task::noop_waker; +use hermes_prelude::*; use hermes_runtime_components::traits::{ ConcurrentTaskRunner, ConcurrentTaskRunnerComponent, Task, }; diff --git a/crates/runtime/tokio-runtime-components/src/impls/random.rs b/crates/runtime/tokio-runtime-components/src/impls/random.rs index e14b962385..2e9ddbb075 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/random.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/random.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{RandomGenerator, RandomGeneratorComponent}; use rand::distributions::uniform::SampleUniform; use rand::distributions::Standard; diff --git a/crates/runtime/tokio-runtime-components/src/impls/sleep.rs b/crates/runtime/tokio-runtime-components/src/impls/sleep.rs index eb06a85225..a4d436e185 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/sleep.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/sleep.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{Sleeper, SleeperComponent}; use tokio::time::sleep; diff --git a/crates/runtime/tokio-runtime-components/src/impls/spawn.rs b/crates/runtime/tokio-runtime-components/src/impls/spawn.rs index 96f4ecb9a5..09656687eb 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/spawn.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/spawn.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{Task, TaskSpawner, TaskSpawnerComponent}; use crate::traits::HasTokioRuntime; diff --git a/crates/runtime/tokio-runtime-components/src/impls/time.rs b/crates/runtime/tokio-runtime-components/src/impls/time.rs index fbb4de0435..07cb60e8eb 100644 --- a/crates/runtime/tokio-runtime-components/src/impls/time.rs +++ b/crates/runtime/tokio-runtime-components/src/impls/time.rs @@ -1,7 +1,7 @@ use core::time::Duration; use std::time::Instant; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{ProvideTime, TimeComponent}; pub struct ProvideStdTime; diff --git a/crates/solomachine/solomachine-chain-components/Cargo.toml b/crates/solomachine/solomachine-chain-components/Cargo.toml index 9409c3b252..29994db8b3 100644 --- a/crates/solomachine/solomachine-chain-components/Cargo.toml +++ b/crates/solomachine/solomachine-chain-components/Cargo.toml @@ -11,6 +11,7 @@ description = "An IBC relayer for relaying between Cosmos and Solomachin client [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime-components = { workspace = true } hermes-cosmos-relayer = { workspace = true } hermes-cosmos-chain-components = { workspace = true } diff --git a/crates/solomachine/solomachine-chain-components/src/components/cosmos.rs b/crates/solomachine/solomachine-chain-components/src/components/cosmos.rs index 6233ba8cc1..418c4f7d5b 100644 --- a/crates/solomachine/solomachine-chain-components/src/components/cosmos.rs +++ b/crates/solomachine/solomachine-chain-components/src/components/cosmos.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cosmos_chain_preset::presets::CosmosToCosmosComponents; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ ClientStateFieldsComponent, ClientStateQuerierComponent, ClientStateTypeComponent, ClientStateWithProofsQuerierComponent, ConnectionOpenAckMessageBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/components/solomachine.rs b/crates/solomachine/solomachine-chain-components/src/components/solomachine.rs index 4437f6d627..8e02b28586 100644 --- a/crates/solomachine/solomachine-chain-components/src/components/solomachine.rs +++ b/crates/solomachine/solomachine-chain-components/src/components/solomachine.rs @@ -1,12 +1,12 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; use hermes_chain_type_components::traits::{ MessageResponseEventsGetterComponent, MessageResponseTypeComponent, TimeTypeComponent, }; use hermes_cosmos_chain_components::impls::{ BuildCosmosUpdateClientMessage, CosmosPacketFieldReader, ProvideCosmosChainTypes, }; + use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ AckPacketPayloadTypeProviderComponent, ChainIdTypeProviderComponent, ChainStatusQuerierComponent, ChainStatusTypeComponent, ChannelEndTypeComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/encoding/components.rs b/crates/solomachine/solomachine-chain-components/src/encoding/components.rs index a208876b18..052f528464 100644 --- a/crates/solomachine/solomachine-chain-components/src/encoding/components.rs +++ b/crates/solomachine/solomachine-chain-components/src/encoding/components.rs @@ -1,12 +1,12 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::UseDelegate; - use cgp::prelude::*; use hermes_encoding_components::impls::{ProvideEncodedBytes, ProvideStringSchema}; use hermes_encoding_components::traits::{ ConverterComponent, DecoderComponent, EncodedTypeComponent, EncoderComponent, SchemaGetterComponent, SchemaTypeComponent, }; + use hermes_prelude::*; use crate::encoding::convert::SolomachineConverterComponents; use crate::encoding::encoder::SolomachineEncoderComponents; diff --git a/crates/solomachine/solomachine-chain-components/src/encoding/convert.rs b/crates/solomachine/solomachine-chain-components/src/encoding/convert.rs index e1da16ad25..59291422b2 100644 --- a/crates/solomachine/solomachine-chain-components/src/encoding/convert.rs +++ b/crates/solomachine/solomachine-chain-components/src/encoding/convert.rs @@ -1,6 +1,6 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_encoding_components::impls::{ConvertFrom, TryConvertFrom}; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::any::{DecodeAsAnyProtobuf, EncodeAsAnyProtobuf}; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; diff --git a/crates/solomachine/solomachine-chain-components/src/encoding/encoder.rs b/crates/solomachine/solomachine-chain-components/src/encoding/encoder.rs index 73984b971a..824f2f6fe7 100644 --- a/crates/solomachine/solomachine-chain-components/src/encoding/encoder.rs +++ b/crates/solomachine/solomachine-chain-components/src/encoding/encoder.rs @@ -1,6 +1,6 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_encoding_components::impls::ConvertAndEncode; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::any::EncodeAsAnyProtobuf; use hermes_protobuf_encoding_components::impls::protobuf::EncodeAsProtobuf; use hermes_protobuf_encoding_components::impls::via_any::EncodeViaAny; diff --git a/crates/solomachine/solomachine-chain-components/src/encoding/type_url.rs b/crates/solomachine/solomachine-chain-components/src/encoding/type_url.rs index ae750336d9..ec99e1aaa9 100644 --- a/crates/solomachine/solomachine-chain-components/src/encoding/type_url.rs +++ b/crates/solomachine/solomachine-chain-components/src/encoding/type_url.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impl_type_url; use crate::types::client_state::{SolomachineClientState, SOLOMACHINE_CLIENT_STATE_TYPE_URL}; diff --git a/crates/solomachine/solomachine-chain-components/src/impls/cosmos/channel_handshake_message.rs b/crates/solomachine/solomachine-chain-components/src/impls/cosmos/channel_handshake_message.rs index cee77133af..b501a2cfd0 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/cosmos/channel_handshake_message.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/cosmos/channel_handshake_message.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; use hermes_cosmos_chain_components::types::{ CosmosChannelOpenAckMessage, CosmosChannelOpenConfirmMessage, CosmosChannelOpenInitMessage, CosmosChannelOpenTryMessage, CosmosInitChannelOptions, }; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ ChannelOpenAckMessageBuilder, ChannelOpenAckMessageBuilderComponent, ChannelOpenConfirmMessageBuilder, ChannelOpenConfirmMessageBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/cosmos/connection_handshake_message.rs b/crates/solomachine/solomachine-chain-components/src/impls/cosmos/connection_handshake_message.rs index 3b6dc4bb30..54864ab534 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/cosmos/connection_handshake_message.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/cosmos/connection_handshake_message.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; use hermes_cosmos_chain_components::types::CosmosConnectionOpenTryMessage; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::any::Any; use hermes_relayer_components::chain::traits::{ ConnectionOpenAckMessageBuilder, ConnectionOpenAckMessageBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/cosmos/create_client_message.rs b/crates/solomachine/solomachine-chain-components/src/impls/cosmos/create_client_message.rs index 492d0d33c3..b92246ed2d 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/cosmos/create_client_message.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/cosmos/create_client_message.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; use hermes_cosmos_chain_components::types::CosmosCreateClientMessage; use hermes_encoding_components::traits::{CanConvert, HasDefaultEncoding, HasEncodedType}; use hermes_encoding_components::types::AsBytes; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::any::Any; use hermes_relayer_components::chain::traits::{ CreateClientMessageBuilder, CreateClientMessageBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/cosmos/update_client_message.rs b/crates/solomachine/solomachine-chain-components/src/impls/cosmos/update_client_message.rs index d97f5c6a9f..79ef7da17e 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/cosmos/update_client_message.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/cosmos/update_client_message.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; use hermes_cosmos_chain_components::types::CosmosUpdateClientMessage; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::any::Any; use hermes_relayer_components::chain::traits::{ HasIbcChainTypes, HasUpdateClientPayloadType, UpdateClientMessageBuilder, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/channel_handshake_payload.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/channel_handshake_payload.rs index b1a7b3aff3..9dd6fdc768 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/channel_handshake_payload.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/channel_handshake_payload.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ CanQueryChannelEnd, ChannelOpenAckPayloadBuilder, ChannelOpenAckPayloadBuilderComponent, ChannelOpenConfirmPayloadBuilder, ChannelOpenConfirmPayloadBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/client_state.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/client_state.rs index 511c0efb9c..ff664f015d 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/client_state.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/client_state.rs @@ -1,7 +1,7 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasChainIdType; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ ClientStateFieldsComponent, ClientStateFieldsGetter, ClientStateTypeComponent, HasClientStateType, HasHeightType, ProvideClientStateType, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/connection_handshake_message.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/connection_handshake_message.rs index c38c8daf0f..f83f6fcc90 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/connection_handshake_message.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/connection_handshake_message.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ ConnectionOpenAckMessageBuilder, ConnectionOpenAckMessageBuilderComponent, ConnectionOpenConfirmMessageBuilder, ConnectionOpenConfirmMessageBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/connection_handshake_payload.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/connection_handshake_payload.rs index 98017982e7..02bd47e000 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/connection_handshake_payload.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/connection_handshake_payload.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cosmos_chain_components::types::{TendermintClientState, TendermintConsensusState}; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ CanQueryClientState, CanQueryConnectionEnd, CanQueryConsensusState, ConnectionOpenAckPayloadBuilder, ConnectionOpenAckPayloadBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/consensus_state.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/consensus_state.rs index b41f3f20fa..b0a35a1e94 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/consensus_state.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/consensus_state.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ ConsensusStateTypeComponent, ProvideConsensusStateType, }; diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/create_client_message.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/create_client_message.rs index cf6790e301..dafe83c8f1 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/create_client_message.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/create_client_message.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::types::CosmosCreateClientPayload; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ CreateClientMessageBuilder, CreateClientMessageBuilderComponent, HasCreateClientMessageOptionsType, HasCreateClientPayloadType, HasMessageType, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/create_client_payload.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/create_client_payload.rs index 27ae3457f8..4b4534e9cb 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/create_client_payload.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/create_client_payload.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ CreateClientPayloadBuilder, CreateClientPayloadBuilderComponent, HasCreateClientPayloadOptionsType, HasCreateClientPayloadType, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/process_message.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/process_message.rs index 50a8f71b78..34fb71ec26 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/process_message.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/process_message.rs @@ -1,8 +1,8 @@ use core::str::FromStr; use core::time::Duration; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasMessageType, MessageSender, MessageSenderComponent, }; diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/query_chain_status.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/query_chain_status.rs index 0658268d44..1621000cc1 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/query_chain_status.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/query_chain_status.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::types::ChainStatus; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ ChainStatusQuerier, ChainStatusQuerierComponent, HasChainStatusType, }; diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/receive_packet_payload.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/receive_packet_payload.rs index 49e728d682..d96845e9b8 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/receive_packet_payload.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/receive_packet_payload.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::methods::encode_protobuf; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasClientStateType, HasHeightType, HasOutgoingPacketType, HasReceivePacketPayloadType, ReceivePacketPayloadBuilder, ReceivePacketPayloadBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/timeout_packet_payload.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/timeout_packet_payload.rs index 21c01e8e1c..7e9ef926ea 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/timeout_packet_payload.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/timeout_packet_payload.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::methods::encode_protobuf; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasClientStateType, HasHeightType, HasOutgoingPacketType, HasTimeoutUnorderedPacketPayloadType, TimeoutUnorderedPacketPayloadBuilder, TimeoutUnorderedPacketPayloadBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/types.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/types.rs index 4617246ae1..73d8653acb 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/types.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/types.rs @@ -1,12 +1,12 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::impls::UseEventsMessageResponse; use hermes_chain_type_components::traits::{ EventTypeProviderComponent, HasEventType, HasMessageResponseType, MessageResponseEventsGetterComponent, MessageResponseTypeComponent, MessageTypeProviderComponent, }; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ AckPacketPayloadTypeProvider, AckPacketPayloadTypeProviderComponent, ChannelEndTypeComponent, ChannelOpenAckPayloadTypeComponent, ChannelOpenConfirmPayloadTypeComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/update_client_message.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/update_client_message.rs index 3bdf6a75bb..e2aa6ee20a 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/update_client_message.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/update_client_message.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::types::CosmosUpdateClientPayload; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasIbcChainTypes, HasMessageType, HasUpdateClientPayloadType, UpdateClientMessageBuilder, UpdateClientMessageBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/update_client_payload.rs b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/update_client_payload.rs index a4c354e388..f65afe096b 100644 --- a/crates/solomachine/solomachine-chain-components/src/impls/solomachine/update_client_payload.rs +++ b/crates/solomachine/solomachine-chain-components/src/impls/solomachine/update_client_payload.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasClientStateType, HasHeightType, HasUpdateClientPayloadType, UpdateClientPayloadBuilder, UpdateClientPayloadBuilderComponent, diff --git a/crates/solomachine/solomachine-chain-components/src/traits/solomachine.rs b/crates/solomachine/solomachine-chain-components/src/traits/solomachine.rs index f68173d424..67f41b67e3 100644 --- a/crates/solomachine/solomachine-chain-components/src/traits/solomachine.rs +++ b/crates/solomachine/solomachine-chain-components/src/traits/solomachine.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cosmos_chain_components::types::{TendermintClientState, TendermintConsensusState}; +use hermes_prelude::*; use ibc::core::channel::types::packet::Packet; use ibc::core::connection::types::ConnectionEnd; use ibc::core::host::types::identifiers::{ClientId, ConnectionId}; diff --git a/crates/solomachine/solomachine-relayer/Cargo.toml b/crates/solomachine/solomachine-relayer/Cargo.toml index a7243acdae..158abb411f 100644 --- a/crates/solomachine/solomachine-relayer/Cargo.toml +++ b/crates/solomachine/solomachine-relayer/Cargo.toml @@ -11,6 +11,7 @@ description = "An IBC relayer for relaying between Cosmos and Solomachin client [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime-components = { workspace = true } hermes-logging-components = { workspace = true } hermes-solomachine-chain-components = { workspace = true } diff --git a/crates/solomachine/solomachine-relayer/src/contexts/chain.rs b/crates/solomachine/solomachine-relayer/src/contexts/chain.rs index 8f430777fa..6ac215b809 100644 --- a/crates/solomachine/solomachine-relayer/src/contexts/chain.rs +++ b/crates/solomachine/solomachine-relayer/src/contexts/chain.rs @@ -5,7 +5,6 @@ use std::sync::{Arc, Mutex}; use std::time::{SystemTime, UNIX_EPOCH}; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use eyre::eyre; use hermes_cosmos_chain_components::types::{TendermintClientState, TendermintConsensusState}; use hermes_cosmos_chain_preset::delegate::DelegateCosmosChainComponents; @@ -19,6 +18,7 @@ use hermes_encoding_components::types::AsBytes; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::Error; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ CanBuildConnectionOpenAckMessage, CanBuildConnectionOpenAckPayload, CanBuildConnectionOpenConfirmMessage, CanBuildConnectionOpenConfirmPayload, diff --git a/crates/solomachine/solomachine-relayer/src/contexts/encoding.rs b/crates/solomachine/solomachine-relayer/src/contexts/encoding.rs index 7d534a73ab..20677bba84 100644 --- a/crates/solomachine/solomachine-relayer/src/contexts/encoding.rs +++ b/crates/solomachine/solomachine-relayer/src/contexts/encoding.rs @@ -1,5 +1,4 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_encoding_components::impls::GetDefaultEncoding; use hermes_encoding_components::traits::{ CanConvertBothWays, CanEncodeAndDecode, DefaultEncodingGetter, DefaultEncodingGetterComponent, @@ -8,6 +7,7 @@ use hermes_encoding_components::traits::{ use hermes_encoding_components::types::AsBytes; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use hermes_solomachine_chain_components::encoding::components::*; diff --git a/crates/solomachine/solomachine-relayer/src/contexts/relay.rs b/crates/solomachine/solomachine-relayer/src/contexts/relay.rs index 0bc0033458..80e0c83bf0 100644 --- a/crates/solomachine/solomachine-relayer/src/contexts/relay.rs +++ b/crates/solomachine/solomachine-relayer/src/contexts/relay.rs @@ -1,9 +1,9 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_logging_components::traits::LoggerComponent; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasInitConnectionOptionsType; use hermes_relayer_components::components::default::*; use hermes_relayer_components::multi::traits::chain_at::{ diff --git a/crates/test/test-components/Cargo.toml b/crates/test/test-components/Cargo.toml index 4eb5a98e90..41d59a9b7b 100644 --- a/crates/test/test-components/Cargo.toml +++ b/crates/test/test-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-runtime-components = { workspace = true } hermes-chain-type-components = { workspace = true } hermes-relayer-components = { workspace = true } diff --git a/crates/test/test-components/src/bootstrap/traits/chain.rs b/crates/test/test-components/src/bootstrap/traits/chain.rs index e5871c26d5..fc27cc9d96 100644 --- a/crates/test/test-components/src/bootstrap/traits/chain.rs +++ b/crates/test/test-components/src/bootstrap/traits/chain.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::driver::traits::HasChainDriverType; diff --git a/crates/test/test-components/src/chain/impls/assert/assert_duration.rs b/crates/test/test-components/src/chain/impls/assert/assert_duration.rs index f3eec87fcc..6f6019273d 100644 --- a/crates/test/test-components/src/chain/impls/assert/assert_duration.rs +++ b/crates/test/test-components/src/chain/impls/assert/assert_duration.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::{PollAssertDurationGetter, PollAssertDurationGetterComponent}; diff --git a/crates/test/test-components/src/chain/impls/assert/poll_assert_eventual_amount.rs b/crates/test/test-components/src/chain/impls/assert/poll_assert_eventual_amount.rs index f2d33a159b..280293a947 100644 --- a/crates/test/test-components/src/chain/impls/assert/poll_assert_eventual_amount.rs +++ b/crates/test/test-components/src/chain/impls/assert/poll_assert_eventual_amount.rs @@ -2,10 +2,10 @@ use alloc::format; use core::fmt::Debug; use core::time::Duration; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountDenom, HasAmountType}; use hermes_logging_components::traits::CanLog; use hermes_logging_components::types::LevelError; +use hermes_prelude::*; use hermes_runtime_components::traits::{CanSleep, HasRuntime}; use crate::chain::traits::{ diff --git a/crates/test/test-components/src/chain/impls/default_memo.rs b/crates/test/test-components/src/chain/impls/default_memo.rs index 3bec2f2acd..1353e1272d 100644 --- a/crates/test/test-components/src/chain/impls/default_memo.rs +++ b/crates/test/test-components/src/chain/impls/default_memo.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::{DefaultMemoGetter, DefaultMemoGetterComponent, HasMemoType}; diff --git a/crates/test/test-components/src/chain/impls/ibc_transfer.rs b/crates/test/test-components/src/chain/impls/ibc_transfer.rs index 40ef0ed1ea..cffa4cb451 100644 --- a/crates/test/test-components/src/chain/impls/ibc_transfer.rs +++ b/crates/test/test-components/src/chain/impls/ibc_transfer.rs @@ -1,9 +1,9 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::{ HasAddressType, HasAmountType, HasHeightType, HasMessageResponseEvents, HasTimeoutType, }; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ CanBuildPacketFromSendPacket, CanExtractFromEvent, HasChainStatusType, HasChannelIdType, HasPortIdType, HasSendPacketEvent, diff --git a/crates/test/test-components/src/chain/traits/assert/eventual_amount.rs b/crates/test/test-components/src/chain/traits/assert/eventual_amount.rs index f4affe18f3..eda837e366 100644 --- a/crates/test/test-components/src/chain/traits/assert/eventual_amount.rs +++ b/crates/test/test-components/src/chain/traits/assert/eventual_amount.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_prelude::*; #[cgp_component { provider: EventualAmountAsserter, diff --git a/crates/test/test-components/src/chain/traits/assert/poll_assert.rs b/crates/test/test-components/src/chain/traits/assert/poll_assert.rs index 107946abb5..59fa98624f 100644 --- a/crates/test/test-components/src/chain/traits/assert/poll_assert.rs +++ b/crates/test/test-components/src/chain/traits/assert/poll_assert.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: PollAssertDurationGetter, diff --git a/crates/test/test-components/src/chain/traits/chain_id.rs b/crates/test/test-components/src/chain/traits/chain_id.rs index 99638b5bb1..a3cc084a95 100644 --- a/crates/test/test-components/src/chain/traits/chain_id.rs +++ b/crates/test/test-components/src/chain/traits/chain_id.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasChainIdType; #[cgp_component { diff --git a/crates/test/test-components/src/chain/traits/messages/ibc_transfer.rs b/crates/test/test-components/src/chain/traits/messages/ibc_transfer.rs index 3dfc894eab..b582f8d0b8 100644 --- a/crates/test/test-components/src/chain/traits/messages/ibc_transfer.rs +++ b/crates/test/test-components/src/chain/traits/messages/ibc_transfer.rs @@ -1,8 +1,8 @@ use alloc::vec::Vec; use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasChannelIdType, HasHeightType, HasMessageType, HasPortIdType, HasTimeoutType, }; diff --git a/crates/test/test-components/src/chain/traits/proposal/messages/deposit.rs b/crates/test/test-components/src/chain/traits/proposal/messages/deposit.rs index d6587f7996..a639cdd442 100644 --- a/crates/test/test-components/src/chain/traits/proposal/messages/deposit.rs +++ b/crates/test/test-components/src/chain/traits/proposal/messages/deposit.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAmountType; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasMessageType; use crate::chain::traits::HasProposalIdType; diff --git a/crates/test/test-components/src/chain/traits/proposal/messages/vote.rs b/crates/test/test-components/src/chain/traits/proposal/messages/vote.rs index edff48e073..aaaeea20aa 100644 --- a/crates/test/test-components/src/chain/traits/proposal/messages/vote.rs +++ b/crates/test/test-components/src/chain/traits/proposal/messages/vote.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasMessageType; use crate::chain::traits::{HasProposalIdType, HasProposalVoteType}; diff --git a/crates/test/test-components/src/chain/traits/proposal/poll_status.rs b/crates/test/test-components/src/chain/traits/proposal/poll_status.rs index fb0aafb77a..d99c7856cb 100644 --- a/crates/test/test-components/src/chain/traits/proposal/poll_status.rs +++ b/crates/test/test-components/src/chain/traits/proposal/poll_status.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::{HasProposalIdType, HasProposalStatusType}; diff --git a/crates/test/test-components/src/chain/traits/proposal/query_status.rs b/crates/test/test-components/src/chain/traits/proposal/query_status.rs index 173e68d85c..679e59dae5 100644 --- a/crates/test/test-components/src/chain/traits/proposal/query_status.rs +++ b/crates/test/test-components/src/chain/traits/proposal/query_status.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::{HasProposalIdType, HasProposalStatusType}; diff --git a/crates/test/test-components/src/chain/traits/proposal/types/proposal_id.rs b/crates/test/test-components/src/chain/traits/proposal/types/proposal_id.rs index 544a019213..dea281d9eb 100644 --- a/crates/test/test-components/src/chain/traits/proposal/types/proposal_id.rs +++ b/crates/test/test-components/src/chain/traits/proposal/types/proposal_id.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ProposalIdTypeComponent, diff --git a/crates/test/test-components/src/chain/traits/proposal/types/proposal_status.rs b/crates/test/test-components/src/chain/traits/proposal/types/proposal_status.rs index e425f02921..7f3de657ac 100644 --- a/crates/test/test-components/src/chain/traits/proposal/types/proposal_status.rs +++ b/crates/test/test-components/src/chain/traits/proposal/types/proposal_status.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ProposalStatusTypeComponent, diff --git a/crates/test/test-components/src/chain/traits/proposal/types/vote.rs b/crates/test/test-components/src/chain/traits/proposal/types/vote.rs index e1621c9e50..a8eb19f2e1 100644 --- a/crates/test/test-components/src/chain/traits/proposal/types/vote.rs +++ b/crates/test/test-components/src/chain/traits/proposal/types/vote.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: ProposalVoteTypeComponent, diff --git a/crates/test/test-components/src/chain/traits/queries/balance.rs b/crates/test/test-components/src/chain/traits/queries/balance.rs index be967af780..de0492de0b 100644 --- a/crates/test/test-components/src/chain/traits/queries/balance.rs +++ b/crates/test/test-components/src/chain/traits/queries/balance.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType, HasDenomType}; +use hermes_prelude::*; #[cgp_component { provider: BalanceQuerier, diff --git a/crates/test/test-components/src/chain/traits/transfer/amount.rs b/crates/test/test-components/src/chain/traits/transfer/amount.rs index b788988872..8a1dc1dabb 100644 --- a/crates/test/test-components/src/chain/traits/transfer/amount.rs +++ b/crates/test/test-components/src/chain/traits/transfer/amount.rs @@ -1,8 +1,8 @@ use core::marker::PhantomData; use cgp::core::component::UseDelegate; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAmountType, HasDenomType}; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{HasChannelIdType, HasIbcChainTypes, HasPortIdType}; #[cgp_component { diff --git a/crates/test/test-components/src/chain/traits/transfer/ibc_transfer.rs b/crates/test/test-components/src/chain/traits/transfer/ibc_transfer.rs index 35843d28e0..4553c0ffa7 100644 --- a/crates/test/test-components/src/chain/traits/transfer/ibc_transfer.rs +++ b/crates/test/test-components/src/chain/traits/transfer/ibc_transfer.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasChainStatusType, HasChannelIdType, HasOutgoingPacketType, HasPortIdType, }; diff --git a/crates/test/test-components/src/chain/traits/transfer/local_transfer.rs b/crates/test/test-components/src/chain/traits/transfer/local_transfer.rs index f6bb7c4ea0..83d3a1b74f 100644 --- a/crates/test/test-components/src/chain/traits/transfer/local_transfer.rs +++ b/crates/test/test-components/src/chain/traits/transfer/local_transfer.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_prelude::*; use crate::chain::traits::HasWalletType; diff --git a/crates/test/test-components/src/chain/traits/transfer/timeout.rs b/crates/test/test-components/src/chain/traits/transfer/timeout.rs index 5aa676d06c..0bed1397cc 100644 --- a/crates/test/test-components/src/chain/traits/transfer/timeout.rs +++ b/crates/test/test-components/src/chain/traits/transfer/timeout.rs @@ -1,5 +1,5 @@ use cgp::core::component::UseDelegate; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{HasHeightType, HasTimeoutType}; #[cgp_component { diff --git a/crates/test/test-components/src/chain/traits/types/amount.rs b/crates/test/test-components/src/chain/traits/types/amount.rs index c1ce7b8182..a2c81ddf2d 100644 --- a/crates/test/test-components/src/chain/traits/types/amount.rs +++ b/crates/test/test-components/src/chain/traits/types/amount.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAmountType; +use hermes_prelude::*; #[cgp_component { name: AmountMethodsComponent, diff --git a/crates/test/test-components/src/chain/traits/types/memo.rs b/crates/test/test-components/src/chain/traits/types/memo.rs index 0837fa7149..261ae9601c 100644 --- a/crates/test/test-components/src/chain/traits/types/memo.rs +++ b/crates/test/test-components/src/chain/traits/types/memo.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasMemoType: Async { diff --git a/crates/test/test-components/src/chain/traits/types/wallet.rs b/crates/test/test-components/src/chain/traits/types/wallet.rs index abd8de8eb9..68ade156a8 100644 --- a/crates/test/test-components/src/chain/traits/types/wallet.rs +++ b/crates/test/test-components/src/chain/traits/types/wallet.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use hermes_relayer_components::transaction::traits::HasSignerType; pub type Wallet = ::Wallet; diff --git a/crates/test/test-components/src/chain_driver/impls/wait.rs b/crates/test/test-components/src/chain_driver/impls/wait.rs index f8a5a40687..3134743763 100644 --- a/crates/test/test-components/src/chain_driver/impls/wait.rs +++ b/crates/test/test-components/src/chain_driver/impls/wait.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{CanQueryChainHeight, HasHeightFields}; use hermes_runtime_components::traits::{CanSleep, HasRuntime}; diff --git a/crates/test/test-components/src/chain_driver/traits/chain_process.rs b/crates/test/test-components/src/chain_driver/traits/chain_process.rs index f64bea4f58..2d047c3e49 100644 --- a/crates/test/test-components/src/chain_driver/traits/chain_process.rs +++ b/crates/test/test-components/src/chain_driver/traits/chain_process.rs @@ -1,6 +1,6 @@ use alloc::vec::Vec; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{ChildProcessOf, HasChildProcessType, HasRuntime}; #[cgp_component { diff --git a/crates/test/test-components/src/chain_driver/traits/config.rs b/crates/test/test-components/src/chain_driver/traits/config.rs index 1876e82867..1f16ae56fc 100644 --- a/crates/test/test-components/src/chain_driver/traits/config.rs +++ b/crates/test/test-components/src/chain_driver/traits/config.rs @@ -1,7 +1,7 @@ use alloc::string::String; use cgp::core::component::UseContext; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: ConfigUpdater, diff --git a/crates/test/test-components/src/chain_driver/traits/fields/amount.rs b/crates/test/test-components/src/chain_driver/traits/fields/amount.rs index efeda65d00..b10b59a927 100644 --- a/crates/test/test-components/src/chain_driver/traits/fields/amount.rs +++ b/crates/test/test-components/src/chain_driver/traits/fields/amount.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_chain_type_components::traits::{AmountOf, HasAmountType}; +use hermes_prelude::*; use crate::chain_driver::traits::HasChainType; diff --git a/crates/test/test-components/src/chain_driver/traits/fields/chain_home_dir.rs b/crates/test/test-components/src/chain_driver/traits/fields/chain_home_dir.rs index fa37c267ef..9cbde07dc3 100644 --- a/crates/test/test-components/src/chain_driver/traits/fields/chain_home_dir.rs +++ b/crates/test/test-components/src/chain_driver/traits/fields/chain_home_dir.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_runtime_components::traits::{FilePathOf, HasFilePathType, HasRuntime}; #[cgp_component { diff --git a/crates/test/test-components/src/chain_driver/traits/fields/denom.rs b/crates/test/test-components/src/chain_driver/traits/fields/denom.rs index a6f55928cd..ab6fc6d338 100644 --- a/crates/test/test-components/src/chain_driver/traits/fields/denom.rs +++ b/crates/test/test-components/src/chain_driver/traits/fields/denom.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_chain_type_components::traits::{DenomOf, HasDenomType}; +use hermes_prelude::*; use crate::chain_driver::traits::HasChainType; diff --git a/crates/test/test-components/src/chain_driver/traits/fields/wallet.rs b/crates/test/test-components/src/chain_driver/traits/fields/wallet.rs index 8f459500f4..2b2bd7f4b6 100644 --- a/crates/test/test-components/src/chain_driver/traits/fields/wallet.rs +++ b/crates/test/test-components/src/chain_driver/traits/fields/wallet.rs @@ -2,7 +2,7 @@ use alloc::collections::BTreeMap; use alloc::string::String; use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::chain::traits::{HasWalletType, WalletOf}; use crate::chain_driver::traits::HasChainType; diff --git a/crates/test/test-components/src/chain_driver/traits/types/chain.rs b/crates/test/test-components/src/chain_driver/traits/types/chain.rs index af555ceb58..c8b5082d82 100644 --- a/crates/test/test-components/src/chain_driver/traits/types/chain.rs +++ b/crates/test/test-components/src/chain_driver/traits/types/chain.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasChainType: Async { diff --git a/crates/test/test-components/src/chain_driver/traits/wait.rs b/crates/test/test-components/src/chain_driver/traits/wait.rs index ef01193913..d22b7758ea 100644 --- a/crates/test/test-components/src/chain_driver/traits/wait.rs +++ b/crates/test/test-components/src/chain_driver/traits/wait.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { context: ChainDriver, diff --git a/crates/test/test-components/src/driver/traits/channel_at.rs b/crates/test/test-components/src/driver/traits/channel_at.rs index 49d3f0a8ec..c0b1d4d039 100644 --- a/crates/test/test-components/src/driver/traits/channel_at.rs +++ b/crates/test/test-components/src/driver/traits/channel_at.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasChannelIdType; use hermes_relayer_components::chain::types::aliases::ChannelIdOf; use hermes_relayer_components::multi::traits::chain_at::{ChainAt, HasChainTypeAt}; diff --git a/crates/test/test-components/src/driver/traits/types/builder_at.rs b/crates/test/test-components/src/driver/traits/types/builder_at.rs index 5d899e647f..fe3511a29f 100644 --- a/crates/test/test-components/src/driver/traits/types/builder_at.rs +++ b/crates/test/test-components/src/driver/traits/types/builder_at.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type { name: BuilderAtTypeProviderComponent, provider: BuilderAtTypeProvider, diff --git a/crates/test/test-components/src/driver/traits/types/chain_driver.rs b/crates/test/test-components/src/driver/traits/types/chain_driver.rs index dc7dd9e8c7..f8997e2dff 100644 --- a/crates/test/test-components/src/driver/traits/types/chain_driver.rs +++ b/crates/test/test-components/src/driver/traits/types/chain_driver.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasChainDriverType: Async { diff --git a/crates/test/test-components/src/driver/traits/types/chain_driver_at.rs b/crates/test/test-components/src/driver/traits/types/chain_driver_at.rs index 27547a3917..2379620d77 100644 --- a/crates/test/test-components/src/driver/traits/types/chain_driver_at.rs +++ b/crates/test/test-components/src/driver/traits/types/chain_driver_at.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type { name: ChainDriverTypeProviderAtComponent, diff --git a/crates/test/test-components/src/driver/traits/types/relay_driver_at.rs b/crates/test/test-components/src/driver/traits/types/relay_driver_at.rs index 1ad2ec78a6..82051f2d3e 100644 --- a/crates/test/test-components/src/driver/traits/types/relay_driver_at.rs +++ b/crates/test/test-components/src/driver/traits/types/relay_driver_at.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type { name: RelayDriverTypeProviderAtComponent, diff --git a/crates/test/test-components/src/relay_driver/run.rs b/crates/test/test-components/src/relay_driver/run.rs index 5077048100..b5b42f7cac 100644 --- a/crates/test/test-components/src/relay_driver/run.rs +++ b/crates/test/test-components/src/relay_driver/run.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: RelayerBackgroundRunner, diff --git a/crates/test/test-components/src/setup/binary_channel/components.rs b/crates/test/test-components/src/setup/binary_channel/components.rs index 9043411f51..a6b4510ba7 100644 --- a/crates/test/test-components/src/setup/binary_channel/components.rs +++ b/crates/test/test-components/src/setup/binary_channel/components.rs @@ -1,6 +1,6 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; + use hermes_prelude::*; use crate::setup::binary_channel::SetupBinaryChannelDriver; use crate::setup::impls::{ diff --git a/crates/test/test-components/src/setup/binary_channel/impls/setup.rs b/crates/test/test-components/src/setup/binary_channel/impls/setup.rs index c7017caea3..d2bf9f2c98 100644 --- a/crates/test/test-components/src/setup/binary_channel/impls/setup.rs +++ b/crates/test/test-components/src/setup/binary_channel/impls/setup.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasIbcChainTypes; use hermes_relayer_components::multi::traits::chain_at::HasChainTypeAt; diff --git a/crates/test/test-components/src/setup/impls/birelay.rs b/crates/test/test-components/src/setup/impls/birelay.rs index f4c903d832..cd17d4a65e 100644 --- a/crates/test/test-components/src/setup/impls/birelay.rs +++ b/crates/test/test-components/src/setup/impls/birelay.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use cgp::core::error::{CanRaiseAsyncError, ErrorOf}; use cgp::core::Async; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::build::traits::builders::birelay_from_relay_builder::CanBuildBiRelayFromRelays; use hermes_relayer_components::chain::traits::HasIbcChainTypes; use hermes_relayer_components::chain::types::aliases::ClientIdOf; diff --git a/crates/test/test-components/src/setup/impls/chain.rs b/crates/test/test-components/src/setup/impls/chain.rs index f7dddacc70..b6079994d9 100644 --- a/crates/test/test-components/src/setup/impls/chain.rs +++ b/crates/test/test-components/src/setup/impls/chain.rs @@ -3,7 +3,7 @@ use core::marker::PhantomData; use cgp::core::error::{CanRaiseAsyncError, ErrorOf}; use cgp::core::field::Index; -use cgp::prelude::*; +use hermes_prelude::*; use crate::bootstrap::traits::CanBootstrapChain; use crate::driver::traits::{ChainDriverAt, HasChainDriverTypeAt}; diff --git a/crates/test/test-components/src/setup/impls/channel.rs b/crates/test/test-components/src/setup/impls/channel.rs index 0e84264200..0c9906f825 100644 --- a/crates/test/test-components/src/setup/impls/channel.rs +++ b/crates/test/test-components/src/setup/impls/channel.rs @@ -3,7 +3,7 @@ use core::marker::PhantomData; use cgp::core::error::{CanRaiseAsyncError, ErrorOf}; use cgp::core::field::Index; use cgp::core::Async; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::birelay::traits::HasTwoWayRelay; use hermes_relayer_components::chain::traits::{HasIbcChainTypes, HasInitChannelOptionsType}; use hermes_relayer_components::chain::types::aliases::{ChannelIdOf, ConnectionIdOf, PortIdOf}; diff --git a/crates/test/test-components/src/setup/impls/clients.rs b/crates/test/test-components/src/setup/impls/clients.rs index 0edb039782..dc6b3afb6d 100644 --- a/crates/test/test-components/src/setup/impls/clients.rs +++ b/crates/test/test-components/src/setup/impls/clients.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasClientIdType, HasCreateClientMessageOptionsType, HasCreateClientPayloadOptionsType, }; diff --git a/crates/test/test-components/src/setup/impls/connection.rs b/crates/test/test-components/src/setup/impls/connection.rs index 5843235d49..8529d6ed28 100644 --- a/crates/test/test-components/src/setup/impls/connection.rs +++ b/crates/test/test-components/src/setup/impls/connection.rs @@ -1,6 +1,6 @@ use cgp::core::error::ErrorOf; use cgp::core::field::Index; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::birelay::traits::HasTwoWayRelay; use hermes_relayer_components::chain::traits::{HasIbcChainTypes, HasInitConnectionOptionsType}; use hermes_relayer_components::chain::types::aliases::ConnectionIdOf; diff --git a/crates/test/test-components/src/setup/impls/relay.rs b/crates/test/test-components/src/setup/impls/relay.rs index ec1af79bfa..4b267abd9f 100644 --- a/crates/test/test-components/src/setup/impls/relay.rs +++ b/crates/test/test-components/src/setup/impls/relay.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::error::ErrorOf; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::build::traits::builders::relay_from_chains_builder::CanBuildRelayFromChains; use hermes_relayer_components::chain::traits::HasIbcChainTypes; use hermes_relayer_components::chain::types::aliases::ClientIdOf; diff --git a/crates/test/test-components/src/setup/impls/run_test.rs b/crates/test/test-components/src/setup/impls/run_test.rs index 199b7aba4e..e69107e8b4 100644 --- a/crates/test/test-components/src/setup/impls/run_test.rs +++ b/crates/test/test-components/src/setup/impls/run_test.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::setup::traits::{CanBuildTestDriver, TestRunner, TestRunnerComponent}; use crate::test_case::traits::test_case::TestCase; diff --git a/crates/test/test-components/src/setup/traits/birelay.rs b/crates/test/test-components/src/setup/traits/birelay.rs index 2f23bf08af..9705b17a06 100644 --- a/crates/test/test-components/src/setup/traits/birelay.rs +++ b/crates/test/test-components/src/setup/traits/birelay.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasIbcChainTypes; use hermes_relayer_components::chain::types::aliases::ClientIdOf; use hermes_relayer_components::multi::traits::birelay_at::{BiRelayAt, HasBiRelayTypeAt}; diff --git a/crates/test/test-components/src/setup/traits/bootstrap_at.rs b/crates/test/test-components/src/setup/traits/bootstrap_at.rs index f58837da31..b8f8440bdf 100644 --- a/crates/test/test-components/src/setup/traits/bootstrap_at.rs +++ b/crates/test/test-components/src/setup/traits/bootstrap_at.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type { name: BootstrapTypeProviderAtComponent, diff --git a/crates/test/test-components/src/setup/traits/builder_at.rs b/crates/test/test-components/src/setup/traits/builder_at.rs index 40521db3fa..86ad7c1514 100644 --- a/crates/test/test-components/src/setup/traits/builder_at.rs +++ b/crates/test/test-components/src/setup/traits/builder_at.rs @@ -1,5 +1,5 @@ use cgp::core::field::UseField; -use cgp::prelude::*; +use hermes_prelude::*; use crate::driver::traits::{BuilderAt, HasBuilderTypeAt}; diff --git a/crates/test/test-components/src/setup/traits/chain.rs b/crates/test/test-components/src/setup/traits/chain.rs index 2d6b678b56..799b3a3460 100644 --- a/crates/test/test-components/src/setup/traits/chain.rs +++ b/crates/test/test-components/src/setup/traits/chain.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use crate::driver::traits::{ChainDriverAt, HasChainDriverTypeAt}; diff --git a/crates/test/test-components/src/setup/traits/channel.rs b/crates/test/test-components/src/setup/traits/channel.rs index 97ed82a8d0..7e1169c801 100644 --- a/crates/test/test-components/src/setup/traits/channel.rs +++ b/crates/test/test-components/src/setup/traits/channel.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasIbcChainTypes; use hermes_relayer_components::chain::types::aliases::{ChannelIdOf, ConnectionIdOf, PortIdOf}; use hermes_relayer_components::multi::traits::birelay_at::{BiRelayAt, HasBiRelayTypeAt}; diff --git a/crates/test/test-components/src/setup/traits/clients.rs b/crates/test/test-components/src/setup/traits/clients.rs index 1c7400a7b2..695ecf1815 100644 --- a/crates/test/test-components/src/setup/traits/clients.rs +++ b/crates/test/test-components/src/setup/traits/clients.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasClientIdType; use hermes_relayer_components::chain::types::aliases::ClientIdOf; use hermes_relayer_components::multi::traits::chain_at::{ChainAt, HasChainTypeAt}; diff --git a/crates/test/test-components/src/setup/traits/connection.rs b/crates/test/test-components/src/setup/traits/connection.rs index 4d2dac5a9f..aa689bc8c8 100644 --- a/crates/test/test-components/src/setup/traits/connection.rs +++ b/crates/test/test-components/src/setup/traits/connection.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::types::aliases::ConnectionIdOf; use hermes_relayer_components::multi::traits::birelay_at::{BiRelayAt, HasBiRelayTypeAt}; use hermes_relayer_components::multi::traits::chain_at::ChainAt; diff --git a/crates/test/test-components/src/setup/traits/create_client_options_at.rs b/crates/test/test-components/src/setup/traits/create_client_options_at.rs index 249637cc68..f7e067691a 100644 --- a/crates/test/test-components/src/setup/traits/create_client_options_at.rs +++ b/crates/test/test-components/src/setup/traits/create_client_options_at.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::field::UseField; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ CreateClientMessageOptionsOf, CreateClientPayloadOptionsOf, HasCreateClientMessageOptionsType, HasCreateClientPayloadOptionsType, diff --git a/crates/test/test-components/src/setup/traits/driver.rs b/crates/test/test-components/src/setup/traits/driver.rs index de1df0b837..a97655b528 100644 --- a/crates/test/test-components/src/setup/traits/driver.rs +++ b/crates/test/test-components/src/setup/traits/driver.rs @@ -1,6 +1,6 @@ use cgp::core::component::WithProvider; use cgp::core::types::ProvideType; -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type { provider: TestDriverTypeProvider, diff --git a/crates/test/test-components/src/setup/traits/drivers/binary_channel.rs b/crates/test/test-components/src/setup/traits/drivers/binary_channel.rs index 677ad282dc..be50d16bb9 100644 --- a/crates/test/test-components/src/setup/traits/drivers/binary_channel.rs +++ b/crates/test/test-components/src/setup/traits/drivers/binary_channel.rs @@ -1,5 +1,5 @@ use cgp::core::field::Index; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasChannelIdType, HasConnectionIdType, HasPortIdType, }; diff --git a/crates/test/test-components/src/setup/traits/init_channel_options_at.rs b/crates/test/test-components/src/setup/traits/init_channel_options_at.rs index dd517f3e8c..b15376170b 100644 --- a/crates/test/test-components/src/setup/traits/init_channel_options_at.rs +++ b/crates/test/test-components/src/setup/traits/init_channel_options_at.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasConnectionIdType, HasInitChannelOptionsType, InitChannelOptions, }; diff --git a/crates/test/test-components/src/setup/traits/init_connection_options_at.rs b/crates/test/test-components/src/setup/traits/init_connection_options_at.rs index e484cca8e4..2a9d7c7d32 100644 --- a/crates/test/test-components/src/setup/traits/init_connection_options_at.rs +++ b/crates/test/test-components/src/setup/traits/init_connection_options_at.rs @@ -1,5 +1,5 @@ use cgp::core::field::UseField; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ HasInitConnectionOptionsType, InitConnectionOptionsOf, }; diff --git a/crates/test/test-components/src/setup/traits/port_id_at.rs b/crates/test/test-components/src/setup/traits/port_id_at.rs index 774d018e7f..0c5a2b484d 100644 --- a/crates/test/test-components/src/setup/traits/port_id_at.rs +++ b/crates/test/test-components/src/setup/traits/port_id_at.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::core::field::UseField; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::HasPortIdType; use hermes_relayer_components::chain::types::aliases::PortIdOf; use hermes_relayer_components::multi::traits::chain_at::{ChainAt, HasChainTypeAt}; diff --git a/crates/test/test-components/src/setup/traits/relay.rs b/crates/test/test-components/src/setup/traits/relay.rs index b7adf5d5ff..db75d35046 100644 --- a/crates/test/test-components/src/setup/traits/relay.rs +++ b/crates/test/test-components/src/setup/traits/relay.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use cgp::prelude::*; +use hermes_prelude::*; use hermes_relayer_components::chain::types::aliases::ClientIdOf; use hermes_relayer_components::multi::traits::chain_at::ChainAt; use hermes_relayer_components::multi::traits::relay_at::{HasBoundedRelayTypeAt, RelayAt}; diff --git a/crates/test/test-components/src/setup/traits/run_test.rs b/crates/test/test-components/src/setup/traits/run_test.rs index b5f1edb76e..089b1c0baf 100644 --- a/crates/test/test-components/src/setup/traits/run_test.rs +++ b/crates/test/test-components/src/setup/traits/run_test.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: TestRunner, diff --git a/crates/test/test-components/src/test_case/traits/test_case.rs b/crates/test/test-components/src/test_case/traits/test_case.rs index 0a0bcf8c3e..03eb3414bb 100644 --- a/crates/test/test-components/src/test_case/traits/test_case.rs +++ b/crates/test/test-components/src/test_case/traits/test_case.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[async_trait] pub trait TestCase: Async diff --git a/crates/test/test-suite/Cargo.toml b/crates/test/test-suite/Cargo.toml index aa9206afd1..1d9e447003 100644 --- a/crates/test/test-suite/Cargo.toml +++ b/crates/test/test-suite/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-relayer-components = { workspace = true } hermes-core = { workspace = true } hermes-logging-components = { workspace = true } diff --git a/crates/test/test-suite/src/tests/clearing.rs b/crates/test/test-suite/src/tests/clearing.rs index bbfa24e92b..e2cced96ef 100644 --- a/crates/test/test-suite/src/tests/clearing.rs +++ b/crates/test/test-suite/src/tests/clearing.rs @@ -2,8 +2,8 @@ use alloc::format; use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_chain_components::traits::CanQueryChainHeight; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{ CanQueryChainStatus, CanQueryPacketIsCleared, CanQueryPacketIsReceived, HasChainId, HasPacketSequence, diff --git a/crates/test/test-suite/src/tests/transfer.rs b/crates/test/test-suite/src/tests/transfer.rs index 51b39851e3..ccc95dff5a 100644 --- a/crates/test/test-suite/src/tests/transfer.rs +++ b/crates/test/test-suite/src/tests/transfer.rs @@ -2,8 +2,8 @@ use alloc::format; use core::marker::PhantomData; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_chain_type_components::traits::HasAmountDenom; +use hermes_prelude::*; use hermes_relayer_components::chain::traits::{CanQueryChainStatus, HasChainId}; use hermes_test_components::chain::traits::{ CanAssertEventualAmount, CanConvertIbcTransferredAmount, CanIbcTransferToken, CanQueryBalance, diff --git a/crates/test/test-suite/src/traits/types.rs b/crates/test/test-suite/src/traits/types.rs index 5d84b08275..86294d0595 100644 --- a/crates/test/test-suite/src/traits/types.rs +++ b/crates/test/test-suite/src/traits/types.rs @@ -3,9 +3,9 @@ use core::marker::PhantomData; use cgp::core::error::ErrorOf; use cgp::core::field::Index; use cgp::core::macros::blanket_trait; -use cgp::prelude::{CanRaiseError, HasAsyncErrorType, HasErrorType}; use hermes_chain_type_components::traits::{DenomOf, HasAmountDenom}; use hermes_logging_components::traits::CanLogMessage; +use hermes_prelude::{CanRaiseError, HasAsyncErrorType, HasErrorType}; use hermes_relayer_components::birelay::traits::CanAutoBiRelay; use hermes_relayer_components::chain::traits::{ CanQueryChainStatus, CanQueryPacketIsCleared, CanQueryPacketIsReceived, CanReadPacketFields, diff --git a/crates/wasm/wasm-client-components/Cargo.toml b/crates/wasm/wasm-client-components/Cargo.toml index 67432b9e13..3bcc493bb0 100644 --- a/crates/wasm/wasm-client-components/Cargo.toml +++ b/crates/wasm/wasm-client-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-error = { workspace = true } hermes-cosmos-chain-components = { workspace = true } hermes-cosmos-chain-preset = { workspace = true } diff --git a/crates/wasm/wasm-client-components/src/contexts/wasm_counterparty.rs b/crates/wasm/wasm-client-components/src/contexts/wasm_counterparty.rs index 8e8d399935..7a245ca244 100644 --- a/crates/wasm/wasm-client-components/src/contexts/wasm_counterparty.rs +++ b/crates/wasm/wasm-client-components/src/contexts/wasm_counterparty.rs @@ -1,5 +1,4 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::encoding_components::impls::GetDefaultEncoding; use hermes_core::encoding_components::traits::{ CanConvert, CanDecode, DefaultEncodingGetter, DefaultEncodingGetterComponent, @@ -17,6 +16,7 @@ use hermes_cosmos_chain_components::impls::ProvideCosmosChainTypes; use hermes_cosmos_chain_preset::delegate::DelegateCosmosChainComponents; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use hermes_wasm_encoding_components::components::*; diff --git a/crates/wasm/wasm-client-components/src/impls/types/client_state.rs b/crates/wasm/wasm-client-components/src/impls/types/client_state.rs index 5ed961a89c..c0887fb14b 100644 --- a/crates/wasm/wasm-client-components/src/impls/types/client_state.rs +++ b/crates/wasm/wasm-client-components/src/impls/types/client_state.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::chain::traits::{ ClientStateTypeComponent, ProvideClientStateType, }; +use hermes_prelude::*; use hermes_wasm_encoding_components::types::WasmClientState; pub struct ProvideWasmClientState; diff --git a/crates/wasm/wasm-encoding-components/Cargo.toml b/crates/wasm/wasm-encoding-components/Cargo.toml index 7c72fec88a..7bd5f2f819 100644 --- a/crates/wasm/wasm-encoding-components/Cargo.toml +++ b/crates/wasm/wasm-encoding-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-protobuf-encoding-components = { workspace = true } hermes-cosmos-encoding-components = { workspace = true } diff --git a/crates/wasm/wasm-encoding-components/src/components.rs b/crates/wasm/wasm-encoding-components/src/components.rs index 7002f886f3..54444b6d16 100644 --- a/crates/wasm/wasm-encoding-components/src/components.rs +++ b/crates/wasm/wasm-encoding-components/src/components.rs @@ -1,13 +1,13 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::{UseContext, UseDelegate}; - use cgp::prelude::*; use hermes_core::encoding_components::traits::{ ConverterComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent, EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, SchemaGetterComponent, SchemaTypeComponent, }; use hermes_cosmos_encoding_components::components::CosmosEncodingComponents; + use hermes_prelude::*; use hermes_protobuf_encoding_components::impl_type_url; use hermes_protobuf_encoding_components::impls::any::{ DecodeAsAnyProtobuf, EncodeAsAnyProtobuf, diff --git a/crates/wasm/wasm-encoding-components/src/impls/convert/client_message.rs b/crates/wasm/wasm-encoding-components/src/impls/convert/client_message.rs index 9dc4fa5586..2966e96bcd 100644 --- a/crates/wasm/wasm-encoding-components/src/impls/convert/client_message.rs +++ b/crates/wasm/wasm-encoding-components/src/impls/convert/client_message.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvert, CanDecode, CanEncode, Converter, ConverterComponent, HasEncodedType, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::strategy::ViaAny; use ibc::clients::wasm_types::client_message::ClientMessage; use prost_types::Any; diff --git a/crates/wasm/wasm-encoding-components/src/impls/encode/client_message.rs b/crates/wasm/wasm-encoding-components/src/impls/encode/client_message.rs index 54ec80edbb..29f3a46d2d 100644 --- a/crates/wasm/wasm-encoding-components/src/impls/encode/client_message.rs +++ b/crates/wasm/wasm-encoding-components/src/impls/encode/client_message.rs @@ -1,11 +1,11 @@ use core::marker::PhantomData; use cgp::core::field::FieldGetter; -use cgp::prelude::*; use hermes_core::encoding_components::impls::{DecodeFrom, EncodeFieldWithGetter}; use hermes_core::encoding_components::traits::{ MutDecoderComponent, MutEncoderComponent, Transformer, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::bytes::EncodeByteField; use crate::types::WasmClientMessage; diff --git a/crates/wasm/wasm-encoding-components/src/impls/encode/client_state.rs b/crates/wasm/wasm-encoding-components/src/impls/encode/client_state.rs index a1ba158e94..dd7377e06f 100644 --- a/crates/wasm/wasm-encoding-components/src/impls/encode/client_state.rs +++ b/crates/wasm/wasm-encoding-components/src/impls/encode/client_state.rs @@ -1,9 +1,9 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_core::encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; use hermes_core::encoding_components::traits::{ MutDecoderComponent, MutEncoderComponent, Transformer, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::bytes::EncodeByteField; use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::DecodeRequiredProtoField; use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::encode::EncodeLengthDelimitedProtoField; diff --git a/crates/wasm/wasm-encoding-components/src/impls/encode/consensus_state.rs b/crates/wasm/wasm-encoding-components/src/impls/encode/consensus_state.rs index 242c456c50..1ebcb915f4 100644 --- a/crates/wasm/wasm-encoding-components/src/impls/encode/consensus_state.rs +++ b/crates/wasm/wasm-encoding-components/src/impls/encode/consensus_state.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::encoding_components::impls::{DecodeFrom, EncodeField}; use hermes_core::encoding_components::traits::{ MutDecoderComponent, MutEncoderComponent, Transformer, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::bytes::EncodeByteField; use crate::types::WasmConsensusState; diff --git a/crates/wasm/wasm-encoding-components/src/impls/strategies/consensus_state.rs b/crates/wasm/wasm-encoding-components/src/impls/strategies/consensus_state.rs index 77e6aece2c..5620e12a9e 100644 --- a/crates/wasm/wasm-encoding-components/src/impls/strategies/consensus_state.rs +++ b/crates/wasm/wasm-encoding-components/src/impls/strategies/consensus_state.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvert, CanDecode, CanEncode, Converter, ConverterComponent, Decoder, DecoderComponent, Encoder, EncoderComponent, HasEncodedType, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::ViaAny; diff --git a/crates/wasm/wasm-encoding-components/src/types/client_state.rs b/crates/wasm/wasm-encoding-components/src/types/client_state.rs index 87e63aa0ec..46798397b7 100644 --- a/crates/wasm/wasm-encoding-components/src/types/client_state.rs +++ b/crates/wasm/wasm-encoding-components/src/types/client_state.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use ibc::core::client::types::Height; #[derive(Clone, Debug, HasField, PartialEq, Eq)] diff --git a/crates/wasm/wasm-encoding-components/src/types/consensus_state.rs b/crates/wasm/wasm-encoding-components/src/types/consensus_state.rs index 45ac4cd401..7b66c4ea49 100644 --- a/crates/wasm/wasm-encoding-components/src/types/consensus_state.rs +++ b/crates/wasm/wasm-encoding-components/src/types/consensus_state.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[derive(Debug, HasField)] pub struct WasmConsensusState { diff --git a/crates/wasm/wasm-test-components/Cargo.toml b/crates/wasm/wasm-test-components/Cargo.toml index 652bd47106..a23d5a97dd 100644 --- a/crates/wasm/wasm-test-components/Cargo.toml +++ b/crates/wasm/wasm-test-components/Cargo.toml @@ -13,6 +13,7 @@ description = """ [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } ibc = { workspace = true } hermes-cosmos-chain-components = { workspace = true } hermes-cosmos-test-components = { workspace = true } diff --git a/crates/wasm/wasm-test-components/src/components.rs b/crates/wasm/wasm-test-components/src/components.rs index 07d4badee7..ee9225e520 100644 --- a/crates/wasm/wasm-test-components/src/components.rs +++ b/crates/wasm/wasm-test-components/src/components.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::impls::chain::{BuildStoreCodeMessage, SendStoreCodeProposalMessage}; use crate::traits::chain::{StoreCodeMessageBuilderComponent, WasmClientCodeUploaderComponent}; diff --git a/crates/wasm/wasm-test-components/src/impls/bootstrap/build_chain_driver.rs b/crates/wasm/wasm-test-components/src/impls/bootstrap/build_chain_driver.rs index 0a678af1d3..60514accce 100644 --- a/crates/wasm/wasm-test-components/src/impls/bootstrap/build_chain_driver.rs +++ b/crates/wasm/wasm-test-components/src/impls/bootstrap/build_chain_driver.rs @@ -2,7 +2,6 @@ use alloc::collections::BTreeMap; use core::marker::PhantomData; use core::time::Duration; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAmountType, HasDenomType}; use hermes_core::relayer_components::transaction::traits::CanSendMessagesWithSigner; use hermes_core::runtime_components::traits::{ @@ -21,6 +20,7 @@ use hermes_cosmos_test_components::bootstrap::traits::{ HasChainNodeConfigType, }; use hermes_cosmos_test_components::chain::types::{Amount, Denom, ProposalStatus, ProposalVote}; +use hermes_prelude::*; use crate::traits::bootstrap::{HasGovernanceProposalAuthority, HasWasmClientByteCode}; use crate::traits::chain::CanUploadWasmClientCode; diff --git a/crates/wasm/wasm-test-components/src/impls/bootstrap/genesis_config.rs b/crates/wasm/wasm-test-components/src/impls/bootstrap/genesis_config.rs index daff406d9a..c4a08d8fa5 100644 --- a/crates/wasm/wasm-test-components/src/impls/bootstrap/genesis_config.rs +++ b/crates/wasm/wasm-test-components/src/impls/bootstrap/genesis_config.rs @@ -1,9 +1,9 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cosmos_test_components::bootstrap::traits::{ CosmosGenesisConfigModifier, CosmosGenesisConfigModifierComponent, }; +use hermes_prelude::*; use serde_json::Value; pub struct ModifyWasmGenesisConfig(pub PhantomData); diff --git a/crates/wasm/wasm-test-components/src/impls/bootstrap/node_config.rs b/crates/wasm/wasm-test-components/src/impls/bootstrap/node_config.rs index 31e4f22c8a..b3484dc419 100644 --- a/crates/wasm/wasm-test-components/src/impls/bootstrap/node_config.rs +++ b/crates/wasm/wasm-test-components/src/impls/bootstrap/node_config.rs @@ -1,9 +1,9 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cosmos_test_components::bootstrap::traits::{ CometConfigModifier, CometConfigModifierComponent, }; +use hermes_prelude::*; use toml::Value; pub struct ModifyWasmNodeConfig(pub PhantomData); diff --git a/crates/wasm/wasm-test-components/src/impls/chain/messages/store_code.rs b/crates/wasm/wasm-test-components/src/impls/chain/messages/store_code.rs index f86356d369..ab5d5e2135 100644 --- a/crates/wasm/wasm-test-components/src/impls/chain/messages/store_code.rs +++ b/crates/wasm/wasm-test-components/src/impls/chain/messages/store_code.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::relayer_components::chain::traits::HasMessageType; use hermes_cosmos_chain_components::traits::{CosmosMessage, DynCosmosMessage, ToCosmosMessage}; use hermes_cosmos_test_components::chain::types::Amount; +use hermes_prelude::*; use ibc::primitives::Signer; use ibc_proto::cosmos::base::v1beta1::Coin; use ibc_proto::cosmos::gov::v1::MsgSubmitProposal; diff --git a/crates/wasm/wasm-test-components/src/impls/chain/upload_client_code.rs b/crates/wasm/wasm-test-components/src/impls/chain/upload_client_code.rs index 92676f23bb..c72d457820 100644 --- a/crates/wasm/wasm-test-components/src/impls/chain/upload_client_code.rs +++ b/crates/wasm/wasm-test-components/src/impls/chain/upload_client_code.rs @@ -1,11 +1,11 @@ use core::str::{from_utf8, FromStr, Utf8Error}; use std::num::ParseIntError; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasMessageResponseEvents; use hermes_core::relayer_components::chain::traits::CanSendSingleMessage; use hermes_core::test_components::chain::traits::HasProposalIdType; use hermes_cosmos_chain_components::types::AbciEvent; +use hermes_prelude::*; use crate::traits::chain::{ CanBuildStoreCodeMessage, WasmClientCodeUploader, WasmClientCodeUploaderComponent, diff --git a/crates/wasm/wasm-test-components/src/traits/bootstrap/client_byte_code.rs b/crates/wasm/wasm-test-components/src/traits/bootstrap/client_byte_code.rs index 6b6bf35702..908b1f9b8a 100644 --- a/crates/wasm/wasm-test-components/src/traits/bootstrap/client_byte_code.rs +++ b/crates/wasm/wasm-test-components/src/traits/bootstrap/client_byte_code.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_getter { provider: WasmClientByteCodeGetter, diff --git a/crates/wasm/wasm-test-components/src/traits/bootstrap/gov_authority.rs b/crates/wasm/wasm-test-components/src/traits/bootstrap/gov_authority.rs index 634b8bdc81..9a3044bb05 100644 --- a/crates/wasm/wasm-test-components/src/traits/bootstrap/gov_authority.rs +++ b/crates/wasm/wasm-test-components/src/traits/bootstrap/gov_authority.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{AddressOf, HasAddressType}; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; #[cgp_getter { provider: GovernanceProposalAuthorityGetter, diff --git a/crates/wasm/wasm-test-components/src/traits/chain/messages/store_code.rs b/crates/wasm/wasm-test-components/src/traits/chain/messages/store_code.rs index b841e25c0d..241706ea9f 100644 --- a/crates/wasm/wasm-test-components/src/traits/chain/messages/store_code.rs +++ b/crates/wasm/wasm-test-components/src/traits/chain/messages/store_code.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::relayer_components::chain::traits::HasMessageType; +use hermes_prelude::*; #[cgp_component { provider: StoreCodeMessageBuilder, diff --git a/crates/wasm/wasm-test-components/src/traits/chain/upload_client_code.rs b/crates/wasm/wasm-test-components/src/traits/chain/upload_client_code.rs index 8bfc0523c8..9d825a3c55 100644 --- a/crates/wasm/wasm-test-components/src/traits/chain/upload_client_code.rs +++ b/crates/wasm/wasm-test-components/src/traits/chain/upload_client_code.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::test_components::chain::traits::HasProposalIdType; +use hermes_prelude::*; #[cgp_component { provider: WasmClientCodeUploader,