fix tests

Author: Perelyn-sama

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

@@ -0,0 +1,2 @@
+/// Seed of the account_to_change account PDA.
+pub const ACCOUNT_TO_CHANGE: &[u8] = b"account_to_change";

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

@@ -1,9 +1,13 @@
+pub mod consts;
 pub mod instruction;
 pub mod sdk;
+pub mod state;
 
 pub mod prelude {
+    pub use crate::consts::*;
     pub use crate::instruction::*;
     pub use crate::sdk::*;
+    pub use crate::state::*;
 }
 
 use steel::*;

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

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

basics/checking-accounts/steel/api/src/state/account_to_change.rs

@@ -0,0 +1,9 @@
+use steel::*;
+
+use super::SteelAccount;
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
+pub struct AccountToChange {}
+
+account!(SteelAccount, AccountToChange);

basics/checking-accounts/steel/api/src/state/mod.rs

@@ -0,0 +1,18 @@
+mod account_to_change;
+
+pub use account_to_change::*;
+
+use steel::*;
+
+use crate::consts::*;
+
+#[repr(u8)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq, IntoPrimitive, TryFromPrimitive)]
+pub enum SteelAccount {
+    AccountToChange = 0,
+}
+
+/// Fetch PDA of the account_to_change account.
+pub fn account_to_change_pda() -> (Pubkey, u8) {
+    Pubkey::find_program_address(&[ACCOUNT_TO_CHANGE], &crate::id())
+}

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

@@ -1,7 +1,11 @@
 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
@@ -26,19 +30,26 @@ 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);
-    // if account_to_change_info.lamports() == 0 {
-    //     msg!("The program expected the account to change to be initialized.");
-    //     return Err(ProgramError::UninitializedAccount);
-    // };
-
-    // // If we want to modify an account's data, it must be owned by our program.
-    // if account_to_change_info.owner != &steel_api::ID {
-    //     msg!("Account to change does not have the correct program id.");
-    //     return Err(ProgramError::IncorrectProgramId);
-    // };
+    msg!("Account to change: {}", account_to_change_info.key);
+    if account_to_change_info.lamports() == 0 {
+        msg!("The program expected the account to change to be initialized.");
+        return Err(ProgramError::UninitializedAccount);
+    };
+
+    // If we want to modify an account's data, it must be owned by our program.
+    if account_to_change_info.owner != &steel_api::ID {
+        msg!("Account to change does not have the correct program id.");
+        return Err(ProgramError::IncorrectProgramId);
+    };
 
     // You can also check pubkeys against constants.
     if system_program.key != &system_program::ID {

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

@@ -20,55 +20,10 @@ async fn run_test() {
     let (mut banks, payer, blockhash) = setup().await;
 
     let account_to_create = Pubkey::new_unique();
-    let account_to_change = Pubkey::new_unique();
 
-    // AccountInfo::new(
-    //     &account_to_change,
-    //     payer.pubkey(),
-    //     true,
-    //     0,
-    //     data,
-    //     owner,
-    //     true,
-    //     rent_epoch,
-    // );
-    // getminu
-
-    // create_account(account_to_change., owner, seeds, system_program, payer);
-
-    // account!()
-    // ToAccount
-
-    // // Initialize proof.
-    //   create_account::<Proof>(
-    //       proof_info,
-    //       &ore_api::ID,
-    //       &[PROOF, signer_info.key.as_ref(), &[args.bump]],
-    //       system_program,
-    //       payer_info,
-    //   )?;
-
-    // Submit initialize transaction.
-    let ix = check_accounts(payer.pubkey(), account_to_create, account_to_change);
+    // Submit check_accounts transaction.
+    let ix = check_accounts(payer.pubkey(), account_to_create);
     let tx = Transaction::new_signed_with_payer(&[ix], Some(&payer.pubkey()), &[&payer], blockhash);
     let res = banks.process_transaction(tx).await;
     assert!(res.is_ok());
-
-    // Verify counter was initialized.
-    // let counter_address = counter_pda().0;
-    // let counter_account = banks.get_account(counter_address).await.unwrap().unwrap();
-    // let counter = Counter::try_from_bytes(&counter_account.data).unwrap();
-    // assert_eq!(counter_account.owner, steel_api::ID);
-    // assert_eq!(counter.value, 0);
-
-    // Submit add transaction.
-    // let ix = add(payer.pubkey(), 42);
-    // let tx = Transaction::new_signed_with_payer(&[ix], Some(&payer.pubkey()), &[&payer], blockhash);
-    // let res = banks.process_transaction(tx).await;
-    // assert!(res.is_ok());
-
-    // // Verify counter was incremented.
-    // let counter_account = banks.get_account(counter_address).await.unwrap().unwrap();
-    // let counter = Counter::try_from_bytes(&counter_account.data).unwrap();
-    // assert_eq!(counter.value, 42);
 }