review fixes

radixdlt · Jan 14, 2025 · 274b333 · 274b333
1 parent 1194bb5
commit 274b333
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/crates/system/os/factors/src/sargon_os_apply_shield.rs b/crates/system/os/factors/src/sargon_os_apply_shield.rs
@@ -109,7 +109,9 @@ impl OsShieldApplying for SargonOS {
                 let security_structure_of_factor_instances =
                     security_structures_of_factor_instances
                         .shift_remove(&entity_address)
-                        .unwrap();
+                        .expect(
+                            "Should have a security structure for each entity",
+                        );
 
                 let mut entity = self.entity_by_address(entity_address)?;
                 entity.set_provisional(
@@ -184,7 +186,7 @@ impl OsShieldApplying for SargonOS {
         let key_derivation_interactors = self.keys_derivation_interactor();
 
         // We only consume ROLA factors for:
-        // * Unsecured entities (because they do not yet have nay ROLA key)
+        // * Unsecured entities (because they do not yet have any ROLA key)
         // * Securified entities where the ROLA key's FactorSource does not match the one of the shield
         let mut existing_rola_key_for_entities = IndexMap::<
             AddressOfAccountOrPersona,

diff --git a/crates/system/os/factors/src/sargon_os_security_structures.rs b/crates/system/os/factors/src/sargon_os_security_structures.rs
@@ -10,7 +10,7 @@ pub trait OsSecurityStructuresQuerying {
         &self,
     ) -> Result<SecurityStructuresOfFactorSourceIDs>;
 
-    fn security_structure_of_factor_source_ids_from_security_structure_id(
+    fn security_structure_of_factor_source_ids_by_security_structure_id(
         &self,
         shield_id: SecurityStructureID,
     ) -> Result<SecurityStructureOfFactorSourceIDs>;
@@ -20,7 +20,7 @@ pub trait OsSecurityStructuresQuerying {
         shield_id: SecurityStructureID,
     ) -> Result<SecurityStructureOfFactorSources> {
         let shield_id_level = self
-            .security_structure_of_factor_source_ids_from_security_structure_id(
+            .security_structure_of_factor_source_ids_by_security_structure_id(
                 shield_id,
             )?;
         self.security_structure_of_factor_sources_from_security_structure_of_factor_source_ids(&shield_id_level)
@@ -84,7 +84,7 @@ impl OsSecurityStructuresQuerying for SargonOS {
         })
     }
 
-    fn security_structure_of_factor_source_ids_from_security_structure_id(
+    fn security_structure_of_factor_source_ids_by_security_structure_id(
         &self,
         shield_id: SecurityStructureID,
     ) -> Result<SecurityStructureOfFactorSourceIDs> {