refactor: update mock auth macro to support non root auth

contracts/interchain-token-service/tests/deploy_remote_canonical_token.rs

@@ -1,6 +1,8 @@
 mod utils;
 
-use axelar_soroban_std::{address::AddressExt, auth_invocation, events};
+use axelar_soroban_std::{
+    address::AddressExt, auth_invocation, build_mock_auth, build_mock_invoke, events,
+};
 use interchain_token_service::{
     event::InterchainTokenDeploymentStartedEvent,
     types::{DeployInterchainToken, HubMessage, Message, TokenManagerType},
@@ -13,7 +15,7 @@ use utils::{setup_env, setup_gas_token};
 
 #[test]
 fn deploy_remote_canonical_token_succeeds() {
-    let (env, client, _, gas_service, _) = setup_env();
+    let (env, client, gateway, gas_service, _) = setup_env();
     let spender = Address::generate(&env);
     let gas_token = setup_gas_token(&env, &spender);
     let asset = &env.register_stellar_asset_contract_v2(Address::generate(&env));
@@ -62,9 +64,42 @@ fn deploy_remote_canonical_token_succeeds() {
     }
     .abi_encode(&env);
 
-    let deployed_token_id = client
-        .mock_all_auths_allowing_non_root_auth()
-        .deploy_remote_canonical_token(&token_address, &destination_chain, &spender, &gas_token);
+    let transfer_token_auth = build_mock_invoke!(
+        env,
+        gas_token.transfer(spender, gas_service.address, gas_token.amount),
+        &[]
+    );
+
+    let pay_gas_auth = build_mock_auth!(
+        env,
+        spender,
+        gas_service.pay_gas(
+            client.address,
+            its_hub_chain,
+            its_hub_address,
+            payload,
+            spender,
+            gas_token,
+            Bytes::new(&env)
+        ),
+        &[transfer_token_auth]
+    );
+
+    let call_contract_auth = build_mock_auth!(
+        env,
+        spender,
+        gateway.call_contract(client.address, its_hub_chain, its_hub_address, payload),
+        &[]
+    );
+
+    env.mock_auths(&[pay_gas_auth, call_contract_auth]);
+
+    let deployed_token_id = client.deploy_remote_canonical_token(
+        &token_address,
+        &destination_chain,
+        &spender,
+        &gas_token,
+    );
     assert_eq!(expected_id, deployed_token_id);
 
     goldie::assert!(events::fmt_emitted_event_at_idx::<

packages/axelar-soroban-std/src/testutils.rs

@@ -140,3 +140,34 @@ macro_rules! auth_invocation {
         )]
     }};
 }
+
+#[macro_export]
+macro_rules! build_mock_invoke {
+    (
+        $env:expr,
+        $client:ident . $method:ident ( $($arg:expr),* $(,)? ),
+        $sub_invokes:expr
+    ) => {{
+        soroban_sdk::testutils::MockAuthInvoke {
+            contract: &$client.address,
+            fn_name: &stringify!($method),
+            args: ($($arg.clone(),)*).into_val(&$env),
+            sub_invokes: $sub_invokes,
+        }
+    }};
+}
+
+#[macro_export]
+macro_rules! build_mock_auth {
+    (
+        $env:expr,
+        $caller:expr,
+        $client:ident . $method:ident ( $($arg:expr),* $(,)? ),
+        $sub_invokes:expr
+    ) => {{
+        soroban_sdk::testutils::MockAuth {
+            address: &$caller,
+            invoke: &build_mock_invoke!($env, $client . $method ( $($arg),* ), $sub_invokes),
+        }
+    }};
+}