@layerzerolabs/protocol-stellar-v2 0.2.33 → 0.2.35

package/contracts/sac-manager/src/tests/sac_manager/mint.rs

@@ -1,252 +0,0 @@
-//! Mint (MintBurnable) Integration Tests
-
-use super::test_helper::{mock_set_authorized_auth, mock_set_mint_whitelist_auth, mock_set_supply_controller_auth};
-use crate::errors::SacManagerError;
-use crate::extensions::redistribution::RedistributeFunds;
-use crate::extensions::supply_control::{LimitConfig, SupplyControlError, SupplyControllerConfig};
-use crate::tests::test_helper::{mock_oft_mint_auth, TestSetup};
-use soroban_sdk::{testutils::IssuerFlags, Vec};
-use utils::testing_utils::assert_contains_event;
-
-// =========================================================================
-// Mint Tests (without Supply Control) — OFT calls mint
-// =========================================================================
-
-#[test]
-fn test_mint_by_oft() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let recipient = setup.generate_address();
-
-    // Supply control is disabled by default
-    assert!(!setup.sac_manager_client.supply_control_enabled());
-
-    // OFT can mint when supply control is disabled (no SupplyIncreased event emitted)
-    mock_oft_mint_auth(&setup, &recipient, 1000_i128);
-    setup.sac_manager_client.mint(&recipient, &1000);
-    assert_eq!(setup.sac_client.balance(&recipient), 1000);
-}
-
-#[test]
-fn test_oft_mint_redistributes_when_recipient_blacklisted() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().with_redistribution_enabled().build();
-    let blacklisted_recipient = setup.generate_address();
-
-    // Enable issuer flags required for blacklist behavior in SAC tests.
-    setup.sac_contract.issuer().set_flag(IssuerFlags::RevocableFlag);
-    setup.sac_contract.issuer().set_flag(IssuerFlags::ClawbackEnabledFlag);
-
-    mock_set_authorized_auth(&setup, &blacklisted_recipient, false);
-    setup.sac_manager_client.set_authorized(&blacklisted_recipient, &false);
-    assert!(!setup.sac_client.authorized(&blacklisted_recipient));
-
-    let owner_balance_before = setup.sac_client.balance(&setup.owner);
-    let blacklisted_balance_before = setup.sac_client.balance(&blacklisted_recipient);
-
-    mock_oft_mint_auth(&setup, &blacklisted_recipient, 700_i128);
-    setup.sac_manager_client.mint(&blacklisted_recipient, &700);
-
-    // No SupplyIncreased when supply control is off; only RedistributeFunds is emitted.
-    let expected = RedistributeFunds { user: blacklisted_recipient.clone(), amount: 700 };
-    assert_contains_event(&setup.env, &setup.sac_manager, expected);
-
-    assert_eq!(setup.sac_client.balance(&blacklisted_recipient), blacklisted_balance_before);
-    assert_eq!(setup.sac_client.balance(&setup.owner), owner_balance_before + 700);
-}
-
-#[test]
-fn test_mint_fails_when_oft_not_set() {
-    let setup = TestSetup::new().without_oft().build();
-    let recipient = setup.generate_address();
-
-    let result = setup.sac_manager_client.try_mint(&recipient, &1000);
-    assert_eq!(result.err().unwrap().unwrap(), SacManagerError::OftAddressNotSet.into());
-}
-
-// =========================================================================
-// Mint Tests (with Supply Control)
-// =========================================================================
-
-#[test]
-fn test_mint_within_rate_limit() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().with_supply_control_enabled().build();
-    let recipient = setup.generate_address();
-
-    // Add the OFT as a supply controller
-    let config = SupplyControllerConfig {
-        limit_config: LimitConfig { limit_capacity: 1_000, refill_per_second: 10 },
-        allow_any_mint_burn: true,
-        whitelist_addresses: Vec::new(&setup.env),
-    };
-    mock_set_supply_controller_auth(&setup, &setup.sc_manager, &setup.oft, &Some(config.clone()));
-    setup.sac_manager_client.set_supply_controller(&setup.sc_manager, &setup.oft, &Some(config.clone()));
-
-    // Mint within limit should succeed
-    mock_oft_mint_auth(&setup, &recipient, 500_i128);
-    setup.sac_manager_client.mint(&recipient, &500);
-    assert_eq!(setup.sac_client.balance(&recipient), 500);
-    assert_eq!(setup.sac_manager_client.get_remaining_mint_amount(&setup.oft), 500);
-}
-
-#[test]
-fn test_mint_to_whitelisted_address() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().with_supply_control_enabled().build();
-    let whitelisted = setup.generate_address();
-
-    // Add OFT as controller with whitelist (NOT allow_any_mint_burn)
-    let config = SupplyControllerConfig {
-        limit_config: LimitConfig { limit_capacity: 1_000, refill_per_second: 0 },
-        allow_any_mint_burn: false,
-        whitelist_addresses: Vec::new(&setup.env),
-    };
-    mock_set_supply_controller_auth(&setup, &setup.sc_manager, &setup.oft, &Some(config.clone()));
-    setup.sac_manager_client.set_supply_controller(&setup.sc_manager, &setup.oft, &Some(config.clone()));
-
-    // Add whitelisted address to the whitelist
-    mock_set_mint_whitelist_auth(&setup, &setup.sc_manager, &setup.oft, &whitelisted, true);
-    setup.sac_manager_client.set_mint_whitelist(&setup.sc_manager, &setup.oft, &whitelisted, &true);
-
-    // Mint to whitelisted address should succeed
-    mock_oft_mint_auth(&setup, &whitelisted, 500_i128);
-    setup.sac_manager_client.mint(&whitelisted, &500);
-    assert_eq!(setup.sac_client.balance(&whitelisted), 500);
-}
-
-// =========================================================================
-// Mint Error Cases (Supply Control)
-// =========================================================================
-
-#[test]
-fn test_mint_exceeds_rate_limit() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().with_supply_control_enabled().build();
-    let recipient = setup.generate_address();
-
-    let config = SupplyControllerConfig {
-        limit_config: LimitConfig { limit_capacity: 100, refill_per_second: 1 },
-        allow_any_mint_burn: true,
-        whitelist_addresses: Vec::new(&setup.env),
-    };
-    mock_set_supply_controller_auth(&setup, &setup.sc_manager, &setup.oft, &Some(config.clone()));
-    setup.sac_manager_client.set_supply_controller(&setup.sc_manager, &setup.oft, &Some(config.clone()));
-
-    // Try to mint more than limit - should fail
-    mock_oft_mint_auth(&setup, &recipient, 200_i128);
-    let result = setup.sac_manager_client.try_mint(&recipient, &200);
-    assert_eq!(result.err().unwrap().unwrap(), SupplyControlError::RateLimitExceeded.into());
-}
-
-#[test]
-fn test_mint_failure_does_not_change_remaining_amount() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().with_supply_control_enabled().build();
-    let recipient = setup.generate_address();
-
-    let config = SupplyControllerConfig {
-        limit_config: LimitConfig { limit_capacity: 100, refill_per_second: 1 },
-        allow_any_mint_burn: true,
-        whitelist_addresses: Vec::new(&setup.env),
-    };
-    mock_set_supply_controller_auth(&setup, &setup.sc_manager, &setup.oft, &Some(config.clone()));
-    setup.sac_manager_client.set_supply_controller(&setup.sc_manager, &setup.oft, &Some(config.clone()));
-
-    let remaining_before = setup.sac_manager_client.get_remaining_mint_amount(&setup.oft);
-    mock_oft_mint_auth(&setup, &recipient, 200_i128);
-    let result = setup.sac_manager_client.try_mint(&recipient, &200);
-    let remaining_after = setup.sac_manager_client.get_remaining_mint_amount(&setup.oft);
-
-    assert_eq!(result.err().unwrap().unwrap(), SupplyControlError::RateLimitExceeded.into());
-    assert_eq!(remaining_after, remaining_before);
-}
-
-#[test]
-fn test_mint_to_non_whitelisted_fails() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().with_supply_control_enabled().build();
-    let whitelisted = setup.generate_address();
-    let not_whitelisted = setup.generate_address();
-
-    let config = SupplyControllerConfig {
-        limit_config: LimitConfig { limit_capacity: 1_000, refill_per_second: 0 },
-        allow_any_mint_burn: false,
-        whitelist_addresses: Vec::new(&setup.env),
-    };
-    mock_set_supply_controller_auth(&setup, &setup.sc_manager, &setup.oft, &Some(config.clone()));
-    setup.sac_manager_client.set_supply_controller(&setup.sc_manager, &setup.oft, &Some(config.clone()));
-
-    // Add whitelisted address (not_whitelisted is NOT added)
-    mock_set_mint_whitelist_auth(&setup, &setup.sc_manager, &setup.oft, &whitelisted, true);
-    setup.sac_manager_client.set_mint_whitelist(&setup.sc_manager, &setup.oft, &whitelisted, &true);
-
-    // Mint to non-whitelisted address should fail
-    mock_oft_mint_auth(&setup, &not_whitelisted, 500_i128);
-    let result = setup.sac_manager_client.try_mint(&not_whitelisted, &500);
-    assert_eq!(result.err().unwrap().unwrap(), SupplyControlError::CannotMintToAddress.into());
-}
-
-#[test]
-fn test_mint_fails_when_oft_not_supply_controller() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().with_supply_control_enabled().build();
-    let recipient = setup.generate_address();
-
-    // OFT is NOT added as supply controller — should fail
-    mock_oft_mint_auth(&setup, &recipient, 500_i128);
-    let result = setup.sac_manager_client.try_mint(&recipient, &500);
-    assert_eq!(result.err().unwrap().unwrap(), SupplyControlError::NotFound.into());
-
-    // Non-controller should report zero remaining mint amount.
-    assert_eq!(setup.sac_manager_client.get_remaining_mint_amount(&recipient), 0);
-}
-
-// =========================================================================
-// get_remaining_mint_amount Tests
-// =========================================================================
-
-#[test]
-fn test_unlimited_rate_limit() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-
-    // refill_per_second == 0 means unlimited
-    let config = SupplyControllerConfig {
-        limit_config: LimitConfig { limit_capacity: 1_000, refill_per_second: 0 },
-        allow_any_mint_burn: true,
-        whitelist_addresses: Vec::new(&setup.env),
-    };
-    mock_set_supply_controller_auth(&setup, &setup.sc_manager, &setup.oft, &Some(config.clone()));
-    setup.sac_manager_client.set_supply_controller(&setup.sc_manager, &setup.oft, &Some(config.clone()));
-
-    let remaining = setup.sac_manager_client.get_remaining_mint_amount(&setup.oft);
-    assert_eq!(remaining, i128::MAX);
-}
-
-#[test]
-fn test_mint_exact_capacity_then_next_fails() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().with_supply_control_enabled().build();
-    let recipient = setup.generate_address();
-
-    let config = SupplyControllerConfig {
-        limit_config: LimitConfig { limit_capacity: 1_000, refill_per_second: 1 },
-        allow_any_mint_burn: true,
-        whitelist_addresses: Vec::new(&setup.env),
-    };
-    mock_set_supply_controller_auth(&setup, &setup.sc_manager, &setup.oft, &Some(config.clone()));
-    setup.sac_manager_client.set_supply_controller(&setup.sc_manager, &setup.oft, &Some(config.clone()));
-
-    mock_oft_mint_auth(&setup, &recipient, 1000_i128);
-    setup.sac_manager_client.mint(&recipient, &1000);
-    assert_eq!(setup.sac_manager_client.get_remaining_mint_amount(&setup.oft), 0);
-
-    mock_oft_mint_auth(&setup, &recipient, 1_i128);
-    let result = setup.sac_manager_client.try_mint(&recipient, &1);
-    assert_eq!(result.err().unwrap().unwrap(), SupplyControlError::RateLimitExceeded.into());
-}
-
-// =========================================================================
-// Mint Auth Tests
-// =========================================================================
-
-#[test]
-#[should_panic(expected = "Error(Auth, InvalidAction)")]
-fn test_mint_fails_without_oft_auth() {
-    // No mock_all_auths — the OFT address won't be authorized
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let recipient = setup.generate_address();
-
-    setup.sac_manager_client.mint(&recipient, &1000);
-}

package/contracts/sac-manager/src/tests/sac_manager/set_oft_address.rs

@@ -1,47 +0,0 @@
-//! set_oft_address Integration Tests
-
-use super::test_helper::mock_set_oft_address_auth;
-use crate::errors::SacManagerError;
-use crate::tests::test_helper::TestSetup;
-
-// =========================================================================
-// set_oft_address Error Cases
-// =========================================================================
-
-#[test]
-fn test_set_oft_address_by_owner_when_not_set() {
-    let setup = TestSetup::new().without_oft().build();
-    let new_oft = setup.generate_address();
-
-    let initial = setup.sac_manager_client.try_oft_address();
-    assert_eq!(initial.err().unwrap().unwrap(), SacManagerError::OftAddressNotSet.into());
-
-    mock_set_oft_address_auth(&setup, &new_oft);
-    setup.sac_manager_client.set_oft_address(&new_oft);
-    assert_eq!(setup.sac_manager_client.oft_address(), new_oft);
-}
-
-#[test]
-fn test_set_oft_address_fails_if_same_value() {
-    let setup = TestSetup::new().build();
-
-    // Setting the same OFT address should fail with SameValue
-    mock_set_oft_address_auth(&setup, &setup.oft);
-    let result = setup.sac_manager_client.try_set_oft_address(&setup.oft);
-    assert_eq!(result.err().unwrap().unwrap(), SacManagerError::SameValue.into());
-}
-
-// =========================================================================
-// set_oft_address Auth Tests
-// =========================================================================
-
-#[test]
-#[should_panic(expected = "Error(Auth, InvalidAction)")]
-fn test_set_oft_address_without_auth() {
-    // Build without mock_all_auths and without setting OFT (to test auth, not the once-only check)
-    let setup = TestSetup::new().without_oft().build();
-    let new_oft = setup.generate_address();
-
-    // Should panic because owner doesn't authorize the call
-    setup.sac_manager_client.set_oft_address(&new_oft);
-}

package/contracts/sac-manager/src/tests/sac_manager/test_helper.rs

@@ -1,75 +0,0 @@
-use crate::tests::test_helper::{mock_auth, TestSetup};
-use soroban_sdk::{
-    testutils::{MockAuth, MockAuthInvoke},
-    Address, IntoVal,
-};
-
-pub use crate::tests::test_helper::mock_set_supply_controller_auth;
-
-pub fn mock_set_mint_whitelist_auth(
-    setup: &TestSetup,
-    sender: &Address,
-    controller: &Address,
-    mint_addr: &Address,
-    active: bool,
-) {
-    mock_auth(&setup.env, &setup.sac_manager, sender, "set_mint_whitelist", (sender, controller, mint_addr, active));
-}
-
-pub fn mock_authorized_mint_auth(setup: &TestSetup, sender: &Address, recipient: &Address, amount: i128) {
-    mock_auth(&setup.env, &setup.sac_manager, sender, "authorized_mint", (sender, recipient, amount));
-}
-
-pub fn mock_clawback_auth(setup: &TestSetup, sender: &Address, from: &Address, amount: i128) {
-    mock_auth(&setup.env, &setup.sac_manager, sender, "clawback", (sender, from, amount));
-}
-
-pub fn mock_burn_auth(setup: &TestSetup, from: &Address, amount: i128) {
-    let sac_burn_sub_invoke = MockAuthInvoke {
-        contract: &setup.sac,
-        fn_name: "burn",
-        args: (from, amount).into_val(&setup.env),
-        sub_invokes: &[],
-    };
-
-    let from_sub_invokes = [sac_burn_sub_invoke];
-
-    setup.env.mock_auths(&[
-        // `from` authorizes sac_manager.burn → nested sac.burn(from, amount)
-        MockAuth {
-            address: from,
-            invoke: &MockAuthInvoke {
-                contract: &setup.sac_manager,
-                fn_name: "burn",
-                args: (from, amount).into_val(&setup.env),
-                sub_invokes: &from_sub_invokes,
-            },
-        },
-        // OFT also authorizes sac_manager.burn (no sub-invokes needed)
-        MockAuth {
-            address: &setup.oft,
-            invoke: &MockAuthInvoke {
-                contract: &setup.sac_manager,
-                fn_name: "burn",
-                args: (from, amount).into_val(&setup.env),
-                sub_invokes: &[],
-            },
-        },
-    ]);
-}
-
-pub fn mock_set_authorized_auth(setup: &TestSetup, user: &Address, authorize: bool) {
-    mock_auth(&setup.env, &setup.sac_manager, &setup.owner, "set_authorized", (user, authorize));
-}
-
-pub fn mock_release_sac_admin_auth(setup: &TestSetup, new_admin: &Address) {
-    mock_auth(&setup.env, &setup.sac_manager, &setup.owner, "release_sac_admin", (new_admin,));
-}
-
-pub fn mock_set_oft_address_auth(setup: &TestSetup, new_oft: &Address) {
-    mock_auth(&setup.env, &setup.sac_manager, &setup.owner, "set_oft_address", (new_oft,));
-}
-
-pub fn mock_sac_owner_mint_auth(setup: &TestSetup, recipient: &Address, amount: i128) {
-    mock_auth(&setup.env, &setup.sac, &setup.owner, "mint", (recipient, amount));
-}

package/contracts/sac-manager/src/tests/sac_manager/view_functions.rs

@@ -1,60 +0,0 @@
-//! View Functions Integration Tests
-
-use crate::errors::SacManagerError;
-use crate::tests::test_helper::TestSetup;
-
-// =========================================================================
-// Core View Functions
-// =========================================================================
-
-#[test]
-fn test_underlying_sac() {
-    let setup = TestSetup::new().build();
-    assert_eq!(setup.sac_manager_client.underlying_sac(), setup.sac);
-}
-
-#[test]
-fn test_oft_address() {
-    let setup = TestSetup::new().build();
-    assert_eq!(setup.sac_manager_client.oft_address(), setup.oft);
-}
-
-#[test]
-fn test_oft_address_fails_when_not_set() {
-    let setup = TestSetup::new().without_oft().build();
-
-    let result = setup.sac_manager_client.try_oft_address();
-    assert_eq!(result.err().unwrap().unwrap(), SacManagerError::OftAddressNotSet.into());
-}
-
-// =========================================================================
-// Redistribution Settings
-// =========================================================================
-
-#[test]
-fn test_redistribution_disabled_by_default() {
-    let setup = TestSetup::new().build();
-    assert!(!setup.sac_manager_client.redistribution_enabled());
-}
-
-#[test]
-fn test_redistribution_enabled_at_construction() {
-    let setup: TestSetup<'_> = TestSetup::new().with_redistribution_enabled().build();
-    assert!(setup.sac_manager_client.redistribution_enabled());
-}
-
-// =========================================================================
-// Supply Control Settings
-// =========================================================================
-
-#[test]
-fn test_supply_control_disabled_by_default() {
-    let setup = TestSetup::new().build();
-    assert!(!setup.sac_manager_client.supply_control_enabled());
-}
-
-#[test]
-fn test_supply_control_enabled_at_construction() {
-    let setup = TestSetup::new().with_supply_control_enabled().build();
-    assert!(setup.sac_manager_client.supply_control_enabled());
-}

package/contracts/sac-manager/src/tests/supply_control/enumerable_set.rs

@@ -1,256 +0,0 @@
-//! Supply Controller Add/Remove & Enumeration Edge-Case Tests
-//!
-//! Focuses on add/remove controller mechanics, re-adding after
-//! removal, removing all controllers, and verifying initial rate-limit state.
-
-use super::test_helper::mock_set_supply_controller_auth;
-use crate::extensions::supply_control::{LimitConfig, SupplyControlClient, SupplyControlError, SupplyControllerConfig};
-use crate::tests::test_helper::TestSetup;
-use soroban_sdk::{Env, Vec};
-
-// =========================================================================
-// Helpers
-// =========================================================================
-
-fn default_config(env: &Env) -> SupplyControllerConfig {
-    SupplyControllerConfig {
-        limit_config: LimitConfig { limit_capacity: 1_000, refill_per_second: 10 },
-        allow_any_mint_burn: true,
-        whitelist_addresses: Vec::new(env),
-    }
-}
-
-fn add(setup: &TestSetup, sc_client: &SupplyControlClient, controller: &soroban_sdk::Address) {
-    let config = default_config(&setup.env);
-    mock_set_supply_controller_auth(setup, &setup.sc_manager, controller, &Some(config.clone()));
-    sc_client.set_supply_controller(&setup.sc_manager, controller, &Some(config));
-}
-
-fn remove(setup: &TestSetup, sc_client: &SupplyControlClient, controller: &soroban_sdk::Address) {
-    mock_set_supply_controller_auth(setup, &setup.sc_manager, controller, &None);
-    sc_client.set_supply_controller(&setup.sc_manager, controller, &None);
-}
-
-// =========================================================================
-// Initial Rate-Limit State
-// =========================================================================
-
-#[test]
-fn test_add_supply_controller_initial_rate_limit_state() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let controller = setup.generate_address();
-    let sc_client = SupplyControlClient::new(&setup.env, &setup.sac_manager);
-
-    let config = SupplyControllerConfig {
-        limit_config: LimitConfig { limit_capacity: 5_000, refill_per_second: 50 },
-        allow_any_mint_burn: false,
-        whitelist_addresses: Vec::new(&setup.env),
-    };
-    mock_set_supply_controller_auth(&setup, &setup.sc_manager, &controller, &Some(config.clone()));
-    sc_client.set_supply_controller(&setup.sc_manager, &controller, &Some(config.clone()));
-
-    // remaining_mint_amount should equal limit_capacity at t=0
-    let remaining = sc_client.get_remaining_mint_amount(&controller);
-    assert_eq!(remaining, 5_000);
-
-    // Config should match what we set
-    let stored = sc_client.get_supply_controller_config(&controller).unwrap();
-    assert_eq!(stored.limit_config.limit_capacity, 5_000);
-    assert_eq!(stored.limit_config.refill_per_second, 50);
-    assert_eq!(stored.allow_any_mint_burn, false);
-}
-
-// =========================================================================
-// Re-add After Removal
-// =========================================================================
-
-#[test]
-fn test_readd_supply_controller_after_removal() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let controller = setup.generate_address();
-    let sc_client = SupplyControlClient::new(&setup.env, &setup.sac_manager);
-
-    // Add, remove, then add again — should succeed
-    add(&setup, &sc_client, &controller);
-    assert!(sc_client.get_supply_controller_config(&controller).is_some());
-
-    remove(&setup, &sc_client, &controller);
-    assert!(sc_client.get_supply_controller_config(&controller).is_none());
-
-    add(&setup, &sc_client, &controller);
-    assert!(sc_client.get_supply_controller_config(&controller).is_some());
-}
-
-// =========================================================================
-// Remove From Middle / First / Last
-// =========================================================================
-
-#[test]
-fn test_remove_middle_controller() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let sc_client = SupplyControlClient::new(&setup.env, &setup.sac_manager);
-
-    let c1 = setup.generate_address();
-    let c2 = setup.generate_address();
-    let c3 = setup.generate_address();
-
-    add(&setup, &sc_client, &c1);
-    add(&setup, &sc_client, &c2);
-    add(&setup, &sc_client, &c3);
-
-    // Remove the middle controller (c2).
-    remove(&setup, &sc_client, &c2);
-
-    let controllers = sc_client.get_supply_controllers();
-    assert_eq!(controllers.len(), 2);
-    assert!(controllers.contains(&c1));
-    assert!(controllers.contains(&c3));
-    assert!(!controllers.contains(&c2));
-}
-
-#[test]
-fn test_remove_first_controller() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let sc_client = SupplyControlClient::new(&setup.env, &setup.sac_manager);
-
-    let c1 = setup.generate_address();
-    let c2 = setup.generate_address();
-    let c3 = setup.generate_address();
-
-    add(&setup, &sc_client, &c1);
-    add(&setup, &sc_client, &c2);
-    add(&setup, &sc_client, &c3);
-
-    // Remove first controller (c1).
-    remove(&setup, &sc_client, &c1);
-
-    let controllers = sc_client.get_supply_controllers();
-    assert_eq!(controllers.len(), 2);
-    assert!(controllers.contains(&c2));
-    assert!(controllers.contains(&c3));
-    assert!(!controllers.contains(&c1));
-}
-
-#[test]
-fn test_remove_last_controller() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let sc_client = SupplyControlClient::new(&setup.env, &setup.sac_manager);
-
-    let c1 = setup.generate_address();
-    let c2 = setup.generate_address();
-    let c3 = setup.generate_address();
-
-    add(&setup, &sc_client, &c1);
-    add(&setup, &sc_client, &c2);
-    add(&setup, &sc_client, &c3);
-
-    // Remove last controller.
-    remove(&setup, &sc_client, &c3);
-
-    let controllers = sc_client.get_supply_controllers();
-    assert_eq!(controllers.len(), 2);
-    assert!(controllers.contains(&c1));
-    assert!(controllers.contains(&c2));
-}
-
-// =========================================================================
-// Remove All Controllers
-// =========================================================================
-
-#[test]
-fn test_remove_all_controllers() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let sc_client = SupplyControlClient::new(&setup.env, &setup.sac_manager);
-
-    let c1 = setup.generate_address();
-    let c2 = setup.generate_address();
-
-    add(&setup, &sc_client, &c1);
-    add(&setup, &sc_client, &c2);
-
-    remove(&setup, &sc_client, &c1);
-    remove(&setup, &sc_client, &c2);
-
-    let controllers = sc_client.get_supply_controllers();
-    assert_eq!(controllers.len(), 0);
-}
-
-#[test]
-fn test_remove_single_controller() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let sc_client = SupplyControlClient::new(&setup.env, &setup.sac_manager);
-
-    let c1 = setup.generate_address();
-    add(&setup, &sc_client, &c1);
-
-    remove(&setup, &sc_client, &c1);
-
-    let controllers = sc_client.get_supply_controllers();
-    assert_eq!(controllers.len(), 0);
-    assert!(sc_client.get_supply_controller_config(&c1).is_none());
-}
-
-// =========================================================================
-// Get All Controllers
-// =========================================================================
-
-#[test]
-fn test_get_supply_controllers_empty() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let sc_client = SupplyControlClient::new(&setup.env, &setup.sac_manager);
-
-    let controllers = sc_client.get_supply_controllers();
-    assert_eq!(controllers.len(), 0);
-}
-
-// =========================================================================
-// Multiple Add/Remove Cycles
-// =========================================================================
-
-#[test]
-fn test_multiple_add_remove_cycles() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let sc_client = SupplyControlClient::new(&setup.env, &setup.sac_manager);
-
-    let c1 = setup.generate_address();
-    let c2 = setup.generate_address();
-    let c3 = setup.generate_address();
-
-    // Add all three
-    add(&setup, &sc_client, &c1);
-    add(&setup, &sc_client, &c2);
-    add(&setup, &sc_client, &c3);
-
-    // Remove middle, then re-add it
-    remove(&setup, &sc_client, &c2);
-    add(&setup, &sc_client, &c2);
-
-    let controllers = sc_client.get_supply_controllers();
-    assert_eq!(controllers.len(), 3);
-    assert!(controllers.contains(&c1));
-    assert!(controllers.contains(&c2));
-    assert!(controllers.contains(&c3));
-
-    // Remove first two, verify only c3 remains
-    remove(&setup, &sc_client, &c1);
-    remove(&setup, &sc_client, &c2);
-
-    let controllers = sc_client.get_supply_controllers();
-    assert_eq!(controllers.len(), 1);
-    assert!(controllers.contains(&c3));
-}
-
-#[test]
-fn test_remove_already_removed_fails() {
-    let setup = TestSetup::new().with_manager_as_sac_admin().build();
-    let sc_client = SupplyControlClient::new(&setup.env, &setup.sac_manager);
-
-    let c1 = setup.generate_address();
-    add(&setup, &sc_client, &c1);
-    remove(&setup, &sc_client, &c1);
-
-    // Removing again should fail with NotFound
-    mock_set_supply_controller_auth(&setup, &setup.sc_manager, &c1, &None);
-    let result = sc_client.try_set_supply_controller(&setup.sc_manager, &c1, &None);
-    assert_eq!(result.err().unwrap().unwrap(), SupplyControlError::NotFound.into());
-}