key.rs: split "definite keys cannot have wildcards" into own error

Author: apoelstra

src/descriptor/key.rs

@@ -327,6 +327,24 @@ impl DescriptorMultiXKey<bip32::Xpriv> {
     }
 }
 
+/// Kinds of malformed key data
+#[derive(Debug, PartialEq, Clone)]
+#[non_exhaustive]
+#[allow(missing_docs)]
+pub enum NonDefiniteKeyError {
+    Wildcard,
+}
+
+impl fmt::Display for NonDefiniteKeyError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            Self::Wildcard => f.write_str("key with a wildcard cannot be a DerivedDescriptorKey"),
+        }
+    }
+}
+
+impl error::Error for NonDefiniteKeyError {}
+
 /// Kinds of malformed key data
 #[derive(Debug, PartialEq, Clone)]
 #[non_exhaustive]
@@ -346,7 +364,6 @@ pub enum MalformedKeyDataKind {
     NoKeyAfterOrigin,
     NoMasterFingerprintFound,
     UnclosedSquareBracket,
-    WildcardAsDerivedDescriptorKey,
 }
 
 impl fmt::Display for MalformedKeyDataKind {
@@ -366,7 +383,6 @@ impl fmt::Display for MalformedKeyDataKind {
             Self::NoKeyAfterOrigin => "no key after origin",
             Self::NoMasterFingerprintFound => "no master fingerprint found after '['",
             Self::UnclosedSquareBracket => "unclosed '['",
-            Self::WildcardAsDerivedDescriptorKey => "cannot parse key with a wilcard as a DerivedDescriptorKey",
         };
 
         f.write_str(err)
@@ -401,6 +417,8 @@ pub enum DescriptorKeyParseError {
         /// The underlying parse error
         err: bitcoin::hex::HexToArrayError,
     },
+    /// Attempt to construct a [`DefiniteDescriptorKey`] from an ambiguous key.
+    NonDefiniteKey(NonDefiniteKeyError),
     /// Error while parsing a simple public key.
     FullPublicKey(bitcoin::key::ParsePublicKeyError),
     /// Error while parsing a WIF private key.
@@ -423,6 +441,7 @@ impl fmt::Display for DescriptorKeyParseError {
             Self::MasterFingerprint { fingerprint, err } => {
                 write!(f, "on master fingerprint '{fingerprint}': {err}")
             }
+            Self::NonDefiniteKey(err) => err.fmt(f),
             Self::FullPublicKey(err) => err.fmt(f),
             Self::WifPrivateKey(err) => err.fmt(f),
             Self::XonlyPublicKey(err) => err.fmt(f),
@@ -440,6 +459,7 @@ impl error::Error for DescriptorKeyParseError {
             | Self::DeriveHardenedKey(err)
             | Self::MasterDerivationPath(err) => Some(err),
             Self::MasterFingerprint { err, .. } => Some(err),
+            Self::NonDefiniteKey(err) => Some(err),
             Self::FullPublicKey(err) => Some(err),
             Self::WifPrivateKey(err) => Some(err),
             Self::XonlyPublicKey(err) => Some(err),
@@ -1284,9 +1304,8 @@ impl FromStr for DefiniteDescriptorKey {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let inner = DescriptorPublicKey::from_str(s)?;
-        DefiniteDescriptorKey::new(inner).ok_or(DescriptorKeyParseError::MalformedKeyData(
-            MalformedKeyDataKind::WildcardAsDerivedDescriptorKey,
-        ))
+        DefiniteDescriptorKey::new(inner)
+            .ok_or(DescriptorKeyParseError::NonDefiniteKey(NonDefiniteKeyError::Wildcard))
     }
 }