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

add activate_stake to stake_api (#4600)

Browse Source
This commit is contained in:
Rob Walker
2019-06-10 12:17:29 -07:00
committed by GitHub
parent be3a0b6b10
commit a18c0e34f4
10 changed files with 185 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/local_cluster.rs
View File

@ -428,31 +428,16 @@ impl LocalCluster {
let stake_account_keypair = Keypair::new();
let stake_account_pubkey = stake_account_keypair.pubkey();
let mut transaction = Transaction::new_signed_instructions(
&[from_account.as_ref()],
stake_instruction::create_delegate_account(
&[from_account.as_ref(), &stake_account_keypair],
stake_instruction::create_stake_account_and_delegate_stake(
&from_account.pubkey(),
&stake_account_pubkey,
&vote_account_pubkey,
amount,
),
client.get_recent_blockhash().unwrap().0,
);
client
.retry_transfer(&from_account, &mut transaction, 5)
.expect("fund stake");
client
.wait_for_balance(&stake_account_pubkey, Some(amount))
.expect("get balance");
let mut transaction = Transaction::new_signed_with_payer(
vec![stake_instruction::delegate_stake(
&stake_account_pubkey,
&vote_account_pubkey,
)],
Some(&from_account.pubkey()),
&[from_account.as_ref(), &stake_account_keypair],
client.get_recent_blockhash().unwrap().0,
);
client
.send_and_confirm_transaction(
&[from_account.as_ref(), &stake_account_keypair],
@ -461,6 +446,9 @@ impl LocalCluster {
0,
)
.expect("delegate stake");
client
.wait_for_balance(&stake_account_pubkey, Some(amount))
.expect("get balance");
}
info!("Checking for vote account registration");
let vote_account_user_data = client.get_account_data(&vote_account_pubkey);

14
core/src/staking_utils.rs
View File

@ -193,22 +193,14 @@ pub(crate) mod tests {
process_instructions(
bank,
&[from_account],
stake_instruction::create_delegate_account(
&[from_account, &stake_account_keypair],
stake_instruction::create_stake_account_and_delegate_stake(
&from_account.pubkey(),
&stake_account_pubkey,
vote_pubkey,
amount,
),
);
process_instructions(
bank,
&[from_account, &stake_account_keypair],
vec![stake_instruction::delegate_stake(
&stake_account_pubkey,
vote_pubkey,
)],
);
}
#[test]