Merge pull request #1498 from priscaenoch/feature/1374-earnings-notinitialized-error

fix(earnings): replace admin() unwrap with typed NotInitialized error

Author: aji70

contract/contracts/earnings/src/lib.rs

@@ -20,11 +20,14 @@ enum DataKey {
 /// | Code | Variant |
 /// |------|---------|
 /// | 1 | `AlreadyInitialized` |
+/// | 2 | `NotInitialized` |
 #[contracterror]
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum Error {
     /// Code 1 – contract was already initialized.
     AlreadyInitialized = 1,
+    /// Code 2 – admin key not present; contract was never initialized.
+    NotInitialized = 2,
 }
 
 #[contract]
@@ -42,7 +45,10 @@ impl Earnings {
     }
 
     pub fn admin(env: Env) -> Address {
-        env.storage().instance().get(&DataKey::Admin).unwrap()
+        env.storage()
+            .instance()
+            .get(&DataKey::Admin)
+            .unwrap_or_else(|| panic_with_error!(&env, Error::NotInitialized))
     }
 
     pub fn record(env: Env, creator: Address, amount: i128) {

contract/contracts/earnings/src/test.rs

@@ -78,6 +78,23 @@ fn test_init_requires_admin_auth_without_persisting_state() {
     assert_eq!(client.admin(), admin);
 }
 
+/// Calling admin() before init() returns a typed NotInitialized error instead
+/// of panicking on an unwrap of empty storage.
+#[test]
+fn test_admin_returns_not_initialized_before_init() {
+    let env = Env::default();
+    let contract_id = env.register_contract(None, Earnings);
+    let client = EarningsClient::new(&env, &contract_id);
+
+    let result = client.try_admin();
+    assert_eq!(
+        result,
+        Err(Ok(SorobanError::from_contract_error(
+            Error::NotInitialized as u32,
+        )))
+    );
+}
+
 // ── #319 – non-admin record reverts ──────────────────────────────────────────
 
 /// Non-admin caller (no admin auth) must not be able to record earnings.