Simplify NftTransferError variant

informalsystems · Aug 20, 2024 · c0a3e2a · c0a3e2a
1 parent ed5ed8e
commit c0a3e2a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/ibc-apps/ics721-nft-transfer/types/src/class.rs b/ibc-apps/ics721-nft-transfer/types/src/class.rs
@@ -248,10 +248,7 @@ impl FromStr for ClassUri {
     fn from_str(class_uri: &str) -> Result<Self, Self::Err> {
         match Uri::from_str(class_uri) {
             Ok(uri) => Ok(Self(uri)),
-            Err(err) => Err(NftTransferError::InvalidUri {
-                uri: class_uri.to_string(),
-                validation_error: err,
-            }),
+            Err(err) => Err(NftTransferError::InvalidUri(err)),
         }
     }
 }

diff --git a/ibc-apps/ics721-nft-transfer/types/src/error.rs b/ibc-apps/ics721-nft-transfer/types/src/error.rs
@@ -15,11 +15,8 @@ pub enum NftTransferError {
     ContextError(ContextError),
     /// invalid identifier: `{0}`
     InvalidIdentifier(IdentifierError),
-    /// invalid URI: `{uri}`, validation error: `{validation_error}`
-    InvalidUri {
-        uri: String,
-        validation_error: http::uri::InvalidUri,
-    },
+    /// invalid URI: `{0}`
+    InvalidUri(http::uri::InvalidUri),
     /// invalid json data: `{description}`
     InvalidJsonData { description: String },
     /// invalid trace `{0}`
@@ -58,10 +55,7 @@ impl std::error::Error for NftTransferError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self {
             Self::ContextError(e) => Some(e),
-            Self::InvalidUri {
-                validation_error: e,
-                ..
-            } => Some(e),
+            Self::InvalidUri(e) => Some(e),
             Self::InvalidIdentifier(e) => Some(e),
             _ => None,
         }

diff --git a/ibc-apps/ics721-nft-transfer/types/src/token.rs b/ibc-apps/ics721-nft-transfer/types/src/token.rs
@@ -182,10 +182,7 @@ impl FromStr for TokenUri {
     fn from_str(token_uri: &str) -> Result<Self, Self::Err> {
         match Uri::from_str(token_uri) {
             Ok(uri) => Ok(Self(uri)),
-            Err(err) => Err(NftTransferError::InvalidUri {
-                uri: token_uri.to_string(),
-                validation_error: err,
-            }),
+            Err(err) => Err(NftTransferError::InvalidUri(err)),
         }
     }
 }