chore: Remove LoadError::MissingDescriptor

ValuedMammal · ValuedMammal · commit aec4ddad1daa · 2024-05-13T16:29:33.000-04:00
Since we will have persisted descriptors for both
keychains.

This also means we're guaranteed to have gotten a
descriptor in the case `LoadedDescriptorDoesNotMatch`.
diff --git a/crates/wallet/src/wallet/mod.rs b/crates/wallet/src/wallet/mod.rs
@@ -306,8 +306,6 @@ pub enum LoadError {
     MissingNetwork,
     /// Data loaded from persistence is missing genesis hash.
     MissingGenesis,
-    /// Data loaded from persistence is missing descriptor.
-    MissingDescriptor,
 }
 
 impl fmt::Display for LoadError {
@@ -320,7 +318,6 @@ impl fmt::Display for LoadError {
             }
             LoadError::MissingNetwork => write!(f, "loaded data is missing network type"),
             LoadError::MissingGenesis => write!(f, "loaded data is missing genesis hash"),
-            LoadError::MissingDescriptor => write!(f, "loaded data is missing descriptor"),
         }
     }
 }
@@ -359,8 +356,7 @@ pub enum NewOrLoadError {
     /// The loaded desccriptor does not match what was provided.
     LoadedDescriptorDoesNotMatch {
         /// The descriptor loaded from persistence.
-        // TODO: this doesn't need to be Option. both external/internal are persisted
-        got: Option<ExtendedDescriptor>,
+        got: ExtendedDescriptor,
         /// The keychain of the descriptor not matching
         keychain: KeychainKind,
     },
@@ -582,14 +578,14 @@ impl Wallet {
             .indexer
             .keychains_added
             .get(&KeychainKind::External)
-            .ok_or(LoadError::MissingDescriptor)?
+            .expect("keychain must have been added")
             .clone();
         let change_descriptor = changeset
             .indexed_tx_graph
             .indexer
             .keychains_added
             .get(&KeychainKind::Internal)
-            .ok_or(LoadError::MissingDescriptor)?
+            .expect("keychain must have been added")
             .clone();
 
         let (signers, change_signers) =
@@ -661,10 +657,6 @@ impl Wallet {
                         expected: genesis_hash,
                         got: None,
                     },
-                    LoadError::MissingDescriptor => NewOrLoadError::LoadedDescriptorDoesNotMatch {
-                        got: None,
-                        keychain: KeychainKind::External,
-                    },
                 })?;
                 if wallet.network != network {
                     return Err(NewOrLoadError::LoadedNetworkDoesNotMatch {
@@ -685,7 +677,7 @@ impl Wallet {
                 let wallet_descriptor = wallet.public_descriptor(KeychainKind::External);
                 if wallet_descriptor != &expected_descriptor {
                     return Err(NewOrLoadError::LoadedDescriptorDoesNotMatch {
-                        got: Some(wallet_descriptor.clone()),
+                        got: wallet_descriptor.clone(),
                         keychain: KeychainKind::External,
                     });
                 }
@@ -712,7 +704,7 @@ impl Wallet {
                 let wallet_change_descriptor = wallet.public_descriptor(KeychainKind::Internal);
                 if wallet_change_descriptor != &expected_change_descriptor {
                     return Err(NewOrLoadError::LoadedDescriptorDoesNotMatch {
-                        got: Some(wallet_change_descriptor.clone()),
+                        got: wallet_change_descriptor.clone(),
                         keychain: KeychainKind::Internal,
                     });
                 }
diff --git a/crates/wallet/tests/wallet.rs b/crates/wallet/tests/wallet.rs
@@ -191,7 +191,7 @@ fn new_or_load() {
             matches!(
                 err,
                 bdk_wallet::wallet::NewOrLoadError::LoadedDescriptorDoesNotMatch { ref got, keychain }
-                if got == &Some(got_descriptor) && keychain == KeychainKind::External
+                if got == &got_descriptor && keychain == KeychainKind::External
             ),
             "err: {}",
             err,
@@ -214,7 +214,7 @@ fn new_or_load() {
             matches!(
                 err,
                 bdk_wallet::wallet::NewOrLoadError::LoadedDescriptorDoesNotMatch { ref got, keychain }
-                if got == &Some(got_descriptor) && keychain == KeychainKind::Internal
+                if got == &got_descriptor && keychain == KeychainKind::Internal
             ),
             "err: {}",
             err,
