Upgraded tests

examples/sbpf-asm-counter/Cargo.toml

@@ -5,11 +5,9 @@ edition = "2021"
 
 [workspace]
 
-[dependencies]
-
 [dev-dependencies]
-mollusk-svm = "0.4.1"
-solana-sdk = "2.2.1"
-
-[features]
-test-sbf = []
+mollusk-svm = "0.7.0"
+solana-account = "3.0.0"
+solana-address = "1.0.0"
+solana-program-error = "3.0.0"
+solana-native-token = "3.0.0"

examples/sbpf-asm-counter/src/lib.rs

@@ -2,20 +2,20 @@
 mod tests {
     use mollusk_svm::program;
     use mollusk_svm::{result::Check, Mollusk};
-    use solana_sdk::account::Account;
-    use solana_sdk::instruction::{AccountMeta, Instruction};
-    use solana_sdk::native_token::LAMPORTS_PER_SOL;
-    use solana_sdk::pubkey::Pubkey;
+    use solana_account::Account;
+    use solana_instruction::{AccountMeta, Instruction};
+    use solana_native_token::LAMPORTS_PER_SOL;
+    use solana_address::Address;
 
     const BASE_LAMPORTS: u64 = 10 * LAMPORTS_PER_SOL;
     const COUNTER_SIZE: usize = 9;
 
-    pub fn get_program_id() -> Pubkey {
+    pub fn get_program_id() -> Address {
         let program_id_keypair_bytes = std::fs::read("deploy/sbpf-asm-counter-keypair.json")
             .unwrap()[..32]
             .try_into()
             .expect("slice with incorrect length");
-        Pubkey::new_from_array(program_id_keypair_bytes)
+        Address::new_from_array(program_id_keypair_bytes)
     }
 
     #[test]
@@ -24,11 +24,11 @@ mod tests {
         let mollusk = Mollusk::new(&program_id, "deploy/sbpf-asm-counter");
         let (system_program, system_account) = program::keyed_account_for_system_program();
 
-        let owner_pubkey = Pubkey::new_unique();
+        let owner_pubkey = Address::new_unique();
         let owner_account = Account::new(BASE_LAMPORTS, 0, &system_program);
 
         let (counter_pda, counter_bump) =
-            Pubkey::find_program_address(&[b"counter", &owner_pubkey.to_bytes()], &program_id);
+            Address::find_program_address(&[b"counter", &owner_pubkey.to_bytes()], &program_id);
         let counter_account = Account::new(0, 0, &system_program);
 
         let mut instruction_data = vec![0]; // 0 -> Initialize
@@ -75,11 +75,11 @@ mod tests {
         let mollusk = Mollusk::new(&program_id, "deploy/sbpf-asm-counter");
         let (system_program, system_account) = program::keyed_account_for_system_program();
 
-        let owner_pubkey = Pubkey::new_unique();
+        let owner_pubkey = Address::new_unique();
         let owner_account = Account::new(BASE_LAMPORTS, 0, &system_program);
 
         let (counter_pda, counter_bump) =
-            Pubkey::find_program_address(&[b"counter", &owner_pubkey.to_bytes()], &program_id);
+            Address::find_program_address(&[b"counter", &owner_pubkey.to_bytes()], &program_id);
         let mut counter_account = Account::new(
             mollusk.sysvars.rent.minimum_balance(COUNTER_SIZE),
             COUNTER_SIZE,

examples/sbpf-asm-cpi/Cargo.toml

@@ -5,11 +5,10 @@ edition = "2021"
 
 [workspace]
 
-[dependencies]
-
 [dev-dependencies]
-mollusk-svm = "0.4.1"
-solana-sdk = "2.2.1"
-
-[features]
-test-sbf = []
+mollusk-svm = "0.7.0"
+solana-account = "3.0.0"
+solana-address = "1.0.0"
+solana-instruction = "3.0.0"
+solana-program-error = "3.0.0"
+solana-native-token = "3.0.0"

examples/sbpf-asm-cpi/src/lib.rs

@@ -2,22 +2,22 @@
 mod tests {
     use mollusk_svm::program;
     use mollusk_svm::{result::Check, Mollusk};
-    use solana_sdk::account::Account;
-    use solana_sdk::instruction::{AccountMeta, Instruction};
-    use solana_sdk::native_token::LAMPORTS_PER_SOL;
-    use solana_sdk::program_error::ProgramError;
-    use solana_sdk::pubkey::Pubkey;
+    use solana_account::Account;
+    use solana_instruction::{AccountMeta, Instruction};
+    use solana_native_token::LAMPORTS_PER_SOL;
+    use solana_program_error::ProgramError;
+    use solana_address::Address;
 
     const BASE_LAMPORTS: u64 = 10 * LAMPORTS_PER_SOL;
     const DEPOSIT_AMOUNT: u64 = 1;
     const DEPOSIT_LAMPORTS: u64 = DEPOSIT_AMOUNT * LAMPORTS_PER_SOL;
 
-    pub fn get_program_id() -> Pubkey {
+    pub fn get_program_id() -> Address {
         let program_id_keypair_bytes = std::fs::read("deploy/sbpf-asm-cpi-keypair.json").unwrap()
             [..32]
             .try_into()
             .expect("slice with incorrect length");
-        Pubkey::new_from_array(program_id_keypair_bytes)
+        Address::new_from_array(program_id_keypair_bytes)
     }
 
     #[test]
@@ -26,9 +26,9 @@ mod tests {
         let mollusk = Mollusk::new(&program_id, "deploy/sbpf-asm-cpi");
         let (system_program, system_account) = program::keyed_account_for_system_program();
 
-        let sender_pubkey = Pubkey::new_unique();
-        let receiver_pubkey = Pubkey::new_unique();
-        let extra_pubkey = Pubkey::new_unique();
+        let sender_pubkey = Address::new_unique();
+        let receiver_pubkey = Address::new_unique();
+        let extra_pubkey = Address::new_unique();
 
         // Less than 3 accounts.
         let instruction = Instruction::new_with_bytes(
@@ -83,7 +83,7 @@ mod tests {
         let mollusk = Mollusk::new(&program_id, "deploy/sbpf-asm-cpi");
         let (system_program, system_account) = program::keyed_account_for_system_program();
 
-        let sender_pubkey = Pubkey::new_unique();
+        let sender_pubkey = Address::new_unique();
 
         let instruction = Instruction::new_with_bytes(
             program_id,
@@ -114,8 +114,8 @@ mod tests {
         let mollusk = Mollusk::new(&program_id, "deploy/sbpf-asm-cpi");
         let (system_program, system_account) = program::keyed_account_for_system_program();
 
-        let sender_pubkey = Pubkey::new_unique();
-        let receiver_pubkey = Pubkey::new_unique();
+        let sender_pubkey = Address::new_unique();
+        let receiver_pubkey = Address::new_unique();
 
         let instruction = Instruction::new_with_bytes(
             program_id,
@@ -150,8 +150,8 @@ mod tests {
         let mollusk = Mollusk::new(&program_id, "deploy/sbpf-asm-cpi");
         let (system_program, system_account) = program::keyed_account_for_system_program();
 
-        let sender_pubkey = Pubkey::new_unique();
-        let receiver_pubkey = Pubkey::new_unique();
+        let sender_pubkey = Address::new_unique();
+        let receiver_pubkey = Address::new_unique();
 
         let amount = 20 * LAMPORTS_PER_SOL;
         let instruction_data = amount.to_le_bytes();
@@ -187,8 +187,8 @@ mod tests {
         let mollusk = Mollusk::new(&program_id, "deploy/sbpf-asm-cpi");
         let (system_program, system_account) = program::keyed_account_for_system_program();
 
-        let sender_pubkey = Pubkey::new_unique();
-        let receiver_pubkey = Pubkey::new_unique();
+        let sender_pubkey = Address::new_unique();
+        let receiver_pubkey = Address::new_unique();
 
         let instruction_data = DEPOSIT_LAMPORTS.to_le_bytes();
         let instruction = Instruction::new_with_bytes(

examples/sbpf-asm-vault/Cargo.toml

@@ -5,11 +5,10 @@ edition = "2021"
 
 [workspace]
 
-[dependencies]
-
 [dev-dependencies]
-mollusk-svm = "0.4.1"
-solana-sdk = "2.2.1"
-
-[features]
-test-sbf = []
+mollusk-svm = "0.7.0"
+solana-instruction = "3.0.0"
+solana-account = "3.0.0"
+solana-address = "1.0.0"
+solana-program-error = "3.0.0"
+solana-native-token = "3.0.0"

examples/sbpf-asm-vault/src/lib.rs

@@ -2,22 +2,22 @@
 mod tests {
     use mollusk_svm::program;
     use mollusk_svm::{result::Check, Mollusk};
-    use solana_sdk::account::Account;
-    use solana_sdk::instruction::{AccountMeta, Instruction};
-    use solana_sdk::native_token::LAMPORTS_PER_SOL;
-    use solana_sdk::program_error::ProgramError;
-    use solana_sdk::pubkey::Pubkey;
+    use solana_account::Account;
+    use solana_instruction::{AccountMeta, Instruction};
+    use solana_native_token::LAMPORTS_PER_SOL;
+    use solana_program_error::ProgramError;
+    use solana_address::Address;
 
     const BASE_LAMPORTS: u64 = 10 * LAMPORTS_PER_SOL;
     const DEPOSIT_AMOUNT: u64 = 1;
     const DEPOSIT_LAMPORTS: u64 = DEPOSIT_AMOUNT * LAMPORTS_PER_SOL;
 
-    pub fn get_program_id() -> Pubkey {
+    pub fn get_program_id() -> Address {
         let program_id_keypair_bytes = std::fs::read("deploy/sbpf-asm-vault-keypair.json").unwrap()
             [..32]
             .try_into()
             .expect("slice with incorrect length");
-        Pubkey::new_from_array(program_id_keypair_bytes)
+        Address::new_from_array(program_id_keypair_bytes)
     }
 
     #[test]
@@ -26,12 +26,12 @@ mod tests {
         let mollusk = Mollusk::new(&program_id, "deploy/sbpf-asm-vault");
         let (system_program, system_account) = program::keyed_account_for_system_program();
 
-        let owner_pubkey = Pubkey::new_unique();
+        let owner_pubkey = Address::new_unique();
         let owner_account = Account::new(BASE_LAMPORTS, 0, &system_program);
 
         // Incorrect vault PDA.
         let (vault_pda, vault_bump) =
-            Pubkey::find_program_address(&[b"wrong", &owner_pubkey.to_bytes()], &program_id);
+            Address::find_program_address(&[b"wrong", &owner_pubkey.to_bytes()], &program_id);
         let vault_account = Account::new(0, 0, &system_program);
         println!("Vault PDA: {}, Bump: {}", vault_pda, vault_bump);
 
@@ -65,11 +65,11 @@ mod tests {
         let mollusk = Mollusk::new(&program_id, "deploy/sbpf-asm-vault");
         let (system_program, system_account) = program::keyed_account_for_system_program();
 
-        let owner_pubkey = Pubkey::new_unique();
+        let owner_pubkey = Address::new_unique();
         let owner_account = Account::new(BASE_LAMPORTS, 0, &system_program);
 
         let (vault_pda, vault_bump) =
-            Pubkey::find_program_address(&[b"vault", &owner_pubkey.to_bytes()], &program_id);
+            Address::find_program_address(&[b"vault", &owner_pubkey.to_bytes()], &program_id);
         let vault_account = Account::new(0, 0, &system_program);
 
         let mut instruction_data = vec![0]; // 0 -> Deposit
@@ -110,11 +110,11 @@ mod tests {
         let mollusk = Mollusk::new(&program_id, "deploy/sbpf-asm-vault");
         let (system_program, system_account) = program::keyed_account_for_system_program();
 
-        let owner_pubkey = Pubkey::new_unique();
+        let owner_pubkey = Address::new_unique();
         let owner_account = Account::new(BASE_LAMPORTS, 0, &system_program);
 
         let (vault_pda, vault_bump) =
-            Pubkey::find_program_address(&[b"vault", &owner_pubkey.to_bytes()], &program_id);
+            Address::find_program_address(&[b"vault", &owner_pubkey.to_bytes()], &program_id);
         let vault_account = Account::new(DEPOSIT_LAMPORTS, 0, &system_program);
 
         let mut instruction_data = vec![1]; // 1 -> Withdraw