wip: less exploding in cosmos-sdk chian module

unionlabs · Sep 7, 2024 · 3f49add · 3f49add
1 parent ebc8ec6
commit 3f49add
Show file tree

Hide file tree

Showing 10 changed files with 241 additions and 2,996 deletions.
diff --git a/lib/block-message/src/chain/cosmos_sdk.rs b/lib/block-message/src/chain/cosmos_sdk.rs
diff --git a/lib/relay-message/src/chain/ethereum.rs b/lib/relay-message/src/chain/ethereum.rs
diff --git a/lib/relay-message/src/chain/scroll.rs b/lib/relay-message/src/chain/scroll.rs
diff --git a/lib/unionlabs/src/ibc/core/channel/channel.rs b/lib/unionlabs/src/ibc/core/channel/channel.rs
@@ -42,13 +42,18 @@ impl From<Channel> for protos::ibc::core::channel::v1::Channel {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone, PartialEq, thiserror::Error)]
 pub enum TryFromChannelError {
-    MissingField(MissingField),
-    State(UnknownEnumVariant<i32>),
-    Counterparty(TryFromChannelCounterpartyError),
-    Ordering(UnknownEnumVariant<i32>),
-    ConnectionHops(<ConnectionIdValidator as Validate<String>>::Error),
+    #[error(transparent)]
+    MissingField(#[from] MissingField),
+    #[error("invalid state")]
+    State(#[source] UnknownEnumVariant<i32>),
+    #[error("invalid counterparty")]
+    Counterparty(#[from] TryFromChannelCounterpartyError),
+    #[error("invalid ordering")]
+    Ordering(#[source] UnknownEnumVariant<i32>),
+    #[error("invalid connection_hops")]
+    ConnectionHops(#[from] <ConnectionIdValidator as Validate<String>>::Error),
 }
 
 impl TryFrom<protos::ibc::core::channel::v1::Channel> for Channel {

diff --git a/lib/unionlabs/src/ibc/core/channel/counterparty.rs b/lib/unionlabs/src/ibc/core/channel/counterparty.rs
@@ -27,7 +27,7 @@ impl From<Counterparty> for protos::ibc::core::channel::v1::Counterparty {
     }
 }
 
-#[derive(Debug, thiserror::Error)]
+#[derive(Debug, Clone, PartialEq, thiserror::Error)]
 pub enum TryFromChannelCounterpartyError {
     #[error("error parsing port id")]
     PortId(#[source] <PortId as FromStr>::Err),

diff --git a/lib/unionlabs/src/ibc/core/connection/connection_end.rs b/lib/unionlabs/src/ibc/core/connection/connection_end.rs
@@ -1,6 +1,5 @@
 use core::str::FromStr;
 
-use frame_support_procedural::DebugNoBound;
 use macros::model;
 
 #[cfg(feature = "ethabi")]
@@ -28,13 +27,18 @@ pub struct ConnectionEnd {
     pub delay_period: u64,
 }
 
-#[derive(DebugNoBound)]
+#[derive(Debug, Clone, PartialEq, thiserror::Error)]
 pub enum TryFromConnectionEndError {
-    ClientId(<ClientId as FromStr>::Err),
-    Version(UnknownEnumVariant<String>),
-    State(UnknownEnumVariant<i32>),
-    Counterparty(TryFromConnectionCounterpartyError),
-    MissingField(MissingField),
+    #[error(transparent)]
+    MissingField(#[from] MissingField),
+    #[error("invalid client_id")]
+    ClientId(#[from] <ClientId as FromStr>::Err),
+    #[error("invalid version")]
+    Version(#[from] UnknownEnumVariant<String>),
+    #[error("invalid state")]
+    State(#[from] UnknownEnumVariant<i32>),
+    #[error("invalid counterparty")]
+    Counterparty(#[from] TryFromConnectionCounterpartyError),
 }
 
 impl TryFrom<protos::ibc::core::connection::v1::ConnectionEnd> for ConnectionEnd {

diff --git a/lib/unionlabs/src/ibc/core/connection/counterparty.rs b/lib/unionlabs/src/ibc/core/connection/counterparty.rs
@@ -31,11 +31,14 @@ impl From<Counterparty> for protos::ibc::core::connection::v1::Counterparty {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone, PartialEq, thiserror::Error)]
 pub enum TryFromConnectionCounterpartyError {
-    MissingField(MissingField),
-    ClientId(<ClientId as FromStr>::Err),
-    ConnectionId(<ConnectionId as FromStr>::Err),
+    #[error(transparent)]
+    MissingField(#[from] MissingField),
+    #[error("invalid client_id")]
+    ClientId(#[source] <ClientId as FromStr>::Err),
+    #[error("invalid connection_id")]
+    ConnectionId(#[source] <ConnectionId as FromStr>::Err),
 }
 
 impl TryFrom<protos::ibc::core::connection::v1::Counterparty> for Counterparty {