Merge remote-tracking branch 'origin/anchor-free-functions'

Author: mikemaccana

basics/account-data/anchor/programs/anchor-program-example/src/instructions/create.rs

@@ -2,7 +2,7 @@ use crate::{constants::ANCHOR_DISCRIMINATOR_SIZE, state::AddressInfo};
 use anchor_lang::prelude::*;
 
 #[derive(Accounts)]
-pub struct CreateAddressInfo<'info> {
+pub struct CreateAddressInfoAccountConstraints<'info> {
     #[account(mut)]
     payer: Signer<'info>,
 
@@ -15,14 +15,14 @@ pub struct CreateAddressInfo<'info> {
     system_program: Program<'info, System>,
 }
 
-pub fn create_address_info(
-    ctx: Context<CreateAddressInfo>,
+pub fn handle_create_address_info(
+    context: Context<CreateAddressInfoAccountConstraints>,
     name: String,
     house_number: u8,
     street: String,
     city: String,
 ) -> Result<()> {
-    *ctx.accounts.address_info = AddressInfo {
+    *context.accounts.address_info = AddressInfo {
         name,
         house_number,
         street,

basics/account-data/anchor/programs/anchor-program-example/src/lib.rs

@@ -12,12 +12,12 @@ pub mod account_data_anchor_program {
     use super::*;
 
     pub fn create_address_info(
-        ctx: Context<CreateAddressInfo>,
+        context: Context<CreateAddressInfoAccountConstraints>,
         name: String,
         house_number: u8,
         street: String,
         city: String,
     ) -> Result<()> {
-        create::create_address_info(ctx, name, house_number, street, city)
+        create::handle_create_address_info(context, name, house_number, street, city)
     }
 }

basics/checking-accounts/anchor/programs/anchor-program-example/src/lib.rs

@@ -6,15 +6,15 @@ declare_id!("ECWPhR3rJbaPfyNFgphnjxSEexbTArc7vxD8fnW6tgKw");
 pub mod checking_account_program {
     use super::*;
 
-    pub fn check_accounts(_ctx: Context<CheckingAccounts>) -> Result<()> {
+    pub fn check_accounts(_context: Context<CheckingAccountsAccountConstraints>) -> Result<()> {
         Ok(())
     }
 }
 
 // Account validation in Anchor is done using the types and constraints specified in the #[derive(Accounts)] structs
 // This is a simple example and does not include all possible constraints and types
 #[derive(Accounts)]
-pub struct CheckingAccounts<'info> {
+pub struct CheckingAccountsAccountConstraints<'info> {
     payer: Signer<'info>, // checks account is signer
 
     /// CHECK: No checks performed, example of an unchecked account

basics/close-account/anchor/programs/close-account/src/instructions/close_user.rs

@@ -18,6 +18,6 @@ pub struct CloseUserContext<'info> {
     pub user_account: Account<'info, UserState>,
 }
 
-pub fn close_user(_ctx: Context<CloseUserContext>) -> Result<()> {
+pub fn handle_close_user(_context: Context<CloseUserContext>) -> Result<()> {
     Ok(())
 }

basics/close-account/anchor/programs/close-account/src/instructions/create_user.rs

@@ -20,10 +20,10 @@ pub struct CreateUserContext<'info> {
     pub system_program: Program<'info, System>,
 }
 
-pub fn create_user(ctx: Context<CreateUserContext>, name: String) -> Result<()> {
-    *ctx.accounts.user_account = UserState {
-        bump: ctx.bumps.user_account,
-        user: ctx.accounts.user.key(),
+pub fn handle_create_user(context: Context<CreateUserContext>, name: String) -> Result<()> {
+    *context.accounts.user_account = UserState {
+        bump: context.bumps.user_account,
+        user: context.accounts.user.key(),
         name,
     };
     Ok(())

basics/close-account/anchor/programs/close-account/src/lib.rs

@@ -9,11 +9,11 @@ declare_id!("99TQtoDdQ5NS2v5Ppha93aqEmv3vV9VZVfHTP5rGST3c");
 pub mod close_account_program {
     use super::*;
 
-    pub fn create_user(ctx: Context<CreateUserContext>, name: String) -> Result<()> {
-        create_user::create_user(ctx, name)
+    pub fn create_user(context: Context<CreateUserContext>, name: String) -> Result<()> {
+        create_user::handle_create_user(context, name)
     }
 
-    pub fn close_user(ctx: Context<CloseUserContext>) -> Result<()> {
-        close_user::close_user(ctx)
+    pub fn close_user(context: Context<CloseUserContext>) -> Result<()> {
+        close_user::handle_close_user(context)
     }
 }

basics/counter/anchor/programs/counter_anchor/src/lib.rs

@@ -6,18 +6,18 @@ declare_id!("BmDHboaj1kBUoinJKKSRqKfMeRKJqQqEbUj1VgzeQe4A");
 pub mod counter_anchor {
     use super::*;
 
-    pub fn initialize_counter(_ctx: Context<InitializeCounter>) -> Result<()> {
+    pub fn initialize_counter(_context: Context<InitializeCounterAccountConstraints>) -> Result<()> {
         Ok(())
     }
 
-    pub fn increment(ctx: Context<Increment>) -> Result<()> {
-        ctx.accounts.counter.count = ctx.accounts.counter.count.checked_add(1).unwrap();
+    pub fn increment(context: Context<IncrementAccountConstraints>) -> Result<()> {
+        context.accounts.counter.count = context.accounts.counter.count.checked_add(1).unwrap();
         Ok(())
     }
 }
 
 #[derive(Accounts)]
-pub struct InitializeCounter<'info> {
+pub struct InitializeCounterAccountConstraints<'info> {
     #[account(mut)]
     pub payer: Signer<'info>,
 
@@ -31,7 +31,7 @@ pub struct InitializeCounter<'info> {
 }
 
 #[derive(Accounts)]
-pub struct Increment<'info> {
+pub struct IncrementAccountConstraints<'info> {
     #[account(mut)]
     pub counter: Account<'info, Counter>,
 }

basics/create-account/anchor/programs/create-system-account/src/lib.rs

@@ -7,27 +7,27 @@ declare_id!("ARVNCsYKDQsCLHbwUTJLpFXVrJdjhWZStyzvxmKe2xHi");
 pub mod create_system_account {
     use super::*;
 
-    pub fn create_system_account(ctx: Context<CreateSystemAccount>) -> Result<()> {
+    pub fn create_system_account(context: Context<CreateSystemAccountAccountConstraints>) -> Result<()> {
         msg!("Program invoked. Creating a system account...");
         msg!(
             "  New public key will be: {}",
-            &ctx.accounts.new_account.key().to_string()
+            &context.accounts.new_account.key().to_string()
         );
 
         // The minimum lamports for rent exemption
         let lamports = (Rent::get()?).minimum_balance(0);
 
         create_account(
             CpiContext::new(
-                ctx.accounts.system_program.key(),
+                context.accounts.system_program.key(),
                 CreateAccount {
-                    from: ctx.accounts.payer.to_account_info(), // From pubkey
-                    to: ctx.accounts.new_account.to_account_info(), // To pubkey
+                    from: context.accounts.payer.to_account_info(), // From pubkey
+                    to: context.accounts.new_account.to_account_info(), // To pubkey
                 },
             ),
             lamports,                           // Lamports
             0,                                  // Space
-            &ctx.accounts.system_program.key(), // Owner Program
+            &context.accounts.system_program.key(), // Owner Program
         )?;
 
         msg!("Account created succesfully.");
@@ -36,7 +36,7 @@ pub mod create_system_account {
 }
 
 #[derive(Accounts)]
-pub struct CreateSystemAccount<'info> {
+pub struct CreateSystemAccountAccountConstraints<'info> {
     #[account(mut)]
     pub payer: Signer<'info>,
     #[account(mut)]

basics/cross-program-invocation/anchor/programs/hand/src/lib.rs

@@ -13,11 +13,11 @@ use lever::program::Lever;
 pub mod hand {
     use super::*;
 
-    pub fn pull_lever(ctx: Context<PullLever>, name: String) -> Result<()> {
+    pub fn pull_lever(context: Context<PullLeverAccountConstraints>, name: String) -> Result<()> {
         let cpi_ctx = CpiContext::new(
-            ctx.accounts.lever_program.key(),
+            context.accounts.lever_program.key(),
             SwitchPower {
-                power: ctx.accounts.power.to_account_info(),
+                power: context.accounts.power.to_account_info(),
             },
         );
         switch_power(cpi_ctx, name)?;
@@ -26,7 +26,7 @@ pub mod hand {
 }
 
 #[derive(Accounts)]
-pub struct PullLever<'info> {
+pub struct PullLeverAccountConstraints<'info> {
     #[account(mut)]
     pub power: Account<'info, PowerStatus>,
     pub lever_program: Program<'info, Lever>,

basics/cross-program-invocation/anchor/programs/lever/src/lib.rs

@@ -6,12 +6,12 @@ declare_id!("E64FVeubGC4NPNF2UBJYX4AkrVowf74fRJD9q6YhwstN");
 pub mod lever {
     use super::*;
 
-    pub fn initialize(_ctx: Context<InitializeLever>) -> Result<()> {
+    pub fn initialize(_mut context: Context<InitializeLeverAccountConstraints>) -> Result<()> {
         Ok(())
     }
 
-    pub fn switch_power(ctx: Context<SetPowerStatus>, name: String) -> Result<()> {
-        let power = &mut ctx.accounts.power;
+    pub fn switch_power(mut context: Context<SetPowerStatusAccountConstraints>, name: String) -> Result<()> {
+        let power = &mut context.accounts.power;
         power.is_on = !power.is_on;
 
         msg!("{} is pulling the power switch!", &name);
@@ -26,7 +26,7 @@ pub mod lever {
 }
 
 #[derive(Accounts)]
-pub struct InitializeLever<'info> {
+pub struct InitializeLeverAccountConstraints<'info> {
     #[account(init, payer = user, space = PowerStatus::DISCRIMINATOR.len() + PowerStatus::INIT_SPACE)]
     pub power: Account<'info, PowerStatus>,
     #[account(mut)]
@@ -35,7 +35,7 @@ pub struct InitializeLever<'info> {
 }
 
 #[derive(Accounts)]
-pub struct SetPowerStatus<'info> {
+pub struct SetPowerStatusAccountConstraints<'info> {
     #[account(mut)]
     pub power: Account<'info, PowerStatus>,
 }