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

remove from_account from stake_instruction (#4502)

Browse Source
This commit is contained in:
Rob Walker
2019-06-03 09:04:51 -07:00
committed by GitHub
parent 482ef51502
commit c56052ff16
4 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/local_cluster.rs
View File

@ -444,13 +444,13 @@ impl LocalCluster {
.wait_for_balance(&stake_account_pubkey, Some(amount))
.expect("get balance");
let mut transaction = Transaction::new_signed_instructions(
&[from_account.as_ref(), &stake_account_keypair],
let mut transaction = Transaction::new_signed_with_payer(
vec![stake_instruction::delegate_stake(
&from_account.pubkey(),
&stake_account_pubkey,
&vote_account_pubkey,
)],
Some(&from_account.pubkey()),
&[from_account.as_ref(), &stake_account_keypair],
client.get_recent_blockhash().unwrap().0,
);
client

6
core/src/staking_utils.rs
View File

@ -167,9 +167,10 @@ pub(crate) mod tests {
keypairs: &[&T],
ixs: Vec<Instruction>,
) {
bank.process_transaction(&Transaction::new_signed_instructions(
keypairs,
bank.process_transaction(&Transaction::new_signed_with_payer(
ixs,
Some(&keypairs[0].pubkey()),
keypairs,
bank.last_blockhash(),
))
.unwrap();
@ -204,7 +205,6 @@ pub(crate) mod tests {
bank,
&[from_account, &stake_account_keypair],
vec![stake_instruction::delegate_stake(
&from_account.pubkey(),
&stake_account_pubkey,
vote_pubkey,
)],