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

Verb-noun-ify Nonce API (#7925)

Browse Source 
* Verb-noun-ify Nonce API

* Unify instruction naming with API naming

The more verbose nonce_account/NonceAccount was chosen for clarity
that these instructions work on a unique species of system account
This commit is contained in:
Trent Nelson
2020-01-22 16:31:39 -07:00
committed by GitHub
parent 934c32cbc6
commit 964ff522be
7 changed files with 103 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/src/nonce_utils.rs
View File

@@ -39,7 +39,7 @@ pub fn get_nonce_pubkey_from_instruction<'a>(
})
}
pub fn verify_nonce(acc: &Account, hash: &Hash) -> bool {
pub fn verify_nonce_account(acc: &Account, hash: &Hash) -> bool {
match acc.state() {
Ok(NonceState::Initialized(_meta, ref nonce)) => hash == nonce,
_ => false,
@@ -93,7 +93,7 @@ mod tests {
let tx = Transaction::new_signed_instructions(
&[&from_keypair, &nonce_keypair],
vec![
system_instruction::nonce_advance(&nonce_pubkey, &nonce_pubkey),
system_instruction::advance_nonce_account(&nonce_pubkey, &nonce_pubkey),
system_instruction::transfer(&from_pubkey, &nonce_pubkey, 42),
],
Hash::default(),
@@ -131,7 +131,7 @@ mod tests {
&[&from_keypair, &nonce_keypair],
vec![
system_instruction::transfer(&from_pubkey, &nonce_pubkey, 42),
system_instruction::nonce_advance(&nonce_pubkey, &nonce_pubkey),
system_instruction::advance_nonce_account(&nonce_pubkey, &nonce_pubkey),
],
Hash::default(),
);
@@ -147,7 +147,12 @@ mod tests {
let tx = Transaction::new_signed_instructions(
&[&from_keypair, &nonce_keypair],
vec![
system_instruction::nonce_withdraw(&nonce_pubkey, &nonce_pubkey, &from_pubkey, 42),
system_instruction::withdraw_nonce_account(
&nonce_pubkey,
&nonce_pubkey,
&from_pubkey,
42,
),
system_instruction::transfer(&from_pubkey, &nonce_pubkey, 42),
],
Hash::default(),
@@ -194,9 +199,9 @@ mod tests {
let recent_blockhashes = create_test_recent_blockhashes(0);
let authorized = nonce_account.unsigned_key().clone();
nonce_account
.nonce_initialize(&authorized, &recent_blockhashes, &Rent::free())
.initialize_nonce_account(&authorized, &recent_blockhashes, &Rent::free())
.unwrap();
assert!(verify_nonce(
assert!(verify_nonce_account(
&nonce_account.account.borrow(),
&recent_blockhashes[0]
));
@@ -206,7 +211,7 @@ mod tests {
#[test]
fn verify_nonce_bad_acc_state_fail() {
with_test_keyed_account(42, true, |nonce_account| {
assert!(!verify_nonce(
assert!(!verify_nonce_account(
&nonce_account.account.borrow(),
&Hash::default()
));
@@ -224,9 +229,9 @@ mod tests {
let recent_blockhashes = create_test_recent_blockhashes(0);
let authorized = nonce_account.unsigned_key().clone();
nonce_account
.nonce_initialize(&authorized, &recent_blockhashes, &Rent::free())
.initialize_nonce_account(&authorized, &recent_blockhashes, &Rent::free())
.unwrap();
assert!(!verify_nonce(
assert!(!verify_nonce_account(
&nonce_account.account.borrow(),
&recent_blockhashes[1]
));