Skip to content

Commit ddab1b0

Browse files
authored
Migrate client upgrade test components from TestDriver to ChainDriver (#634)
* Migrate client upgrade test components from TestDriver to ChainDriver * uncomment ibc-go-v8 feature
1 parent 2d49618 commit ddab1b0

File tree

5 files changed

+115
-109
lines changed

5 files changed

+115
-109
lines changed

crates/cosmos/cosmos-integration-tests/src/contexts/binary_channel/test_driver.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@ use hermes_core::test_components::setup::traits::{
1515
RecoverClientPayloadOptionsGetterAtComponent,
1616
};
1717
use hermes_core::test_components::test_case::traits::recover_client::RecoverClientHandlerComponent;
18-
use hermes_core::test_components::test_case::traits::upgrade_client::{
19-
SetupUpgradeClientTestHandlerComponent, UpgradeClientHandlerComponent,
20-
};
2118
use hermes_cosmos_core::chain_components::impls::CosmosRecoverClientPayload;
2219
use hermes_cosmos_core::chain_components::types::CosmosCreateClientOptions;
23-
use hermes_cosmos_core::test_components::chain::impls::{
24-
CosmosHandleUpgradeClient, RecoverClientWithProposals, SetupCosmosUpgradeClientTest,
25-
};
20+
use hermes_cosmos_core::test_components::chain::impls::RecoverClientWithProposals;
2621
use hermes_cosmos_core::tracing_logging_components::contexts::TracingLogger;
2722
use hermes_error::handlers::DebugError;
2823
use hermes_error::impls::UseHermesError;
@@ -73,10 +68,6 @@ delegate_components! {
7368
LoggerComponent: TracingLogger,
7469
RecoverClientHandlerComponent:
7570
RecoverClientWithProposals,
76-
UpgradeClientHandlerComponent:
77-
CosmosHandleUpgradeClient,
78-
SetupUpgradeClientTestHandlerComponent:
79-
SetupCosmosUpgradeClientTest,
8071
[
8172
FullNodeForkerComponent,
8273
FullNodeHalterComponent,

crates/cosmos/cosmos-integration-tests/src/contexts/chain_driver.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use core::marker::PhantomData;
33
use std::path::PathBuf;
44

55
use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent};
6+
use hermes_core::logging_components::traits::LoggerComponent;
67
use hermes_core::runtime_components::traits::{
78
RuntimeGetter, RuntimeGetterComponent, RuntimeTypeProviderComponent,
89
};
@@ -18,19 +19,26 @@ use hermes_core::test_components::chain_driver::traits::{
1819
StakingDenom, TransferDenom, UserWallet, ValidatorWallet, WalletGetterComponent,
1920
WalletsGetterComponent,
2021
};
22+
use hermes_core::test_components::test_case::traits::upgrade_client::{
23+
SetupUpgradeClientTestHandlerComponent, UpgradeClientHandlerComponent,
24+
};
2125
use hermes_cosmos_core::chain_components::impls::RelayerConfig;
2226
use hermes_cosmos_core::test_components::bootstrap::traits::{
2327
ChainCommandPathGetter, ChainCommandPathGetterComponent,
2428
};
2529
use hermes_cosmos_core::test_components::bootstrap::types::{
2630
CosmosChainNodeConfig, CosmosGenesisConfig,
2731
};
32+
use hermes_cosmos_core::test_components::chain::impls::{
33+
CosmosHandleUpgradeClient, SetupCosmosUpgradeClientTest,
34+
};
2835
use hermes_cosmos_core::test_components::chain::types::{CosmosTestWallet, Denom};
2936
use hermes_cosmos_core::test_components::chain_driver::components::CosmosChainDriverComponents as BaseCosmosChainDriverComponents;
3037
use hermes_cosmos_core::test_components::chain_driver::impls::CosmosProposalSetupClientUpgradeResult;
3138
use hermes_cosmos_core::test_components::chain_driver::traits::{
3239
GrpcPortGetter, GrpcPortGetterComponent, RpcPortGetter, RpcPortGetterComponent,
3340
};
41+
use hermes_cosmos_core::tracing_logging_components::contexts::TracingLogger;
3442
use hermes_cosmos_relayer::contexts::CosmosChain;
3543
use hermes_error::handlers::DebugError;
3644
use hermes_error::impls::UseHermesError;
@@ -72,6 +80,12 @@ delegate_components! {
7280
ProposalStatusTypeComponent,
7381
]:
7482
BaseCosmosChainDriverComponents,
83+
UpgradeClientHandlerComponent:
84+
CosmosHandleUpgradeClient,
85+
SetupUpgradeClientTestHandlerComponent:
86+
SetupCosmosUpgradeClientTest,
87+
LoggerComponent:
88+
TracingLogger,
7589
WalletsGetterComponent:
7690
UseField<symbol!("wallets")>,
7791
WalletGetterComponent<RelayerWallet>:

0 commit comments

Comments
 (0)