Convert tokio to multithreaded

Author: grod220

.github/actions/setup/action.yml

@@ -86,15 +86,6 @@ runs:
         version: ${{ env.SOLANA_VERSION }}
         cache: true
 
-    - name: Cache APT packages for CLI dependencies
-      if: ${{ inputs.cli == 'true' }}
-      uses: actions/cache@v4
-      with:
-        path: /var/cache/apt/archives
-        key: ${{ runner.os }}-apt-cache-${{ hashFiles('.github/actions/setup/action.yml') }}
-        restore-keys: |
-          ${{ runner.os }}-apt-cache-
-
     - name: Install CLI dependencies
       if: ${{ inputs.cli == 'true' }}
       shell: bash

clients/cli/tests/test_close_stuck_escrow.rs

@@ -19,7 +19,7 @@ use {
 
 mod helpers;
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_only_token_2022_allowed() {
     let env = setup_test_env().await;
@@ -46,7 +46,7 @@ async fn test_only_token_2022_allowed() {
     assert!(stderr.contains("CloseStuckEscrow only works with spl-token-2022 unwrapped mints"));
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_create_mint_close_stuck_escrow_fails() {
     let env = setup_test_env().await;
@@ -86,7 +86,7 @@ async fn test_create_mint_close_stuck_escrow_fails() {
     assert!(!output.status.success());
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_successful_close() {
     let env = setup_test_env().await;

clients/cli/tests/test_create_escrow_account.rs

@@ -59,7 +59,7 @@ async fn assert_escrow_creation(
     assert_eq!(account_state.base.amount, 0.into());
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_create_ata_escrow_account_for_spl_token_mint() {
     let env = setup_test_env().await;
@@ -99,7 +99,7 @@ async fn test_create_ata_escrow_account_for_spl_token_mint() {
     .await;
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_create_ata_escrow_account_for_token2022_mint() {
     let env = setup_test_env().await;
@@ -139,7 +139,7 @@ async fn test_create_ata_escrow_account_for_token2022_mint() {
     .await;
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_create_escrow_account_with_signer() {
     let env = setup_test_env().await;
@@ -192,7 +192,7 @@ async fn test_create_escrow_account_with_signer() {
     .await;
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_create_escrow_account_signer_idempotent() {
     let env = setup_test_env().await;
@@ -241,7 +241,7 @@ async fn test_create_escrow_account_signer_idempotent() {
         .contains(format!("Escrow account {} already exists", derived_escrow_address).as_str()));
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_create_escrow_account_ata_idempotent() {
     let env = setup_test_env().await;
@@ -284,7 +284,7 @@ async fn test_create_escrow_account_ata_idempotent() {
     assert!(stderr_c.contains("already exists"));
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_create_escrow_account_with_wrong_mint_owner() {
     let env = setup_test_env().await;
@@ -310,7 +310,7 @@ async fn test_create_escrow_account_with_wrong_mint_owner() {
     assert!(stderr.contains("is not owned by a token program"));
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_create_escrow_account_with_wrong_account_type() {
     let env = setup_test_env().await;

clients/cli/tests/test_create_mint.rs

@@ -11,7 +11,7 @@ use {
 
 mod helpers;
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_create_mint() {
     let env = setup_test_env().await;

clients/cli/tests/test_pdas.rs

@@ -10,7 +10,7 @@ use {
 
 pub mod helpers;
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_pdas() {
     let env = setup_test_env().await;

clients/cli/tests/test_unwrap.rs

@@ -164,7 +164,7 @@ async fn assert_unwrap_result(
     );
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_unwrap_single_signer_with_defaults() {
     let env = setup_test_env().await;
@@ -201,7 +201,7 @@ async fn test_unwrap_single_signer_with_defaults() {
     .await;
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_unwrap_single_signer_with_optional_flags() {
     let env = setup_test_env().await;
@@ -264,7 +264,7 @@ async fn test_unwrap_single_signer_with_optional_flags() {
     .await;
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_unwrap_fail_invalid_wrapped_token_program() {
     let env = setup_test_env().await;
@@ -301,7 +301,7 @@ async fn test_unwrap_fail_invalid_wrapped_token_program() {
     )));
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_unwrap_fail_mismatched_unwrapped_mint() {
     let env = setup_test_env().await;
@@ -338,7 +338,7 @@ async fn test_unwrap_fail_mismatched_unwrapped_mint() {
     )));
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_unwrap_fail_invalid_unwrapped_token_program() {
     let env = setup_test_env().await;
@@ -376,7 +376,7 @@ async fn test_unwrap_fail_invalid_unwrapped_token_program() {
     )));
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_unwrap_with_multisig() {
     let mut env = setup_test_env().await;

clients/cli/tests/test_wrap.rs

@@ -17,7 +17,7 @@ use {
 
 mod helpers;
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_wrap_single_signer_with_defaults() {
     let env = setup_test_env().await;
@@ -93,7 +93,7 @@ async fn test_wrap_single_signer_with_defaults() {
     .await;
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_wrap_single_signer_with_optional_flags() {
     let env = setup_test_env().await;
@@ -222,7 +222,7 @@ async fn assert_result(
     assert_eq!(u64::from(wrapped_token_state.base.amount), wrap_amount);
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_wrap_with_multisig() {
     let mut env = setup_test_env().await;