check for no role before remove outdated BM

multiversx · Mar 16, 2024 · 6444205 · 6444205
1 parent 319c2c8
commit 6444205
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/contracts/multisig/src/multisig_sign.rs b/contracts/multisig/src/multisig_sign.rs
@@ -138,12 +138,16 @@ pub trait MultisigSignModule:
         let mut board_members_to_remove: ManagedVec<usize> = ManagedVec::new();
         if outdated_board_members.is_empty() {
             for signer_id in self.action_signer_ids(action_id).iter() {
-                if !self.user_id_to_role(signer_id).get().can_sign() {
+                if self.user_id_to_role(signer_id).get().has_no_role() {
                     board_members_to_remove.push(signer_id);
                 }
             }
         } else {
-            board_members_to_remove = outdated_board_members.to_vec();
+            for signer_id in outdated_board_members.into_iter() {
+                if self.user_id_to_role(signer_id).get().has_no_role() {
+                    board_members_to_remove.push(signer_id);
+                }
+            }
         }
         for member in board_members_to_remove.iter() {
             self.action_signer_ids(action_id).swap_remove(&member);

diff --git a/contracts/multisig/src/user_role.rs b/contracts/multisig/src/user_role.rs
@@ -23,4 +23,8 @@ impl UserRole {
     pub fn can_sign(&self) -> bool {
         matches!(*self, UserRole::BoardMember)
     }
+
+    pub fn has_no_role(&self) -> bool {
+        matches!(*self, UserRole::None)
+    }
 }