Skip to content

Commit 92e79da

Browse files
committed
fix: replace method-call dispatch with free-function handlers across all quasar programs
1 parent 4022c51 commit 92e79da

23 files changed

Lines changed: 53 additions & 47 deletions

File tree

  • basics
    • account-data/quasar/src
    • checking-accounts/quasar/src
    • close-account/quasar/src
    • counter/quasar/src
    • create-account/quasar/src
    • favorites/quasar/src
    • hello-solana/quasar/src
    • pda-rent-payer/quasar/src
    • processing-instructions/quasar/src
    • program-derived-addresses/quasar/src
    • realloc/quasar/src
    • rent/quasar/src
    • repository-layout/quasar/src
    • transfer-sol/quasar/src
  • compression
  • oracles/pyth/quasar/src
  • tokens

basics/account-data/quasar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ mod quasar_account_data {
3030
street: String,
3131
city: String,
3232
) -> Result<(), ProgramError> {
33-
ctx.accounts.create_address_info(name, house_number, street, city)
33+
instructions::handle_create_address_info(&mut ctx.accounts, name, house_number, street, city)
3434
}
3535
}

basics/checking-accounts/quasar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ mod quasar_checking_accounts {
1919
/// - Program<System>: checks account is executable and is the system program
2020
#[instruction(discriminator = 0)]
2121
pub fn check_accounts(ctx: Ctx<CheckAccounts>) -> Result<(), ProgramError> {
22-
ctx.accounts.check_accounts()
22+
instructions::handle_check_accounts(&mut ctx.accounts)
2323
}
2424
}

basics/close-account/quasar/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ mod quasar_close_account {
1818
#[instruction(discriminator = 0)]
1919
pub fn create_user(ctx: Ctx<CreateUser>, name: String) -> Result<(), ProgramError> {
2020
let bump = ctx.bumps.user_account;
21-
ctx.accounts.create_user(name, bump)
21+
instructions::handle_create_user(&mut ctx.accounts, name, bump)
2222
}
2323

2424
/// Close a user account and return lamports to the user.
2525
#[instruction(discriminator = 1)]
2626
pub fn close_user(ctx: Ctx<CloseUser>) -> Result<(), ProgramError> {
27-
ctx.accounts.close_user()
27+
instructions::handle_close_user(&mut ctx.accounts)
2828
}
2929
}

basics/counter/quasar/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ mod quasar_counter {
1616

1717
#[instruction(discriminator = 0)]
1818
pub fn initialize_counter(ctx: Ctx<InitializeCounter>) -> Result<(), ProgramError> {
19-
ctx.accounts.initialize_counter()
19+
instructions::handle_initialize_counter(&mut ctx.accounts)
2020
}
2121

2222
#[instruction(discriminator = 1)]
2323
pub fn increment(ctx: Ctx<Increment>) -> Result<(), ProgramError> {
24-
ctx.accounts.increment()
24+
instructions::handle_increment(&mut ctx.accounts)
2525
}
2626
}

basics/create-account/quasar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ mod quasar_create_account {
1616
/// Create a new system-owned account via CPI to the system program.
1717
#[instruction(discriminator = 0)]
1818
pub fn create_system_account(ctx: Ctx<CreateSystemAccount>) -> Result<(), ProgramError> {
19-
ctx.accounts.create_system_account()
19+
instructions::handle_create_system_account(&mut ctx.accounts)
2020
}
2121
}

basics/favorites/quasar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ mod quasar_favorites {
2424
number: u64,
2525
color: String,
2626
) -> Result<(), ProgramError> {
27-
ctx.accounts.set_favorites(number, color)
27+
instructions::handle_set_favorites(&mut ctx.accounts, number, color)
2828
}
2929
}

basics/hello-solana/quasar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ mod quasar_hello_solana {
1515

1616
#[instruction(discriminator = 0)]
1717
pub fn hello(ctx: Ctx<Hello>) -> Result<(), ProgramError> {
18-
ctx.accounts.hello()
18+
instructions::handle_hello(&mut ctx.accounts)
1919
}
2020
}

basics/pda-rent-payer/quasar/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ mod quasar_pda_rent_payer {
1616
/// Fund a PDA "rent vault" by transferring lamports from the payer.
1717
#[instruction(discriminator = 0)]
1818
pub fn init_rent_vault(ctx: Ctx<InitRentVault>, fund_lamports: u64) -> Result<(), ProgramError> {
19-
ctx.accounts.init_rent_vault(fund_lamports)
19+
instructions::handle_init_rent_vault(&mut ctx.accounts, fund_lamports)
2020
}
2121

2222
/// Create a new account using the rent vault PDA as the funding source.
2323
/// The vault signs the CPI via PDA seeds.
2424
#[instruction(discriminator = 1)]
2525
pub fn create_new_account(ctx: Ctx<CreateNewAccount>) -> Result<(), ProgramError> {
26-
ctx.accounts.create_new_account(ctx.bumps.rent_vault)
26+
instructions::handle_create_new_account(&mut ctx.accounts, ctx.bumps.rent_vault)
2727
}
2828
}

basics/processing-instructions/quasar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ mod quasar_processing_instructions {
1818
/// can't interpolate them into log messages (no format! in no_std).
1919
#[instruction(discriminator = 0)]
2020
pub fn go_to_park(ctx: Ctx<Park>, name: String, height: u32) -> Result<(), ProgramError> {
21-
ctx.accounts.go_to_park(name, height)
21+
instructions::handle_go_to_park(&mut ctx.accounts, name, height)
2222
}
2323
}

basics/program-derived-addresses/quasar/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ mod quasar_program_derived_addresses {
1717
/// Create a PDA-based page visits counter for the payer.
1818
#[instruction(discriminator = 0)]
1919
pub fn create_page_visits(ctx: Ctx<CreatePageVisits>) -> Result<(), ProgramError> {
20-
ctx.accounts.create_page_visits()
20+
instructions::handle_create_page_visits(&mut ctx.accounts)
2121
}
2222

2323
/// Increment the page visits counter.
2424
#[instruction(discriminator = 1)]
2525
pub fn increment_page_visits(ctx: Ctx<IncrementPageVisits>) -> Result<(), ProgramError> {
26-
ctx.accounts.increment_page_visits()
26+
instructions::handle_increment_page_visits(&mut ctx.accounts)
2727
}
2828
}

0 commit comments

Comments
 (0)