Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: track ibc-rs PR1097 #165

Merged
merged 1 commit into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 28 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ tracing = "0.1.26"
tracing-subscriber = "0.3.16"

# ibc dependencies
ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false, features = ["serde"] }
ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false }
ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4ebe5fe", default-features = false, features = ["serde"] }
ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4ebe5fe", default-features = false }
ibc-proto = { version = "0.41.0", default-features = false }
ics23 = { version = "0.11", default-features = false }

Expand Down
8 changes: 7 additions & 1 deletion basecoin/modules/src/ibc/impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ pub enum AnyConsensusState {
Tendermint(TmConsensusState),
}

impl From<ConsensusStateType> for AnyConsensusState {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious: how come we don't require an impl From<ClientStateType> for AnyClientState?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't have that AnyClientState enum in basecoin-rs at the moment. Instead, it's rolling with TmClientState as the associated type.

fn from(value: ConsensusStateType) -> Self {
AnyConsensusState::Tendermint(value.into())
}
}

impl From<AnyConsensusState> for Any {
fn from(value: AnyConsensusState) -> Self {
match value {
Expand Down Expand Up @@ -733,7 +739,7 @@ where
&self,
client_id: &ClientId,
) -> Result<Vec<ConnectionId>, ContextError> {
let client_connection_path = ClientConnectionPath::new(client_id);
let client_connection_path = ClientConnectionPath::new(client_id.clone());

Ok(self
.connection_ids_store
Expand Down
Loading