gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename 'new_account' to 'new_user_account'

Browse Source 
And 'new_program_account' to 'new_account'
This commit is contained in:
Greg Fitzgerald
2019-04-02 17:01:56 -06:00
parent 7b82e96467
commit 43bb813cbe
32 changed files with 107 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/src/system_instruction.rs
View File

@ -32,7 +32,7 @@ pub enum SystemInstruction {
}
impl SystemInstruction {
pub fn new_program_account(
pub fn new_account(
from_id: &Pubkey,
to_id: &Pubkey,
lamports: u64,
@ -55,9 +55,9 @@ impl SystemInstruction {
}
/// Create and sign a transaction to create a system account
pub fn new_account(from_id: &Pubkey, to_id: &Pubkey, lamports: u64) -> Instruction {
pub fn new_user_account(from_id: &Pubkey, to_id: &Pubkey, lamports: u64) -> Instruction {
let program_id = system_program::id();
Self::new_program_account(from_id, to_id, lamports, 0, &program_id)
Self::new_account(from_id, to_id, lamports, 0, &program_id)
}
pub fn new_assign(from_id: &Pubkey, program_id: &Pubkey) -> Instruction {

8
sdk/src/system_transaction.rs
View File

@ -11,7 +11,7 @@ pub struct SystemTransaction {}
impl SystemTransaction {
/// Create and sign new SystemInstruction::CreateAccount transaction
pub fn new_program_account(
pub fn new_account(
from_keypair: &Keypair,
to: &Pubkey,
recent_blockhash: Hash,
@ -22,13 +22,13 @@ impl SystemTransaction {
) -> Transaction {
let from_pubkey = from_keypair.pubkey();
let create_instruction =
SystemInstruction::new_program_account(&from_pubkey, to, lamports, space, program_id);
SystemInstruction::new_account(&from_pubkey, to, lamports, space, program_id);
let instructions = vec![create_instruction];
Transaction::new_signed_instructions(&[from_keypair], instructions, recent_blockhash)
}
/// Create and sign a transaction to create a system account
pub fn new_account(
pub fn new_user_account(
from_keypair: &Keypair,
to: &Pubkey,
lamports: u64,
@ -36,7 +36,7 @@ impl SystemTransaction {
fee: u64,
) -> Transaction {
let program_id = system_program::id();
Self::new_program_account(
Self::new_account(
from_keypair,
to,
recent_blockhash,