Merge pull request #416 from str4d/ua-parser-checks

Add Unified Address parser structural checks
zcash · Jul 12, 2021 · 1a40fc9 · 1a40fc9
2 parents 8b4ae55 + b875f6c
commit 1a40fc9
Show file tree

Hide file tree

Showing 2 changed files with 336 additions and 24 deletions.
diff --git a/components/zcash_address/src/encoding.rs b/components/zcash_address/src/encoding.rs
@@ -11,13 +11,25 @@ pub enum ParseError {
     InvalidEncoding,
     /// The string is not a Zcash address.
     NotZcash,
+    /// Errors specific to unified addresses.
+    Unified(unified::ParseError),
+}
+
+impl From<unified::ParseError> for ParseError {
+    fn from(e: unified::ParseError) -> Self {
+        match e {
+            unified::ParseError::InvalidEncoding => Self::InvalidEncoding,
+            _ => Self::Unified(e),
+        }
+    }
 }
 
 impl fmt::Display for ParseError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             ParseError::InvalidEncoding => write!(f, "Invalid encoding"),
             ParseError::NotZcash => write!(f, "Not a Zcash address"),
+            ParseError::Unified(e) => e.fmt(f),
         }
     }
 }