MESH-1792/ improving signer already linked errors (#1226)

* modified errors

* update comment

Co-authored-by: Mazdak Farrokhzad <[email protected]>

Co-authored-by: Mazdak Farrokhzad <[email protected]>
Co-authored-by: Robert Gabriel Jakabosky <[email protected]>

Author: 3 people

pallets/multisig/src/lib.rs

@@ -653,7 +653,9 @@ decl_error! {
         /// Changing multisig parameters not allowed since multisig is a primary key.
         ChangeNotAllowed,
         /// Signer is an account key that is already associated with a multisig.
-        SignerAlreadyLinked,
+        SignerAlreadyLinkedToMultisig,
+        /// Signer is an account key that is already associated with an identity.
+        SignerAlreadyLinkedToIdentity,
         /// Current DID is missing
         MissingCurrentIdentity,
         /// The function can only be called by the primary key of the did
@@ -1046,16 +1048,16 @@ impl<T: Config> Module<T> {
                 // Don't allow a signer key that is already a secondary key on another multisig
                 ensure!(
                     !<KeyToMultiSig<T>>::contains_key(key),
-                    Error::<T>::SignerAlreadyLinked
+                    Error::<T>::SignerAlreadyLinkedToMultisig
                 );
                 // Don't allow a signer key that is already a secondary key on another identity
                 ensure!(
                     !<identity::KeyToIdentityIds<T>>::contains_key(key),
-                    Error::<T>::SignerAlreadyLinked
+                    Error::<T>::SignerAlreadyLinkedToIdentity
                 );
                 // Don't allow a multisig to add itself as a signer to itself
                 // NB - you can add a multisig as a signer to a different multisig
-                ensure!(key != &multisig, Error::<T>::SignerAlreadyLinked);
+                ensure!(key != &multisig, Error::<T>::SignerAlreadyLinkedToMultisig);
             }
 
             let ms_identity = <MultiSigToIdentity<T>>::get(&multisig);

pallets/runtime/tests/src/multisig.rs

@@ -99,7 +99,7 @@ fn join_multisig() {
         set_curr_did(Some(alice_did));
         assert_noop!(
             MultiSig::accept_multisig_signer_as_key(bob.clone(), bob_auth_id2),
-            Error::SignerAlreadyLinked
+            Error::SignerAlreadyLinkedToMultisig
         );
     });
 }