Remove height information from IbcEvent
#2542
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
romac
reviewed
Aug 11, 2022
| Err(Error::missing_raw_header()) | ||
| } | ||
|
|
||
| #[cfg(test)] |
| pub const CONN_ID_ATTRIBUTE_KEY: &str = "connection_id"; | ||
| pub const CLIENT_ID_ATTRIBUTE_KEY: &str = "client_id"; | ||
| pub const COUNTERPARTY_CONN_ID_ATTRIBUTE_KEY: &str = "counterparty_connection_id"; | ||
| pub const COUNTERPARTY_CLIENT_ID_ATTRIBUTE_KEY: &str = "counterparty_client_id"; | ||
|
|
||
| #[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] | ||
| #[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] |
relayer/src/event.rs
Outdated
| Self { event, height } | ||
| } | ||
|
|
||
| pub fn event(&self) -> &IbcEvent { |
There was a problem hiding this comment.
We don't need those if the fields are public imho
There was a problem hiding this comment.
Alternatively, we can make the the fields private.
relayer/src/event.rs
Outdated
| &self.event | ||
| } | ||
|
|
||
| pub fn height(&self) -> &Height { |
relayer/src/link/relay_path.rs
Outdated
| PrettyEvents( | ||
| dst_tx_events | ||
| .iter() | ||
| .map(|ev| ev.event.clone()) |
There was a problem hiding this comment.
Is there no way around cloning all the events here? Feel free to disregard
hu55a1n1
reviewed
Aug 11, 2022
| @@ -336,59 +411,6 @@ impl IbcEvent { | |||
| } | |||
| } | |||
|
|
|||
| pub fn height(&self) -> Height { | |||
Co-authored-by: Romain Ruetschi <romain@informal.systems>
hu55a1n1
reviewed
Aug 11, 2022
hu55a1n1
approved these changes
Aug 12, 2022
hu55a1n1
pushed a commit
to hu55a1n1/hermes
that referenced
this pull request
Sep 13, 2022
* Introduce IbcEventWithHeight * Remove IbcEvent height() and set_height() * before AbciEvent -> Attributes refactor * stop using try_from_tx in favor of IbcEvent::try_from * Client TryFrom AbciEvent done * TryFrom AbciEvent for connection * AbciEvent -> IbcEvent scaffolding done * Client Abci conversion done * connection abci -> IbcEvent done * channel abci conversion done * Before TxSyncResult use IbcEventWithHeight * Remove client height * Remove height from connection * channel heights removed * Move tests to modules * move connection tests to modules * move channel tests to modules * fix bug * changelog * Update .changelog/unreleased/improvements/2542-remove-ibcevent-height Co-authored-by: Romain Ruetschi <romain@informal.systems> * fix potential regression * Remove `event()` from IbcEventWithHeight * Remove `height()` from IbcEventWithHeight * Fix PrettyEvents * fix regression - try 2 * cargo doc fix * move AbciEvent -> IbcEvent to relayer * Move abci_event -> ibc_event logic to relayer informalsystems#2 * Fix get_all_events() * fix e2e tests Co-authored-by: Romain Ruetschi <romain@informal.systems>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes: #2539
Description
height()andset_height()fromIbcEventIbcEventthat needed height information with newIbcEventWithHeightextract_attributes_from_tx()in theTryFrom<&AbciEvent> for IbcEventStructtemporarily. All client events don't have the same attributes, so we need a different solution. Similarly for connection and channel events.PR author checklist:
unclog.docs/).Reviewer checklist:
Files changedin the GitHub PR explorer.