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

move system_instruction::transfer() to credit-debit (#6677)

Browse Source 
* transfer no credit only

* use a credit-only transfer in the credit-only test
This commit is contained in:
Rob Walker
2019-11-04 12:30:59 -08:00
committed by GitHub
parent d085c8626f
commit b9b535c30f
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
runtime/src/bank.rs
View File

@ -1640,11 +1640,13 @@ mod tests {
epoch_schedule::MINIMUM_SLOTS_PER_EPOCH, epoch_schedule::MINIMUM_SLOTS_PER_EPOCH,
genesis_block::create_genesis_block, genesis_block::create_genesis_block,
hash, hash,
instruction::InstructionError, instruction::{AccountMeta, Instruction, InstructionError},
message::{Message, MessageHeader},
poh_config::PohConfig, poh_config::PohConfig,
rent::Rent, rent::Rent,
signature::{Keypair, KeypairUtil}, signature::{Keypair, KeypairUtil},
system_instruction, system_transaction, system_instruction::{self, SystemInstruction},
system_program, system_transaction,
sysvar::{fees::Fees, rewards::Rewards}, sysvar::{fees::Fees, rewards::Rewards},
}; };
use solana_stake_api::stake_state::Stake; use solana_stake_api::stake_state::Stake;
@ -2226,6 +2228,26 @@ mod tests {
assert_eq!(bank.transaction_count(), 1); assert_eq!(bank.transaction_count(), 1);
} }
fn transfer_credit_only(
from: &Keypair,
to: &Pubkey,
lamports: u64,
recent_blockhash: Hash,
) -> Transaction {
Transaction::new_signed_instructions(
&[from],
vec![Instruction::new(
system_program::id(),
&SystemInstruction::Transfer { lamports },
vec![
AccountMeta::new(from.pubkey(), true),
AccountMeta::new_credit_only(*to, false),
],
)],
recent_blockhash,
)
}
#[test] #[test]
fn test_credit_only_accounts() { fn test_credit_only_accounts() {
let (genesis_block, mint_keypair) = create_genesis_block(100); let (genesis_block, mint_keypair) = create_genesis_block(100);
@ -2236,16 +2258,9 @@ mod tests {
// Fund additional payers // Fund additional payers
bank.transfer(3, &mint_keypair, &payer0.pubkey()).unwrap(); bank.transfer(3, &mint_keypair, &payer0.pubkey()).unwrap();
bank.transfer(3, &mint_keypair, &payer1.pubkey()).unwrap(); bank.transfer(3, &mint_keypair, &payer1.pubkey()).unwrap();
let tx0 = system_transaction::transfer( let tx0 = transfer_credit_only(&mint_keypair, &recipient.pubkey(), 1, genesis_block.hash());
&mint_keypair, let tx1 = transfer_credit_only(&payer0, &recipient.pubkey(), 1, genesis_block.hash());
&recipient.pubkey(), let tx2 = transfer_credit_only(&payer1, &recipient.pubkey(), 1, genesis_block.hash());
1,
genesis_block.hash(),
);
let tx1 =
system_transaction::transfer(&payer0, &recipient.pubkey(), 1, genesis_block.hash());
let tx2 =
system_transaction::transfer(&payer1, &recipient.pubkey(), 1, genesis_block.hash());
let txs = vec![tx0, tx1, tx2]; let txs = vec![tx0, tx1, tx2];
let results = bank.process_transactions(&txs); let results = bank.process_transactions(&txs);
@ -2306,8 +2321,6 @@ mod tests {
#[test] #[test]
fn test_credit_only_relaxed_locks() { fn test_credit_only_relaxed_locks() {
use solana_sdk::message::{Message, MessageHeader};
let (genesis_block, _) = create_genesis_block(3); let (genesis_block, _) = create_genesis_block(3);
let bank = Bank::new(&genesis_block); let bank = Bank::new(&genesis_block);
let key0 = Keypair::new(); let key0 = Keypair::new();

2
sdk/src/system_instruction.rs
View File

@ -83,7 +83,7 @@ pub fn assign(from_pubkey: &Pubkey, program_id: &Pubkey) -> Instruction {
pub fn transfer(from_pubkey: &Pubkey, to_pubkey: &Pubkey, lamports: u64) -> Instruction { pub fn transfer(from_pubkey: &Pubkey, to_pubkey: &Pubkey, lamports: u64) -> Instruction {
let account_metas = vec![ let account_metas = vec![
AccountMeta::new(*from_pubkey, true), AccountMeta::new(*from_pubkey, true),
AccountMeta::new_credit_only(*to_pubkey, false), AccountMeta::new(*to_pubkey, false),
]; ];
Instruction::new( Instruction::new(
system_program::id(), system_program::id(),