fixup! feat!: modify Wallet struct to hold KeyRing

Author: 110CodingP

src/wallet/error.rs

@@ -29,8 +29,6 @@ pub enum LoadError<K> {
     MissingGenesis,
     /// Data is missing the network.
     MissingNetwork,
-    /// The default keychain is missing.
-    MissingDefaultKeychain,
     /// The keychain is missing,
     MissingKeychain(K),
     /// There was a problem with the passed-in descriptor(s).
@@ -60,13 +58,6 @@ pub enum LoadError<K> {
         /// The expected descriptor
         expected: Box<ExtendedDescriptor>,
     },
-    /// The default keychain is not as expected
-    DefaultKeychainMismatch {
-        /// The loaded default keychain
-        loaded: K,
-        /// The expected default keychain
-        expected: K,
-    },
 }
 
 impl<K> Display for LoadError<K>
@@ -80,9 +71,6 @@ where
             LoadError::MissingKeychain(keychain) => {
                 write!(f, "loaded data does not contain the keychain {keychain}")
             }
-            LoadError::MissingDefaultKeychain => {
-                write!(f, "loaded data is missing the default keychain")
-            }
             LoadError::InvalidKeyRing(err) => write!(f, "{err}"),
             LoadError::EmptyKeyring => write!(f, "Loaded keyring is empty"),
             LoadError::GenesisMismatch { loaded, expected } => write!(
@@ -109,11 +97,6 @@ where
                     keychain, loaded, expected,
                 )
             }
-            LoadError::DefaultKeychainMismatch { loaded, expected } => write!(
-                f,
-                "Default keychain mismatch: loaded {}, expected {}",
-                expected, loaded
-            ),
         }
     }
 }

src/wallet/params.rs

@@ -183,7 +183,6 @@ pub struct LoadParams<K> {
     pub(crate) check_genesis_hash: Option<BlockHash>,
     pub(crate) check_descs: BTreeMap<K, Option<DescriptorToExtract>>, /* none means just check
                                                                        * keychain is there */
-    pub(crate) check_default: Option<K>,
     pub(crate) use_spk_cache: bool,
 }
 
@@ -200,7 +199,6 @@ where
             check_network: None,
             check_genesis_hash: None,
             check_descs: BTreeMap::new(),
-            check_default: None,
             use_spk_cache: false,
         }
     }
@@ -216,12 +214,6 @@ where
         self
     }
 
-    /// Checks that the given keychain is loaded from persistence as the default keychain
-    pub fn check_default(mut self, default_keychain: K) -> Self {
-        self.check_default = Some(default_keychain);
-        self
-    }
-
     /// Checks that the given network matches the one loaded from persistence.
     pub fn check_network(mut self, network: Network) -> Self {
         self.check_network = Some(network);