Skip to content

Commit 11ceb43

Browse files
committed
Remove unnecessary invoke_signed
1 parent 55ecb47 commit 11ceb43

File tree

6 files changed

+18
-53
lines changed

6 files changed

+18
-53
lines changed

programs/token/src/instructions/initialize_account.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use pinocchio::{
22
account_info::AccountInfo,
3-
instruction::{AccountMeta, Instruction, Signer},
4-
program::invoke_signed,
3+
cpi::invoke,
4+
instruction::{AccountMeta, Instruction},
55
ProgramResult,
66
};
77

@@ -26,11 +26,6 @@ pub struct InitializeAccount<'a> {
2626
impl InitializeAccount<'_> {
2727
#[inline(always)]
2828
pub fn invoke(&self) -> ProgramResult {
29-
self.invoke_signed(&[])
30-
}
31-
32-
#[inline(always)]
33-
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
3429
// account metadata
3530
let account_metas: [AccountMeta; 4] = [
3631
AccountMeta::writable(self.account.key()),
@@ -45,10 +40,9 @@ impl InitializeAccount<'_> {
4540
data: &[1],
4641
};
4742

48-
invoke_signed(
43+
invoke(
4944
&instruction,
5045
&[self.account, self.mint, self.owner, self.rent_sysvar],
51-
signers,
5246
)
5347
}
5448
}

programs/token/src/instructions/initialize_account_2.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use core::slice::from_raw_parts;
22

33
use pinocchio::{
44
account_info::AccountInfo,
5-
instruction::{AccountMeta, Instruction, Signer},
6-
program::invoke_signed,
5+
cpi::invoke,
6+
instruction::{AccountMeta, Instruction},
77
pubkey::Pubkey,
88
ProgramResult,
99
};
@@ -30,11 +30,6 @@ pub struct InitializeAccount2<'a> {
3030
impl InitializeAccount2<'_> {
3131
#[inline(always)]
3232
pub fn invoke(&self) -> ProgramResult {
33-
self.invoke_signed(&[])
34-
}
35-
36-
#[inline(always)]
37-
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
3833
// account metadata
3934
let account_metas: [AccountMeta; 3] = [
4035
AccountMeta::writable(self.account.key()),
@@ -58,10 +53,6 @@ impl InitializeAccount2<'_> {
5853
data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, 33) },
5954
};
6055

61-
invoke_signed(
62-
&instruction,
63-
&[self.account, self.mint, self.rent_sysvar],
64-
signers,
65-
)
56+
invoke(&instruction, &[self.account, self.mint, self.rent_sysvar])
6657
}
6758
}

programs/token/src/instructions/initialize_account_3.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use core::slice::from_raw_parts;
22

33
use pinocchio::{
44
account_info::AccountInfo,
5-
instruction::{AccountMeta, Instruction, Signer},
6-
program::invoke_signed,
5+
cpi::invoke,
6+
instruction::{AccountMeta, Instruction},
77
pubkey::Pubkey,
88
ProgramResult,
99
};
@@ -27,11 +27,6 @@ pub struct InitializeAccount3<'a> {
2727
impl InitializeAccount3<'_> {
2828
#[inline(always)]
2929
pub fn invoke(&self) -> ProgramResult {
30-
self.invoke_signed(&[])
31-
}
32-
33-
#[inline(always)]
34-
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
3530
// account metadata
3631
let account_metas: [AccountMeta; 2] = [
3732
AccountMeta::writable(self.account.key()),
@@ -54,6 +49,6 @@ impl InitializeAccount3<'_> {
5449
data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, 33) },
5550
};
5651

57-
invoke_signed(&instruction, &[self.account, self.mint], signers)
52+
invoke(&instruction, &[self.account, self.mint])
5853
}
5954
}

programs/token/src/instructions/initialize_mint.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use core::slice::from_raw_parts;
22

33
use pinocchio::{
44
account_info::AccountInfo,
5-
instruction::{AccountMeta, Instruction, Signer},
6-
program::invoke_signed,
5+
cpi::invoke,
6+
instruction::{AccountMeta, Instruction},
77
pubkey::Pubkey,
88
ProgramResult,
99
};
@@ -31,11 +31,6 @@ pub struct InitializeMint<'a> {
3131
impl InitializeMint<'_> {
3232
#[inline(always)]
3333
pub fn invoke(&self) -> ProgramResult {
34-
self.invoke_signed(&[])
35-
}
36-
37-
#[inline(always)]
38-
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
3934
// Account metadata
4035
let account_metas: [AccountMeta; 2] = [
4136
AccountMeta::writable(self.mint.key()),
@@ -75,6 +70,6 @@ impl InitializeMint<'_> {
7570
data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, length) },
7671
};
7772

78-
invoke_signed(&instruction, &[self.mint, self.rent_sysvar], signers)
73+
invoke(&instruction, &[self.mint, self.rent_sysvar])
7974
}
8075
}

programs/token/src/instructions/initialize_mint_2.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use core::slice::from_raw_parts;
22

33
use pinocchio::{
44
account_info::AccountInfo,
5-
instruction::{AccountMeta, Instruction, Signer},
6-
program::invoke_signed,
5+
cpi::invoke,
6+
instruction::{AccountMeta, Instruction},
77
pubkey::Pubkey,
88
ProgramResult,
99
};
@@ -28,11 +28,6 @@ pub struct InitializeMint2<'a> {
2828
impl InitializeMint2<'_> {
2929
#[inline(always)]
3030
pub fn invoke(&self) -> ProgramResult {
31-
self.invoke_signed(&[])
32-
}
33-
34-
#[inline(always)]
35-
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
3631
// Account metadata
3732
let account_metas: [AccountMeta; 1] = [AccountMeta::writable(self.mint.key())];
3833

@@ -69,6 +64,6 @@ impl InitializeMint2<'_> {
6964
data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, length) },
7065
};
7166

72-
invoke_signed(&instruction, &[self.mint], signers)
67+
invoke(&instruction, &[self.mint])
7368
}
7469
}

programs/token/src/instructions/sync_native.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use pinocchio::{
22
account_info::AccountInfo,
3-
instruction::{AccountMeta, Instruction, Signer},
4-
program::invoke_signed,
3+
cpi::invoke,
4+
instruction::{AccountMeta, Instruction},
55
ProgramResult,
66
};
77

@@ -19,11 +19,6 @@ pub struct SyncNative<'a> {
1919
impl SyncNative<'_> {
2020
#[inline(always)]
2121
pub fn invoke(&self) -> ProgramResult {
22-
self.invoke_signed(&[])
23-
}
24-
25-
#[inline(always)]
26-
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
2722
// account metadata
2823
let account_metas: [AccountMeta; 1] = [AccountMeta::writable(self.native_token.key())];
2924

@@ -33,6 +28,6 @@ impl SyncNative<'_> {
3328
data: &[17],
3429
};
3530

36-
invoke_signed(&instruction, &[self.native_token], signers)
31+
invoke(&instruction, &[self.native_token])
3732
}
3833
}

0 commit comments

Comments
 (0)