imp(ics04): sync naming for channel events with the convention (#751)

Farhad-Shabani · web-flow · commit 98594ae31397 · 2023-07-07T12:10:18.000-07:00
diff --git a/.changelog/unreleased/breaking-changes/750-sync-ics04-events-namings-with-convention.md b/.changelog/unreleased/breaking-changes/750-sync-ics04-events-namings-with-convention.md
@@ -0,0 +1,2 @@
+- Sync field and method namings of ics04 events with the convention
+  ([#750](https://github.com/cosmos/ibc-rs/issues/750))
diff --git a/crates/ibc/src/core/ics03_connection/events.rs b/crates/ibc/src/core/ics03_connection/events.rs
@@ -99,16 +99,16 @@ impl OpenInit {
         })
     }
 
-    pub fn connection_id(&self) -> &ConnectionId {
+    pub fn conn_id_on_a(&self) -> &ConnectionId {
         &self.0.connection_id
     }
-    pub fn client_id(&self) -> &ClientId {
+    pub fn client_id_on_a(&self) -> &ClientId {
         &self.0.client_id
     }
-    pub fn counterparty_connection_id(&self) -> Option<&ConnectionId> {
+    pub fn conn_id_on_b(&self) -> Option<&ConnectionId> {
         self.0.counterparty_connection_id.as_ref()
     }
-    pub fn counterparty_client_id(&self) -> &ClientId {
+    pub fn client_id_on_b(&self) -> &ClientId {
         &self.0.counterparty_client_id
     }
 
@@ -158,16 +158,16 @@ impl OpenTry {
         })
     }
 
-    pub fn connection_id(&self) -> &ConnectionId {
+    pub fn conn_id_on_b(&self) -> &ConnectionId {
         &self.0.connection_id
     }
-    pub fn client_id(&self) -> &ClientId {
+    pub fn client_id_on_b(&self) -> &ClientId {
         &self.0.client_id
     }
-    pub fn counterparty_connection_id(&self) -> Option<&ConnectionId> {
+    pub fn conn_id_on_a(&self) -> Option<&ConnectionId> {
         self.0.counterparty_connection_id.as_ref()
     }
-    pub fn counterparty_client_id(&self) -> &ClientId {
+    pub fn client_id_on_a(&self) -> &ClientId {
         &self.0.counterparty_client_id
     }
 
@@ -217,16 +217,16 @@ impl OpenAck {
         })
     }
 
-    pub fn connection_id(&self) -> &ConnectionId {
+    pub fn conn_id_on_a(&self) -> &ConnectionId {
         &self.0.connection_id
     }
-    pub fn client_id(&self) -> &ClientId {
+    pub fn client_id_on_a(&self) -> &ClientId {
         &self.0.client_id
     }
-    pub fn counterparty_connection_id(&self) -> Option<&ConnectionId> {
+    pub fn conn_id_on_b(&self) -> Option<&ConnectionId> {
         self.0.counterparty_connection_id.as_ref()
     }
-    pub fn counterparty_client_id(&self) -> &ClientId {
+    pub fn client_id_on_b(&self) -> &ClientId {
         &self.0.counterparty_client_id
     }
 
@@ -276,16 +276,16 @@ impl OpenConfirm {
         })
     }
 
-    pub fn connection_id(&self) -> &ConnectionId {
+    pub fn conn_id_on_b(&self) -> &ConnectionId {
         &self.0.connection_id
     }
-    pub fn client_id(&self) -> &ClientId {
+    pub fn client_id_on_b(&self) -> &ClientId {
         &self.0.client_id
     }
-    pub fn counterparty_connection_id(&self) -> Option<&ConnectionId> {
+    pub fn conn_id_on_a(&self) -> Option<&ConnectionId> {
         self.0.counterparty_connection_id.as_ref()
     }
-    pub fn counterparty_client_id(&self) -> &ClientId {
+    pub fn client_id_on_a(&self) -> &ClientId {
         &self.0.counterparty_client_id
     }
 
diff --git a/crates/ibc/src/core/ics03_connection/handler/conn_open_ack.rs b/crates/ibc/src/core/ics03_connection/handler/conn_open_ack.rs
@@ -340,7 +340,7 @@ mod tests {
                 };
                 let conn_end = <MockContext as ValidationContext>::connection_end(
                     &fxt.ctx,
-                    conn_open_try_event.connection_id(),
+                    conn_open_try_event.conn_id_on_a(),
                 )
                 .unwrap();
                 assert_eq!(conn_end.state().clone(), State::Open);
diff --git a/crates/ibc/src/core/ics03_connection/handler/conn_open_confirm.rs b/crates/ibc/src/core/ics03_connection/handler/conn_open_confirm.rs
@@ -258,11 +258,9 @@ mod tests {
                     IbcEvent::OpenConfirmConnection(e) => e,
                     _ => unreachable!(),
                 };
-                let conn_end = ValidationContext::connection_end(
-                    &fxt.ctx,
-                    conn_open_try_event.connection_id(),
-                )
-                .unwrap();
+                let conn_end =
+                    ValidationContext::connection_end(&fxt.ctx, conn_open_try_event.conn_id_on_b())
+                        .unwrap();
                 assert_eq!(conn_end.state().clone(), State::Open);
             }
         }
diff --git a/crates/ibc/src/core/ics03_connection/handler/conn_open_init.rs b/crates/ibc/src/core/ics03_connection/handler/conn_open_init.rs
@@ -169,7 +169,7 @@ mod tests {
                 };
                 let conn_end = ValidationContext::connection_end(
                     &fxt.ctx,
-                    conn_open_init_event.connection_id(),
+                    conn_open_init_event.conn_id_on_a(),
                 )
                 .unwrap();
                 assert_eq!(conn_end.state().clone(), State::Init);
diff --git a/crates/ibc/src/core/ics03_connection/handler/conn_open_try.rs b/crates/ibc/src/core/ics03_connection/handler/conn_open_try.rs
@@ -306,11 +306,9 @@ mod tests {
                     IbcEvent::OpenTryConnection(e) => e,
                     _ => unreachable!(),
                 };
-                let conn_end = ValidationContext::connection_end(
-                    &fxt.ctx,
-                    conn_open_try_event.connection_id(),
-                )
-                .unwrap();
+                let conn_end =
+                    ValidationContext::connection_end(&fxt.ctx, conn_open_try_event.conn_id_on_b())
+                        .unwrap();
                 assert_eq!(conn_end.state().clone(), State::TryOpen);
             }
         }
diff --git a/crates/ibc/src/core/ics04_channel/events.rs b/crates/ibc/src/core/ics04_channel/events.rs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+- Sync field and method namings of ics04 events with the convention`
	`2`	`+ ([#750](https://github.com/cosmos/ibc-rs/issues/750))`
Original file line number	Diff line number	Diff line change
`@@ -99,16 +99,16 @@ impl OpenInit {`
`99`	`99`	`})`
`100`	`100`	`}`
`101`	`101`
`102`		`- pub fn connection_id(&self) -> &ConnectionId {`
	`102`	`+ pub fn conn_id_on_a(&self) -> &ConnectionId {`
`103`	`103`	`&self.0.connection_id`
`104`	`104`	`}`
`105`		`- pub fn client_id(&self) -> &ClientId {`
	`105`	`+ pub fn client_id_on_a(&self) -> &ClientId {`
`106`	`106`	`&self.0.client_id`
`107`	`107`	`}`
`108`		`- pub fn counterparty_connection_id(&self) -> Option<&ConnectionId> {`
	`108`	`+ pub fn conn_id_on_b(&self) -> Option<&ConnectionId> {`
`109`	`109`	`self.0.counterparty_connection_id.as_ref()`
`110`	`110`	`}`
`111`		`- pub fn counterparty_client_id(&self) -> &ClientId {`
	`111`	`+ pub fn client_id_on_b(&self) -> &ClientId {`
`112`	`112`	`&self.0.counterparty_client_id`
`113`	`113`	`}`
`114`	`114`
`@@ -158,16 +158,16 @@ impl OpenTry {`
`158`	`158`	`})`
`159`	`159`	`}`
`160`	`160`
`161`		`- pub fn connection_id(&self) -> &ConnectionId {`
	`161`	`+ pub fn conn_id_on_b(&self) -> &ConnectionId {`
`162`	`162`	`&self.0.connection_id`
`163`	`163`	`}`
`164`		`- pub fn client_id(&self) -> &ClientId {`
	`164`	`+ pub fn client_id_on_b(&self) -> &ClientId {`
`165`	`165`	`&self.0.client_id`
`166`	`166`	`}`
`167`		`- pub fn counterparty_connection_id(&self) -> Option<&ConnectionId> {`
	`167`	`+ pub fn conn_id_on_a(&self) -> Option<&ConnectionId> {`
`168`	`168`	`self.0.counterparty_connection_id.as_ref()`
`169`	`169`	`}`
`170`		`- pub fn counterparty_client_id(&self) -> &ClientId {`
	`170`	`+ pub fn client_id_on_a(&self) -> &ClientId {`
`171`	`171`	`&self.0.counterparty_client_id`
`172`	`172`	`}`
`173`	`173`
`@@ -217,16 +217,16 @@ impl OpenAck {`
`217`	`217`	`})`
`218`	`218`	`}`
`219`	`219`
`220`		`- pub fn connection_id(&self) -> &ConnectionId {`
	`220`	`+ pub fn conn_id_on_a(&self) -> &ConnectionId {`
`221`	`221`	`&self.0.connection_id`
`222`	`222`	`}`
`223`		`- pub fn client_id(&self) -> &ClientId {`
	`223`	`+ pub fn client_id_on_a(&self) -> &ClientId {`
`224`	`224`	`&self.0.client_id`
`225`	`225`	`}`
`226`		`- pub fn counterparty_connection_id(&self) -> Option<&ConnectionId> {`
	`226`	`+ pub fn conn_id_on_b(&self) -> Option<&ConnectionId> {`
`227`	`227`	`self.0.counterparty_connection_id.as_ref()`
`228`	`228`	`}`
`229`		`- pub fn counterparty_client_id(&self) -> &ClientId {`
	`229`	`+ pub fn client_id_on_b(&self) -> &ClientId {`
`230`	`230`	`&self.0.counterparty_client_id`
`231`	`231`	`}`
`232`	`232`
`@@ -276,16 +276,16 @@ impl OpenConfirm {`
`276`	`276`	`})`
`277`	`277`	`}`
`278`	`278`
`279`		`- pub fn connection_id(&self) -> &ConnectionId {`
	`279`	`+ pub fn conn_id_on_b(&self) -> &ConnectionId {`
`280`	`280`	`&self.0.connection_id`
`281`	`281`	`}`
`282`		`- pub fn client_id(&self) -> &ClientId {`
	`282`	`+ pub fn client_id_on_b(&self) -> &ClientId {`
`283`	`283`	`&self.0.client_id`
`284`	`284`	`}`
`285`		`- pub fn counterparty_connection_id(&self) -> Option<&ConnectionId> {`
	`285`	`+ pub fn conn_id_on_a(&self) -> Option<&ConnectionId> {`
`286`	`286`	`self.0.counterparty_connection_id.as_ref()`
`287`	`287`	`}`
`288`		`- pub fn counterparty_client_id(&self) -> &ClientId {`
	`288`	`+ pub fn client_id_on_a(&self) -> &ClientId {`
`289`	`289`	`&self.0.counterparty_client_id`
`290`	`290`	`}`
`291`	`291`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ mod tests {`
`340`	`340`	`};`
`341`	`341`	`let conn_end = <MockContext as ValidationContext>::connection_end(`
`342`	`342`	`&fxt.ctx,`
`343`		`- conn_open_try_event.connection_id(),`
	`343`	`+ conn_open_try_event.conn_id_on_a(),`
`344`	`344`	`)`
`345`	`345`	`.unwrap();`
`346`	`346`	`assert_eq!(conn_end.state().clone(), State::Open);`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ mod tests {`
`169`	`169`	`};`
`170`	`170`	`let conn_end = ValidationContext::connection_end(`
`171`	`171`	`&fxt.ctx,`
`172`		`- conn_open_init_event.connection_id(),`
	`172`	`+ conn_open_init_event.conn_id_on_a(),`
`173`	`173`	`)`
`174`	`174`	`.unwrap();`
`175`	`175`	`assert_eq!(conn_end.state().clone(), State::Init);`