address comments

Author: anodar

crates/contract/src/api/foreign_chain_support.rs

@@ -21,9 +21,8 @@ impl MpcContract {
     /// set); panics in [`NotInitialized`](ProtocolContractState::NotInitialized) or when the caller is not a participant. Entries for
     /// accounts that are no longer participants are pruned after resharing by
     /// [`Self::clean_foreign_chain_data`].
-    #[deprecated(
-        note = "superseded by register_foreign_chains_config; feeds only the legacy get_supported_foreign_chains view (https://github.com/near/mpc/issues/3434)"
-    )]
+    #[deprecated(note = "TODO(#3630): drop this. This is superseded by
+        register_foreign_chains_config, and feeds only the legacy get_supported_foreign_chains")]
     #[handle_result]
     pub fn register_foreign_chain_support(
         &mut self,
@@ -114,7 +113,7 @@ impl MpcContract {
     }
 
     #[deprecated(
-        note = "https://github.com/near/mpc/issues/3079. Nodes register via register_foreign_chains_config instead"
+        note = "TODO(#3630): drop this. Nodes register via register_foreign_chains_config instead"
     )]
     #[expect(deprecated)]
     #[handle_result]
@@ -243,7 +242,7 @@ impl MpcContract {
     }
 
     #[deprecated(
-        note = "superseded by get_available_foreign_chains, which gates verify_foreign_transaction (https://github.com/near/mpc/issues/3434)"
+        note = "TODO(#3630): drop this. It's superseded by get_available_foreign_chains, which gates verify_foreign_transaction"
     )]
     pub fn get_supported_foreign_chains(&self) -> dtos::SupportedForeignChains {
         let active_participant_account_ids = self
@@ -289,9 +288,7 @@ impl MpcContract {
             .into()
     }
 
-    #[deprecated(
-        note = "superseded by get_foreign_chains_configs (https://github.com/near/mpc/issues/3434)"
-    )]
+    #[deprecated(note = "TODO(#3630): drop this, it's deprecated.")]
     pub fn get_foreign_chain_support_by_node(&self) -> dtos::ForeignChainSupportByNode {
         self.node_foreign_chain_support.to_dto()
     }

crates/contract/tests/sandbox/common.rs

@@ -8,7 +8,7 @@ use crate::sandbox::utils::{
     },
     shared_key_utils::{DomainKey, make_key_for_domain},
     sign_utils::{PendingSignRequest, make_and_submit_requests},
-    transactions::CallMpcContract,
+    transactions::{CallMpcContract, execute_async_handle_calls},
 };
 use digest::Digest;
 use dtos::ProtocolContractState;
@@ -676,38 +676,24 @@ pub async fn make_foreign_chain_available(
         "need at least {threshold} accounts to whitelist a chain, got {}",
         accounts.len()
     );
-    let votes = accounts.iter().take(threshold).map(|account| {
+    execute_async_handle_calls(&accounts[..threshold], contract, |handle| {
         let batch = batch.clone();
-        async move {
-            let result = account
-                .call_mpc(contract.id())
-                .vote_update_foreign_chain_providers(batch)
-                .await
-                .unwrap()
-                .into_result();
-            assert!(result.is_ok(), "whitelist vote should succeed: {result:?}");
-        }
-    });
-    futures::future::join_all(votes).await;
+        async move { handle.vote_update_foreign_chain_providers(batch).await }
+    })
+    .await
+    .expect("whitelist vote should succeed");
 
-    let foreign_chains_config: dtos::ForeignChainsConfig = BTreeSet::from([chain]).into();
-    let registrations = accounts.iter().map(|account| {
+    execute_async_handle_calls(accounts, contract, |handle| {
+        let foreign_chains_config: dtos::ForeignChainsConfig = BTreeSet::from([chain]).into();
         let foreign_chains_config = foreign_chains_config.clone();
         async move {
-            let result = account
-                .call_mpc(contract.id())
+            handle
                 .register_foreign_chains_config(foreign_chains_config)
                 .await
-                .unwrap()
-                .into_result();
-            assert!(
-                result.is_ok(),
-                "{} should succeed: {result:?}",
-                method_names::REGISTER_FOREIGN_CHAINS_CONFIG
-            );
         }
-    });
-    futures::future::join_all(registrations).await;
+    })
+    .await
+    .expect("foreign chains config registration should succeed");
 }
 
 /// Poll the contract until a pending foreign-tx request appears (or panic after timeout).