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

Rename Bank.last_id() to Bank.last_block_hash()

Browse Source
This commit is contained in:
Michael Vines
2019-03-02 10:05:31 -08:00
committed by Greg Fitzgerald
parent 95cbb8a5c0
commit 2bfad87a5f
18 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
programs/native/rewards/tests/rewards.rs
View File

@ -24,7 +24,7 @@ impl<'a> RewardsBank<'a> {
rewards_id: Pubkey,
lamports: u64,
) -> Result<()> {
let last_id = self.bank.last_id();
let last_id = self.bank.last_block_hash();
let tx = RewardsTransaction::new_account(from_keypair, rewards_id, last_id, lamports, 0);
self.bank.process_transaction(&tx)
}
@ -35,13 +35,13 @@ impl<'a> RewardsBank<'a> {
vote_id: Pubkey,
lamports: u64,
) -> Result<()> {
let last_id = self.bank.last_id();
let last_id = self.bank.last_block_hash();
let tx = VoteTransaction::fund_staking_account(from_keypair, vote_id, last_id, lamports, 0);
self.bank.process_transaction(&tx)
}
fn submit_vote(&self, vote_keypair: &Keypair, tick_height: u64) -> Result<VoteState> {
let last_id = self.bank.last_id();
let last_id = self.bank.last_block_hash();
let tx = VoteTransaction::new_vote(vote_keypair, tick_height, last_id, 0);
self.bank.process_transaction(&tx)?;
self.bank.register_tick(&hash(last_id.as_ref()));
@ -51,7 +51,7 @@ impl<'a> RewardsBank<'a> {
}
fn redeem_credits(&self, rewards_id: Pubkey, vote_keypair: &Keypair) -> Result<VoteState> {
let last_id = self.bank.last_id();
let last_id = self.bank.last_block_hash();
let tx = RewardsTransaction::new_redeem_credits(&vote_keypair, rewards_id, last_id, 0);
self.bank.process_transaction(&tx)?;
let vote_account = self.bank.get_account(&vote_keypair.pubkey()).unwrap();

6
programs/native/vote/tests/vote.rs
View File

@ -26,13 +26,13 @@ impl<'a> VoteBank<'a> {
vote_id: Pubkey,
lamports: u64,
) -> Result<()> {
let last_id = self.bank.last_id();
let last_id = self.bank.last_block_hash();
let tx = VoteTransaction::fund_staking_account(from_keypair, vote_id, last_id, lamports, 0);
self.bank.process_transaction(&tx)
}
fn submit_vote(&self, vote_keypair: &Keypair, tick_height: u64) -> Result<VoteState> {
let last_id = self.bank.last_id();
let last_id = self.bank.last_block_hash();
let tx = VoteTransaction::new_vote(vote_keypair, tick_height, last_id, 0);
self.bank.process_transaction(&tx)?;
self.bank.register_tick(&hash(last_id.as_ref()));
@ -71,7 +71,7 @@ fn test_vote_via_bank_with_no_signature() {
.unwrap();
let mallory_id = mallory_keypair.pubkey();
let last_id = bank.last_id();
let last_id = bank.last_block_hash();
let vote_ix = BuilderInstruction::new(
vote_program::id(),
&VoteInstruction::Vote(Vote::new(0)),

16
programs/tests/programs.rs
View File

@ -15,7 +15,7 @@ fn load_program(bank: &Bank, from: &Keypair, loader_id: Pubkey, program: Vec<u8>
let tx = SystemTransaction::new_program_account(
from,
program_account.pubkey(),
bank.last_id(),
bank.last_block_hash(),
1,
program.len() as u64,
loader_id,
@ -32,14 +32,14 @@ fn load_program(bank: &Bank, from: &Keypair, loader_id: Pubkey, program: Vec<u8>
loader_id,
offset,
chunk.to_vec(),
bank.last_id(),
bank.last_block_hash(),
0,
);
bank.process_transaction(&tx).unwrap();
offset += chunk_size as u32;
}
let tx = LoaderTransaction::new_finalize(&program_account, loader_id, bank.last_id(), 0);
let tx = LoaderTransaction::new_finalize(&program_account, loader_id, bank.last_block_hash(), 0);
bank.process_transaction(&tx).unwrap();
assert_eq!(bank.get_signature_status(&tx.signatures[0]), Some(Ok(())));
@ -57,7 +57,7 @@ fn test_program_native_noop() {
let program_id = load_program(&bank, &mint_keypair, native_loader::id(), program);
// Call user program
let tx = Transaction::new(&mint_keypair, &[], program_id, &1u8, bank.last_id(), 0);
let tx = Transaction::new(&mint_keypair, &[], program_id, &1u8, bank.last_block_hash(), 0);
bank.process_transaction(&tx).unwrap();
assert_eq!(bank.get_signature_status(&tx.signatures[0]), Some(Ok(())));
}
@ -73,7 +73,7 @@ fn test_program_native_failure() {
let program_id = load_program(&bank, &mint_keypair, native_loader::id(), program);
// Call user program
let tx = Transaction::new(&mint_keypair, &[], program_id, &1u8, bank.last_id(), 0);
let tx = Transaction::new(&mint_keypair, &[], program_id, &1u8, bank.last_block_hash(), 0);
assert_eq!(
bank.process_transaction(&tx),
Err(BankError::ProgramError(0, ProgramError::GenericError))
@ -126,7 +126,7 @@ fn test_program_bpf_c_noop() {
&[],
program_id,
&vec![1u8],
bank.last_id(),
bank.last_block_hash(),
0,
);
bank.process_transaction(&tx).unwrap();
@ -170,7 +170,7 @@ fn test_program_bpf_c() {
&[],
program_id,
&vec![1u8],
bank.last_id(),
bank.last_block_hash(),
0,
);
bank.process_transaction(&tx).unwrap();
@ -210,7 +210,7 @@ fn test_program_bpf_rust() {
&[],
program_id,
&vec![1u8],
bank.last_id(),
bank.last_block_hash(),
0,
);
bank.process_transaction(&tx).unwrap();