blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure --identity is provided when --vote-account is provided (#9014) 

automerge
This commit is contained in:
Michael Vines 2020-03-22 22:21:00 -07:00 committed by GitHub
parent b08f8d3103
commit ca791a0378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
validator/src/main.rs
View File

@ -276,7 +276,7 @@ fn check_vote_account(
) -> Result<(), String> {
let found_vote_account = rpc_client
.get_account(vote_pubkey)
.map_err(|err| format!("Failed to get vote account: {}", err.to_string()))?;
.map_err(|err| format!("Vote account not found: {}", err.to_string()))?;
if found_vote_account.owner != solana_vote_program::id() {
return Err(format!(
@ -287,7 +287,7 @@ fn check_vote_account(
let found_node_account = rpc_client
.get_account(node_pubkey)
.map_err(|err| format!("Failed to get identity account: {}", err.to_string()))?;
.map_err(|err| format!("Identity account not found: {}", err.to_string()))?;
let found_vote_account = solana_vote_program::vote_state::VoteState::from(&found_vote_account);
if let Some(found_vote_account) = found_vote_account {
@ -378,6 +378,7 @@ pub fn main() {
.value_name("PATH")
.takes_value(true)
.validator(is_keypair_or_ask_keyword)
.requires("vote_account")
.help("Authorized voter keypair [default: value of --identity]"),
)
.arg(
@ -395,6 +396,7 @@ pub fn main() {
.value_name("PUBKEY")
.takes_value(true)
.validator(is_pubkey_or_keypair)
.requires("identity")
.help("Validator vote account public key. If unspecified voting will be disabled")
)
.arg(