move account_to_change creation to test

Author: Perelyn-sama

basics/checking-accounts/steel/api/src/sdk.rs

@@ -2,13 +2,17 @@ use steel::*;
 
 use crate::prelude::*;
 
-pub fn check_accounts(signer: Pubkey, account_to_create: Pubkey) -> Instruction {
+pub fn check_accounts(
+    signer: Pubkey,
+    account_to_create: Pubkey,
+    account_to_change: Pubkey,
+) -> Instruction {
     Instruction {
         program_id: crate::ID,
         accounts: vec![
             AccountMeta::new(signer, true),
             AccountMeta::new(account_to_create, false),
-            AccountMeta::new(account_to_change_pda().0, false),
+            AccountMeta::new(account_to_change, false),
             AccountMeta::new_readonly(system_program::ID, false),
         ],
         data: CheckAccounts {}.to_bytes(),

basics/checking-accounts/steel/program/src/check_accounts.rs

@@ -1,11 +1,7 @@
 use solana_program::msg;
 use steel::*;
-use steel_api::prelude::*;
 
 pub fn process_check_accounts(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResult {
-    // Get expected pda bump.
-    let account_to_change_bump = account_to_change_pda().1;
-
     // Load accounts.
     // You can verify the list has the correct number of accounts.
     let [signer_info, account_to_create_info, account_to_change_info, system_program] = accounts
@@ -30,13 +26,6 @@ pub fn process_check_accounts(accounts: &[AccountInfo<'_>], _data: &[u8]) -> Pro
         return Err(ProgramError::AccountAlreadyInitialized);
     };
     // (Create account...)
-    create_account::<AccountToChange>(
-        account_to_change_info,
-        &steel_api::ID,
-        &[ACCOUNT_TO_CHANGE, &[account_to_change_bump]],
-        system_program,
-        signer_info,
-    )?;
 
     // You can also make sure an account has been initialized.
     msg!("Account to change: {}", account_to_change_info.key);

basics/checking-accounts/steel/program/tests/test.rs

@@ -1,7 +1,6 @@
 use solana_program::hash::Hash;
 use solana_program_test::{processor, BanksClient, ProgramTest};
 use solana_sdk::{signature::Keypair, signer::Signer, transaction::Transaction};
-use steel::*;
 use steel_api::prelude::*;
 
 async fn setup() -> (BanksClient, Keypair, Hash) {
@@ -19,10 +18,33 @@ async fn run_test() {
     // Setup test
     let (mut banks, payer, blockhash) = setup().await;
 
-    let account_to_create = Pubkey::new_unique();
+    let account_to_create = Keypair::new();
+    let account_to_change = Keypair::new();
+
+    let account_to_change_ix = solana_sdk::system_instruction::create_account(
+        &payer.pubkey(),
+        &account_to_change.pubkey(),
+        solana_sdk::native_token::LAMPORTS_PER_SOL,
+        0,
+        &steel_api::ID,
+    );
+
+    let tx = Transaction::new_signed_with_payer(
+        &[account_to_change_ix],
+        Some(&payer.pubkey()),
+        &[&payer, &account_to_change],
+        blockhash,
+    );
+
+    let res = banks.process_transaction(tx).await;
+    assert!(res.is_ok());
 
     // Submit check_accounts transaction.
-    let ix = check_accounts(payer.pubkey(), account_to_create);
+    let ix = check_accounts(
+        payer.pubkey(),
+        account_to_create.pubkey(),
+        account_to_change.pubkey(),
+    );
     let tx = Transaction::new_signed_with_payer(&[ix], Some(&payer.pubkey()), &[&payer], blockhash);
     let res = banks.process_transaction(tx).await;
     assert!(res.is_ok());