Merge pull request #208 from GoodnessJohn/fix/180-181-eliminate-expect-calls

fix: eliminate expect calls in emergency-medical-info and hospital-re…

Author: Emeka000

contracts/emergency-medical-info/src/lib.rs

@@ -186,7 +186,7 @@ impl EmergencyMedicalInfo {
         env.storage()
             .persistent()
             .get(&profile_key)
-            .expect("Emergency profile not found")
+            .unwrap_or_else(|| panic!("Emergency profile not found"))
     }
 
     /// Notify emergency contacts
@@ -202,7 +202,7 @@ impl EmergencyMedicalInfo {
             .storage()
             .persistent()
             .get(&profile_key)
-            .expect("Emergency profile not found");
+            .unwrap_or_else(|| panic!("Emergency profile not found"));
 
         // Log notification
         let notif_key = DataKey::EmergencyNotifications(patient_id.clone());
@@ -262,7 +262,7 @@ impl EmergencyMedicalInfo {
         env.storage()
             .persistent()
             .get(&key)
-            .expect("Emergency profile not found")
+            .unwrap_or_else(|| panic!("Emergency profile not found"))
     }
 
     /// Get critical alerts for a patient

contracts/hospital-registry/src/lib.rs

@@ -201,8 +201,12 @@ impl HospitalRegistry {
             .storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital not found"));
+
             .ok_or(ContractError::HospitalNotFound)?;
 
+
         hospital.metadata = metadata;
         env.storage().persistent().set(&key, &hospital);
 
@@ -225,7 +229,11 @@ impl HospitalRegistry {
         env.storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital not found"))
+
             .ok_or(ContractError::HospitalNotFound)
+
     }
 
     /// Set full hospital configuration in one call
@@ -246,7 +254,11 @@ impl HospitalRegistry {
         env.storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital config not found"))
+
             .ok_or(ContractError::HospitalConfigNotFound)
+
     }
 
     pub fn update_departments(env: Env, wallet: Address, departments: Vec<Department>) -> Result<(), ContractError> {
@@ -258,8 +270,12 @@ impl HospitalRegistry {
             .storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital config not found"));
+
             .ok_or(ContractError::HospitalConfigNotFound)?;
 
+
         config.departments = departments;
         env.storage().persistent().set(&key, &config);
 
@@ -279,8 +295,12 @@ impl HospitalRegistry {
             .storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital config not found"));
+
             .ok_or(ContractError::HospitalConfigNotFound)?;
 
+
         config.locations = locations;
         env.storage().persistent().set(&key, &config);
 
@@ -298,8 +318,12 @@ impl HospitalRegistry {
             .storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital config not found"));
+
             .ok_or(ContractError::HospitalConfigNotFound)?;
 
+
         config.equipment = equipment;
         env.storage().persistent().set(&key, &config);
 
@@ -317,8 +341,12 @@ impl HospitalRegistry {
             .storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital config not found"));
+
             .ok_or(ContractError::HospitalConfigNotFound)?;
 
+
         config.policies = policies;
         env.storage().persistent().set(&key, &config);
 
@@ -336,8 +364,12 @@ impl HospitalRegistry {
             .storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital config not found"));
+
             .ok_or(ContractError::HospitalConfigNotFound)?;
 
+
         config.alerts = alerts;
         env.storage().persistent().set(&key, &config);
 
@@ -361,8 +393,12 @@ impl HospitalRegistry {
             .storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital config not found"));
+
             .ok_or(ContractError::HospitalConfigNotFound)?;
 
+
         config.insurance_providers = insurance_providers;
         env.storage().persistent().set(&key, &config);
 
@@ -380,8 +416,12 @@ impl HospitalRegistry {
             .storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital config not found"));
+
             .ok_or(ContractError::HospitalConfigNotFound)?;
 
+
         config.billing = billing;
         env.storage().persistent().set(&key, &config);
 
@@ -405,8 +445,12 @@ impl HospitalRegistry {
             .storage()
             .persistent()
             .get(&key)
+
+            .unwrap_or_else(|| panic!("Hospital config not found"));
+
             .ok_or(ContractError::HospitalConfigNotFound)?;
 
+
         config.emergency_protocols = protocols;
         env.storage().persistent().set(&key, &config);