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

Revert to more consistent naming (#3114)

Browse Source
This commit is contained in:
Sagar Dhawan
2019-03-04 17:50:19 -08:00
committed by GitHub
parent 6d82123125
commit dc42c12f2b
11 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/fullnode.rs
View File

@ -377,7 +377,7 @@ pub fn make_active_set_entries(
let voting_keypair = VotingKeypair::new_local(active_keypair);
let vote_account_id = voting_keypair.pubkey();
let new_vote_account_tx = VoteTransaction::fund_staking_account(
let new_vote_account_tx = VoteTransaction::new_account(
active_keypair,
vote_account_id,
*blockhash,

2
core/src/local_cluster.rs
View File

@ -155,7 +155,7 @@ impl LocalCluster {
) -> Result<()> {
// Create the vote account if necessary
if client.poll_get_balance(&vote_account).unwrap_or(0) == 0 {
let mut transaction = VoteTransaction::fund_staking_account(
let mut transaction = VoteTransaction::new_account(
from_account,
vote_account,
client.get_recent_blockhash(),

9
core/src/thin_client.rs
View File

@ -606,13 +606,8 @@ mod tests {
let vote_account_id = validator_vote_account_keypair.pubkey();
let blockhash = client.get_recent_blockhash();
let transaction = VoteTransaction::fund_staking_account(
&validator_keypair,
vote_account_id,
blockhash,
1,
1,
);
let transaction =
VoteTransaction::new_account(&validator_keypair, vote_account_id, blockhash, 1, 1);
let signature = client.transfer_signed(&transaction).unwrap();
client.poll_for_signature(&signature).unwrap();

9
core/src/voting_keypair.rs
View File

@ -110,13 +110,8 @@ pub mod tests {
num_tokens: u64,
) {
let blockhash = bank.last_blockhash();
let tx = VoteTransaction::fund_staking_account(
from_keypair,
*voting_pubkey,
blockhash,
num_tokens,
0,
);
let tx =
VoteTransaction::new_account(from_keypair, *voting_pubkey, blockhash, num_tokens, 0);
bank.process_transaction(&tx).unwrap();
}