fix: run async runtime when dropping TestContext in BlockingTestContext

integration_tests/src/lib.rs

@@ -321,15 +321,22 @@ impl Drop for TestContext {
 
 /// A test context to be used in normal #[test] tests
 pub struct BlockingTestContext {
-    pub ctx: TestContext,
-    pub runtime: tokio::runtime::Runtime,
+    ctx: Option<TestContext>,
+    runtime: tokio::runtime::Runtime,
 }
 
 impl BlockingTestContext {
     pub fn new() -> Result<Self> {
         let runtime = tokio::runtime::Runtime::new().unwrap();
         let ctx = runtime.block_on(TestContext::new())?;
-        Ok(Self { ctx, runtime })
+        Ok(Self {
+            ctx: Some(ctx),
+            runtime,
+        })
+    }
+
+    pub fn ctx(&self) -> &TestContext {
+        self.ctx.as_ref().expect("TestContext is set")
     }
 }
 
@@ -370,6 +377,19 @@ impl TestContextBuilder {
     }
 }
 
+impl Drop for BlockingTestContext {
+    fn drop(&mut self) {
+        let Self { ctx, runtime } = self;
+
+        // Ensure async cleanup of TestContext by blocking on its drop in the runtime.
+        runtime.block_on(async {
+            if let Some(ctx) = ctx.take() {
+                drop(ctx);
+            }
+        })
+    }
+}
+
 pub fn format_public_account_id(account_id: AccountId) -> String {
     format!("Public/{account_id}")
 }

integration_tests/tests/wallet_ffi.rs

@@ -102,8 +102,8 @@ fn new_wallet_ffi_with_test_context_config(ctx: &BlockingTestContext) -> *mut Wa
     let tempdir = tempfile::tempdir().unwrap();
     let config_path = tempdir.path().join("wallet_config.json");
     let storage_path = tempdir.path().join("storage.json");
-    let mut config = ctx.ctx.wallet().config().to_owned();
-    if let Some(config_overrides) = ctx.ctx.wallet().config_overrides().clone() {
+    let mut config = ctx.ctx().wallet().config().to_owned();
+    if let Some(config_overrides) = ctx.ctx().wallet().config_overrides().clone() {
         config.apply_overrides(config_overrides);
     }
     let mut file = std::fs::OpenOptions::new()
@@ -119,7 +119,7 @@ fn new_wallet_ffi_with_test_context_config(ctx: &BlockingTestContext) -> *mut Wa
 
     let config_path = CString::new(config_path.to_str().unwrap()).unwrap();
     let storage_path = CString::new(storage_path.to_str().unwrap()).unwrap();
-    let password = CString::new(ctx.ctx.wallet_password()).unwrap();
+    let password = CString::new(ctx.ctx().wallet_password()).unwrap();
 
     unsafe {
         wallet_ffi_create_new(
@@ -325,7 +325,7 @@ fn test_wallet_ffi_list_accounts() {
 #[test]
 fn test_wallet_ffi_get_balance_public() -> Result<()> {
     let ctx = BlockingTestContext::new()?;
-    let account_id: AccountId = ctx.ctx.existing_public_accounts()[0];
+    let account_id: AccountId = ctx.ctx().existing_public_accounts()[0];
     let wallet_ffi_handle = new_wallet_ffi_with_test_context_config(&ctx);
 
     let balance = unsafe {
@@ -353,7 +353,7 @@ fn test_wallet_ffi_get_balance_public() -> Result<()> {
 #[test]
 fn test_wallet_ffi_get_account_public() -> Result<()> {
     let ctx = BlockingTestContext::new()?;
-    let account_id: AccountId = ctx.ctx.existing_public_accounts()[0];
+    let account_id: AccountId = ctx.ctx().existing_public_accounts()[0];
     let wallet_ffi_handle = new_wallet_ffi_with_test_context_config(&ctx);
     let mut out_account = FfiAccount::default();
 
@@ -388,7 +388,7 @@ fn test_wallet_ffi_get_account_public() -> Result<()> {
 #[test]
 fn test_wallet_ffi_get_public_account_keys() -> Result<()> {
     let ctx = BlockingTestContext::new()?;
-    let account_id: AccountId = ctx.ctx.existing_public_accounts()[0];
+    let account_id: AccountId = ctx.ctx().existing_public_accounts()[0];
     let wallet_ffi_handle = new_wallet_ffi_with_test_context_config(&ctx);
     let mut out_key = FfiPublicAccountKey::default();
 
@@ -404,7 +404,7 @@ fn test_wallet_ffi_get_public_account_keys() -> Result<()> {
 
     let expected_key = {
         let private_key = ctx
-            .ctx
+            .ctx()
             .wallet()
             .get_account_public_signing_key(account_id)
             .unwrap();
@@ -425,7 +425,7 @@ fn test_wallet_ffi_get_public_account_keys() -> Result<()> {
 #[test]
 fn test_wallet_ffi_get_private_account_keys() -> Result<()> {
     let ctx = BlockingTestContext::new()?;
-    let account_id: AccountId = ctx.ctx.existing_public_accounts()[0];
+    let account_id: AccountId = ctx.ctx().existing_public_accounts()[0];
     let wallet_ffi_handle = new_wallet_ffi_with_test_context_config(&ctx);
     let mut keys = FfiPrivateAccountKeys::default();
 
@@ -439,7 +439,7 @@ fn test_wallet_ffi_get_private_account_keys() -> Result<()> {
     };
 
     let key_chain = &ctx
-        .ctx
+        .ctx()
         .wallet()
         .storage()
         .user_data
@@ -567,8 +567,8 @@ fn test_wallet_ffi_init_public_account_auth_transfer() -> Result<()> {
 fn test_wallet_ffi_transfer_public() -> Result<()> {
     let ctx = BlockingTestContext::new().unwrap();
     let wallet_ffi_handle = new_wallet_ffi_with_test_context_config(&ctx);
-    let from: FfiBytes32 = (&ctx.ctx.existing_public_accounts()[0]).into();
-    let to: FfiBytes32 = (&ctx.ctx.existing_public_accounts()[1]).into();
+    let from: FfiBytes32 = (&ctx.ctx().existing_public_accounts()[0]).into();
+    let to: FfiBytes32 = (&ctx.ctx().existing_public_accounts()[1]).into();
     let amount: [u8; 16] = 100u128.to_le_bytes();
 
     let mut transfer_result = FfiTransferResult::default();