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

CLI: --sign-only and --signer require --blockhash (#7982) (#7983)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2020-01-26 10:19:04 -08:00
committed by Grimes
parent 1a7db9c17e
commit c8472d0a96
3 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cli/src/cli.rs
View File

@ -2362,12 +2362,16 @@ mod tests {
); );
// Test Pay Subcommand w/ sign-only // Test Pay Subcommand w/ sign-only
let blockhash = Hash::default();
let blockhash_string = format!("{}", blockhash);
let test_pay = test_commands.clone().get_matches_from(vec![ let test_pay = test_commands.clone().get_matches_from(vec![
"test", "test",
"pay", "pay",
&pubkey_string, &pubkey_string,
"50", "50",
"lamports", "lamports",
"--blockhash",
&blockhash_string,
"--sign-only", "--sign-only",
]); ]);
assert_eq!( assert_eq!(
@ -2376,6 +2380,7 @@ mod tests {
command: CliCommand::Pay(PayCommand { command: CliCommand::Pay(PayCommand {
lamports: 50, lamports: 50,
to: pubkey, to: pubkey,
blockhash: Some(blockhash),
sign_only: true, sign_only: true,
..PayCommand::default() ..PayCommand::default()
}), }),
@ -2393,6 +2398,8 @@ mod tests {
&pubkey_string, &pubkey_string,
"50", "50",
"lamports", "lamports",
"--blockhash",
&blockhash_string,
"--signer", "--signer",
&signer1, &signer1,
]); ]);
@ -2402,6 +2409,7 @@ mod tests {
command: CliCommand::Pay(PayCommand { command: CliCommand::Pay(PayCommand {
lamports: 50, lamports: 50,
to: pubkey, to: pubkey,
blockhash: Some(blockhash),
signers: Some(vec![(key1, sig1)]), signers: Some(vec![(key1, sig1)]),
..PayCommand::default() ..PayCommand::default()
}), }),
@ -2419,6 +2427,8 @@ mod tests {
&pubkey_string, &pubkey_string,
"50", "50",
"lamports", "lamports",
"--blockhash",
&blockhash_string,
"--signer", "--signer",
&signer1, &signer1,
"--signer", "--signer",
@ -2430,6 +2440,7 @@ mod tests {
command: CliCommand::Pay(PayCommand { command: CliCommand::Pay(PayCommand {
lamports: 50, lamports: 50,
to: pubkey, to: pubkey,
blockhash: Some(blockhash),
signers: Some(vec![(key1, sig1), (key2, sig2)]), signers: Some(vec![(key1, sig1), (key2, sig2)]),
..PayCommand::default() ..PayCommand::default()
}), }),
@ -2438,8 +2449,6 @@ mod tests {
); );
// Test Pay Subcommand w/ Blockhash // Test Pay Subcommand w/ Blockhash
let blockhash = Hash::default();
let blockhash_string = format!("{}", blockhash);
let test_pay = test_commands.clone().get_matches_from(vec![ let test_pay = test_commands.clone().get_matches_from(vec![
"test", "test",
"pay", "pay",

2
cli/src/offline.rs
View File

@ -35,6 +35,7 @@ fn sign_only_arg<'a, 'b>() -> Arg<'a, 'b> {
Arg::with_name(SIGN_ONLY_ARG.name) Arg::with_name(SIGN_ONLY_ARG.name)
.long(SIGN_ONLY_ARG.long) .long(SIGN_ONLY_ARG.long)
.takes_value(false) .takes_value(false)
.requires(BLOCKHASH_ARG.name)
.help(SIGN_ONLY_ARG.help) .help(SIGN_ONLY_ARG.help)
} }
@ -44,6 +45,7 @@ fn signer_arg<'a, 'b>() -> Arg<'a, 'b> {
.takes_value(true) .takes_value(true)
.value_name("BASE58_PUBKEY=BASE58_SIG") .value_name("BASE58_PUBKEY=BASE58_SIG")
.validator(is_pubkey_sig) .validator(is_pubkey_sig)
.requires(BLOCKHASH_ARG.name)
.multiple(true) .multiple(true)
.help(SIGNER_ARG.help) .help(SIGNER_ARG.help)
} }

40
cli/src/stake.rs
View File

@ -1090,11 +1090,15 @@ mod tests {
} }
); );
// Test Authorize Subcommand w/ sign-only // Test Authorize Subcommand w/ sign-only
let blockhash = Hash::default();
let blockhash_string = format!("{}", blockhash);
let test_authorize = test_commands.clone().get_matches_from(vec![ let test_authorize = test_commands.clone().get_matches_from(vec![
"test", "test",
&subcommand, &subcommand,
&stake_account_string, &stake_account_string,
&stake_account_string, &stake_account_string,
"--blockhash",
&blockhash_string,
"--sign-only", "--sign-only",
]); ]);
assert_eq!( assert_eq!(
@ -1107,7 +1111,7 @@ mod tests {
authority: None, authority: None,
sign_only: true, sign_only: true,
signers: None, signers: None,
blockhash: None, blockhash: Some(blockhash),
nonce_account: None, nonce_account: None,
nonce_authority: None, nonce_authority: None,
}, },
@ -1123,6 +1127,8 @@ mod tests {
&subcommand, &subcommand,
&stake_account_string, &stake_account_string,
&stake_account_string, &stake_account_string,
"--blockhash",
&blockhash_string,
"--signer", "--signer",
&signer, &signer,
]); ]);
@ -1136,7 +1142,7 @@ mod tests {
authority: None, authority: None,
sign_only: false, sign_only: false,
signers: Some(vec![(keypair.pubkey(), sig)]), signers: Some(vec![(keypair.pubkey(), sig)]),
blockhash: None, blockhash: Some(blockhash),
nonce_account: None, nonce_account: None,
nonce_authority: None, nonce_authority: None,
}, },
@ -1152,6 +1158,8 @@ mod tests {
&subcommand, &subcommand,
&stake_account_string, &stake_account_string,
&stake_account_string, &stake_account_string,
"--blockhash",
&blockhash_string,
"--signer", "--signer",
&signer, &signer,
"--signer", "--signer",
@ -1167,7 +1175,7 @@ mod tests {
authority: None, authority: None,
sign_only: false, sign_only: false,
signers: Some(vec![(keypair.pubkey(), sig), (keypair2.pubkey(), sig2),]), signers: Some(vec![(keypair.pubkey(), sig), (keypair2.pubkey(), sig2),]),
blockhash: None, blockhash: Some(blockhash),
nonce_account: None, nonce_account: None,
nonce_authority: None, nonce_authority: None,
}, },
@ -1175,8 +1183,6 @@ mod tests {
} }
); );
// Test Authorize Subcommand w/ blockhash // Test Authorize Subcommand w/ blockhash
let blockhash = Hash::default();
let blockhash_string = format!("{}", blockhash);
let test_authorize = test_commands.clone().get_matches_from(vec![ let test_authorize = test_commands.clone().get_matches_from(vec![
"test", "test",
&subcommand, &subcommand,
@ -1451,6 +1457,8 @@ mod tests {
"delegate-stake", "delegate-stake",
&stake_account_string, &stake_account_string,
&vote_account_string, &vote_account_string,
"--blockhash",
&blockhash_string,
"--sign-only", "--sign-only",
]); ]);
assert_eq!( assert_eq!(
@ -1463,7 +1471,7 @@ mod tests {
force: false, force: false,
sign_only: true, sign_only: true,
signers: None, signers: None,
blockhash: None, blockhash: Some(blockhash),
nonce_account: None, nonce_account: None,
nonce_authority: None, nonce_authority: None,
}, },
@ -1480,6 +1488,8 @@ mod tests {
"delegate-stake", "delegate-stake",
&stake_account_string, &stake_account_string,
&vote_account_string, &vote_account_string,
"--blockhash",
&blockhash_string,
"--signer", "--signer",
&signer1, &signer1,
]); ]);
@ -1493,7 +1503,7 @@ mod tests {
force: false, force: false,
sign_only: false, sign_only: false,
signers: Some(vec![(key1, sig1)]), signers: Some(vec![(key1, sig1)]),
blockhash: None, blockhash: Some(blockhash),
nonce_account: None, nonce_account: None,
nonce_authority: None, nonce_authority: None,
}, },
@ -1510,6 +1520,8 @@ mod tests {
"delegate-stake", "delegate-stake",
&stake_account_string, &stake_account_string,
&vote_account_string, &vote_account_string,
"--blockhash",
&blockhash_string,
"--signer", "--signer",
&signer1, &signer1,
"--signer", "--signer",
@ -1525,7 +1537,7 @@ mod tests {
force: false, force: false,
sign_only: false, sign_only: false,
signers: Some(vec![(key1, sig1), (key2, sig2)]), signers: Some(vec![(key1, sig1), (key2, sig2)]),
blockhash: None, blockhash: Some(blockhash),
nonce_account: None, nonce_account: None,
nonce_authority: None, nonce_authority: None,
}, },
@ -1665,6 +1677,8 @@ mod tests {
"test", "test",
"deactivate-stake", "deactivate-stake",
&stake_account_string, &stake_account_string,
"--blockhash",
&blockhash_string,
"--sign-only", "--sign-only",
]); ]);
assert_eq!( assert_eq!(
@ -1675,7 +1689,7 @@ mod tests {
stake_authority: None, stake_authority: None,
sign_only: true, sign_only: true,
signers: None, signers: None,
blockhash: None, blockhash: Some(blockhash),
nonce_account: None, nonce_account: None,
nonce_authority: None, nonce_authority: None,
}, },
@ -1691,6 +1705,8 @@ mod tests {
"test", "test",
"deactivate-stake", "deactivate-stake",
&stake_account_string, &stake_account_string,
"--blockhash",
&blockhash_string,
"--signer", "--signer",
&signer1, &signer1,
]); ]);
@ -1702,7 +1718,7 @@ mod tests {
stake_authority: None, stake_authority: None,
sign_only: false, sign_only: false,
signers: Some(vec![(key1, sig1)]), signers: Some(vec![(key1, sig1)]),
blockhash: None, blockhash: Some(blockhash),
nonce_account: None, nonce_account: None,
nonce_authority: None, nonce_authority: None,
}, },
@ -1718,6 +1734,8 @@ mod tests {
"test", "test",
"deactivate-stake", "deactivate-stake",
&stake_account_string, &stake_account_string,
"--blockhash",
&blockhash_string,
"--signer", "--signer",
&signer1, &signer1,
"--signer", "--signer",
@ -1731,7 +1749,7 @@ mod tests {
stake_authority: None, stake_authority: None,
sign_only: false, sign_only: false,
signers: Some(vec![(key1, sig1), (key2, sig2)]), signers: Some(vec![(key1, sig1), (key2, sig2)]),
blockhash: None, blockhash: Some(blockhash),
nonce_account: None, nonce_account: None,
nonce_authority: None, nonce_authority: None,
}, },