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

Remove pub from MockConsensusState::root field #1259

Merged
merged 8 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
1 change: 0 additions & 1 deletion ibc-core/ics03-connection/types/src/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

use core::fmt::{Display, Error as FmtError, Formatter};
use core::time::Duration;
use core::u64;

use ibc_core_client_types::error::ClientError;
use ibc_core_commitment_types::commitment::CommitmentPrefix;
Expand Down
8 changes: 7 additions & 1 deletion ibc-testkit/src/testapp/ibc/clients/mock/consensus_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,17 @@ use crate::testapp::ibc::clients::mock::header::MockHeader;
use crate::testapp::ibc::clients::mock::proto::ConsensusState as RawMockConsensusState;
pub const MOCK_CONSENSUS_STATE_TYPE_URL: &str = "/ibc.mock.ConsensusState";

// Note: This type differs from the `mock::ConsensusState` type exposed by
// ibc-proto in a few ways:
// - ibc-proto's `mock::ConsensusState`'s `header` field takes the form of an
// `Option<Header>`, while the `header` field here is not optional.
// - ibc-proto's `mock::ConsensusState` does not have a `root` field for holding
// the `CommitmentRoot`; this field exists here because ...
rnbguy marked this conversation as resolved.
Show resolved Hide resolved
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct MockConsensusState {
pub header: MockHeader,
pub root: CommitmentRoot,
root: CommitmentRoot,
}

impl MockConsensusState {
Expand Down
Loading