fixed result/mapping and other minor

radixdlt · Jan 30, 2025 · d699d2e · d699d2e
1 parent 5c9af2b
commit d699d2e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/crates/profile/logic/logic_SPLIT_ME/src/logic/profile_update.rs b/crates/profile/logic/logic_SPLIT_ME/src/logic/profile_update.rs
@@ -342,39 +342,43 @@ pub trait ProfileSecurityStructuresUpdating {
     fn update_security_structure_remove_flag_default(
         &mut self,
         shield_id: &SecurityStructureID,
-    ) -> Result<bool>;
+    ) -> Result<()>;
 
     fn update_security_structure_add_flag_default(
         &mut self,
         shield_id: &SecurityStructureID,
-    ) -> Result<bool>;
+    ) -> Result<()>;
 }
 
 impl ProfileSecurityStructuresUpdating for Profile {
     fn update_security_structure_remove_flag_default(
         &mut self,
         shield_id: &SecurityStructureID,
-    ) -> Result<bool> {
-        Ok(self
-            .app_preferences
+    ) -> Result<()> {
+        self.app_preferences
             .security
             .security_structures_of_factor_source_ids
-            .update_with(shield_id, |s| {
+            .try_update_with(shield_id, |s| {
                 s.metadata.remove_flag(SecurityStructureFlag::Default)
-            }))
+            })
+            .map_err(|_| CommonError::InvalidSecurityStructureID {
+                bad_value: shield_id.to_string(),
+            })
     }
 
     fn update_security_structure_add_flag_default(
         &mut self,
         shield_id: &SecurityStructureID,
-    ) -> Result<bool> {
-        Ok(self
-            .app_preferences
+    ) -> Result<()> {
+        self.app_preferences
             .security
             .security_structures_of_factor_source_ids
-            .update_with(shield_id, |s| {
-                s.metadata.set_flag(SecurityStructureFlag::Default)
-            }))
+            .try_update_with(shield_id, |s| {
+                s.metadata.insert_flag(SecurityStructureFlag::Default)
+            })
+            .map_err(|_| CommonError::InvalidSecurityStructureID {
+                bad_value: shield_id.to_string(),
+            })
     }
 }
 

diff --git a/...e/models/security-structures/src/roles_matrices_structures/security_structure_metadata.rs b/...e/models/security-structures/src/roles_matrices_structures/security_structure_metadata.rs
@@ -53,13 +53,12 @@ impl SecurityStructureMetadata {
         )
     }
 
-    pub fn set_flag(&mut self, flag: SecurityStructureFlag) {
+    pub fn insert_flag(&mut self, flag: SecurityStructureFlag) {
         self.flags.insert(flag);
     }
 
     pub fn remove_flag(&mut self, flag: SecurityStructureFlag) {
-        let result = self.flags.remove_id(&flag.id());
-        println!("flag removed: {:?}", result)
+        self.flags.remove_id(&flag.id());
     }
 
     pub fn is_default(&self) -> bool {