Refactor MultiSig creation to factory method

To improve readability and maintainability, MultiSig struct instances creation scattered in different places are now replaced with a new factory method `MultiSig::new()`. Other changes include reduction of redundant struct declaration and removed the Debug trait from the Secret struct.
kaspanet · Oct 6, 2023 · c75844a · c75844a
1 parent 47fa5a5
commit c75844a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 28 deletions.
diff --git a/wallet/core/src/runtime/account/variants/multisig.rs b/wallet/core/src/runtime/account/variants/multisig.rs
@@ -77,13 +77,13 @@ impl Account for MultiSig {
     fn as_storable(&self) -> Result<storage::account::Account> {
         let settings = self.context().settings.clone().unwrap_or_default();
 
-        let multisig = storage::MultiSig {
-            xpub_keys: self.xpub_keys.clone(),
-            ecdsa: self.ecdsa,
-            cosigner_index: self.cosigner_index,
-            minimum_signatures: self.minimum_signatures,
-            prv_key_data_ids: self.prv_key_data_ids.clone(),
-        };
+        let multisig = storage::MultiSig::new(
+            self.xpub_keys.clone(),
+            self.prv_key_data_ids.clone(),
+            self.cosigner_index,
+            self.minimum_signatures,
+            self.ecdsa,
+        );
 
         let account = storage::Account::new(*self.id(), None, settings, storage::AccountData::MultiSig(multisig));
 

diff --git a/wallet/core/src/runtime/wallet.rs b/wallet/core/src/runtime/wallet.rs
@@ -486,13 +486,13 @@ impl Wallet {
                 runtime::MultiSig::try_new(
                     self,
                     settings,
-                    MultiSig {
-                        xpub_keys: Arc::new(xpub_keys),
-                        prv_key_data_ids: Some(Arc::new(prv_key_data_ids)),
-                        cosigner_index: Some(min_cosigner_index),
-                        minimum_signatures: args.minimum_signatures,
-                        ecdsa: false,
-                    },
+                    MultiSig::new(
+                        Arc::new(xpub_keys),
+                        Some(Arc::new(prv_key_data_ids)),
+                        Some(min_cosigner_index),
+                        args.minimum_signatures,
+                        false,
+                    ),
                     None,
                 )
                 .await?,
@@ -502,13 +502,7 @@ impl Wallet {
                 runtime::MultiSig::try_new(
                     self,
                     settings,
-                    MultiSig {
-                        xpub_keys: Arc::new(xpub_keys),
-                        prv_key_data_ids: None,
-                        cosigner_index: None,
-                        minimum_signatures: args.minimum_signatures,
-                        ecdsa: false,
-                    },
+                    MultiSig::new(Arc::new(xpub_keys), None, None, args.minimum_signatures, false),
                     None,
                 )
                 .await?,
@@ -892,13 +886,13 @@ impl Wallet {
             runtime::MultiSig::try_new(
                 self,
                 storage::Settings::default(),
-                MultiSig {
-                    xpub_keys: Arc::new(xpub_keys),
-                    prv_key_data_ids: Some(Arc::new(prv_key_data_ids)),
-                    cosigner_index: Some(min_cosigner_index),
+                MultiSig::new(
+                    Arc::new(xpub_keys),
+                    Some(Arc::new(prv_key_data_ids)),
+                    Some(min_cosigner_index),
                     minimum_signatures,
-                    ecdsa: false,
-                },
+                    false,
+                ),
                 None,
             )
             .await?,

diff --git a/wallet/core/src/secret.rs b/wallet/core/src/secret.rs
@@ -1,6 +1,6 @@
 use zeroize::Zeroize;
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct Secret(Vec<u8>);
 
 impl Secret {

diff --git a/wallet/core/src/storage/account.rs b/wallet/core/src/storage/account.rs
@@ -59,6 +59,18 @@ pub struct MultiSig {
     pub ecdsa: bool,
 }
 
+impl MultiSig {
+    pub fn new(
+        xpub_keys: Arc<Vec<String>>,
+        prv_key_data_ids: Option<Arc<Vec<PrvKeyDataId>>>,
+        cosigner_index: Option<u8>,
+        minimum_signatures: u16,
+        ecdsa: bool,
+    ) -> Self {
+        Self { version: MULTISIG_ACCOUNT_VERSION, xpub_keys, prv_key_data_ids, cosigner_index, minimum_signatures, ecdsa }
+    }
+}
+
 const KEYPAIR_ACCOUNT_VERSION: u16 = 0;
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]