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

Don't abort for missing epoch rewards; intead display warn (#13457)

Browse Source
This commit is contained in:
Ryo Onodera
2020-11-07 18:32:29 +09:00
committed by Michael Vines
parent fa32b4a848
commit d58e2f1c68
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cli/src/stake.rs
View File

@ -1722,11 +1722,12 @@ pub fn process_show_stake_account(
if state.stake_type == CliStakeType::Stake { if state.stake_type == CliStakeType::Stake {
if let Some(activation_epoch) = state.activation_epoch { if let Some(activation_epoch) = state.activation_epoch {
state.epoch_rewards = Some(fetch_epoch_rewards( let rewards =
rpc_client, fetch_epoch_rewards(rpc_client, stake_account_address, activation_epoch);
stake_account_address, match rewards {
activation_epoch, Ok(rewards) => state.epoch_rewards = Some(rewards),
)?); Err(error) => eprintln!("Failed to fetch epoch rewards: {:?}", error),
};
} }
} }
Ok(config.output_format.formatted_string(&state)) Ok(config.output_format.formatted_string(&state))

13
cli/src/vote.rs
View File

@ -696,11 +696,14 @@ pub fn process_show_vote_account(
} }
} }
let epoch_rewards = Some(crate::stake::fetch_epoch_rewards( let epoch_rewards = match crate::stake::fetch_epoch_rewards(rpc_client, vote_account_address, 1)
rpc_client, {
vote_account_address, Ok(rewards) => Some(rewards),
1, Err(error) => {
)?); eprintln!("Failed to fetch epoch rewards: {:?}", error);
None
}
};
let vote_account_data = CliVoteAccount { let vote_account_data = CliVoteAccount {
account_balance: vote_account.lamports, account_balance: vote_account.lamports,