fix: use from instead of try_from

cosmos · Jul 10, 2024 · 8534eeb · 8534eeb
1 parent b61bf54
commit 8534eeb
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 11 deletions.
diff --git a/ibc-core/ics03-connection/types/src/connection.rs b/ibc-core/ics03-connection/types/src/connection.rs
@@ -3,7 +3,6 @@
 use core::fmt::{Display, Error as FmtError, Formatter};
 use core::time::Duration;
 
-use ibc_core_client_types::error::ClientError;
 use ibc_core_commitment_types::commitment::CommitmentPrefix;
 use ibc_core_host_types::identifiers::{ClientId, ConnectionId};
 use ibc_primitives::prelude::*;
@@ -392,8 +391,7 @@ impl TryFrom<RawCounterparty> for Counterparty {
                 .prefix
                 .ok_or(ConnectionError::MissingCounterparty)?
                 .key_prefix
-                .try_into()
-                .map_err(|_| ConnectionError::Client(ClientError::EmptyPrefix))?,
+                .into(),
         ))
     }
 }

diff --git a/ibc-testkit/src/testapp/ibc/core/core_ctx.rs b/ibc-testkit/src/testapp/ibc/core/core_ctx.rs
@@ -135,7 +135,7 @@ where
     fn commitment_prefix(&self) -> CommitmentPrefix {
         // this is prefix of ibc store
         // using a dummy prefix as in our mock context
-        CommitmentPrefix::try_from(b"mock".to_vec()).expect("Never fails")
+        CommitmentPrefix::from(b"mock".to_vec())
     }
 
     fn connection_counter(&self) -> Result<u64, ContextError> {

diff --git a/tests-integration/tests/core/ics03_connection/conn_open_ack.rs b/tests-integration/tests/core/ics03_connection/conn_open_ack.rs
@@ -48,7 +48,7 @@ fn conn_open_ack_fixture(ctx: Ctx) -> Fixture<MsgConnectionOpenAck> {
         Counterparty::new(
             client_id.clone(),
             Some(msg.conn_id_on_b.clone()),
-            CommitmentPrefix::try_from(b"ibc".to_vec()).unwrap(),
+            CommitmentPrefix::from(b"ibc".to_vec()),
         ),
         vec![msg.version.clone()],
         ZERO_DURATION,

diff --git a/tests-integration/tests/core/ics03_connection/conn_open_confirm.rs b/tests-integration/tests/core/ics03_connection/conn_open_confirm.rs
@@ -31,7 +31,7 @@ fn conn_open_confirm_fixture(ctx: Ctx) -> Fixture<MsgConnectionOpenConfirm> {
     let counterparty = Counterparty::new(
         client_id.clone(),
         Some(msg.conn_id_on_b.clone()),
-        CommitmentPrefix::try_from(b"ibc".to_vec()).unwrap(),
+        CommitmentPrefix::from(b"ibc".to_vec()),
     );
 
     let ctx_default = MockContext::default();

diff --git a/tests-integration/tests/core/ics04_channel/acknowledgement.rs b/tests-integration/tests/core/ics04_channel/acknowledgement.rs
@@ -75,7 +75,7 @@ fn fixture() -> Fixture {
         ConnectionCounterparty::new(
             default_client_id,
             Some(ConnectionId::zero()),
-            CommitmentPrefix::try_from(vec![0]).expect("no error"),
+            CommitmentPrefix::from(vec![0]),
         ),
         ConnectionVersion::compatibles(),
         ZERO_DURATION,

diff --git a/tests-integration/tests/core/ics04_channel/recv_packet.rs b/tests-integration/tests/core/ics04_channel/recv_packet.rs
@@ -65,7 +65,7 @@ fn fixture() -> Fixture {
         ConnectionCounterparty::new(
             client_id.clone(),
             Some(ConnectionId::zero()),
-            CommitmentPrefix::try_from(vec![0]).expect("no error"),
+            CommitmentPrefix::from(vec![0]),
         ),
         ConnectionVersion::compatibles(),
         ZERO_DURATION,

diff --git a/tests-integration/tests/core/ics04_channel/send_packet.rs b/tests-integration/tests/core/ics04_channel/send_packet.rs
@@ -47,7 +47,7 @@ fn send_packet_processing() {
         ConnectionCounterparty::new(
             default_client_id,
             Some(ConnectionId::zero()),
-            CommitmentPrefix::try_from(vec![0]).expect("no error"),
+            CommitmentPrefix::from(vec![0]),
         ),
         ConnectionVersion::compatibles(),
         ZERO_DURATION,

diff --git a/tests-integration/tests/core/ics04_channel/timeout.rs b/tests-integration/tests/core/ics04_channel/timeout.rs
@@ -86,7 +86,7 @@ fn fixture() -> Fixture {
         ConnectionCounterparty::new(
             client_id.clone(),
             Some(ConnectionId::zero()),
-            CommitmentPrefix::try_from(vec![0]).expect("no error"),
+            CommitmentPrefix::from(vec![0]),
         ),
         ConnectionVersion::compatibles(),
         ZERO_DURATION,

diff --git a/tests-integration/tests/core/ics04_channel/timeout_on_close.rs b/tests-integration/tests/core/ics04_channel/timeout_on_close.rs
@@ -69,7 +69,7 @@ fn fixture() -> Fixture {
         ConnectionCounterparty::new(
             default_client_id,
             Some(ConnectionId::zero()),
-            CommitmentPrefix::try_from(vec![0]).expect("no error"),
+            CommitmentPrefix::from(vec![0]),
         ),
         ConnectionVersion::compatibles(),
         ZERO_DURATION,