Simplify some pattern-matches (#16402)
When those match an exact combinator on Option / Result. Tool-aided by [comby-rust](https://github.com/huitseeker/comby-rust).
This commit is contained in:
committed by
GitHub
parent
bb9d2fd07a
commit
b08cff9e77
@ -2424,10 +2424,7 @@ impl Blockstore {
|
||||
for (slot, signature) in address_signatures.into_iter() {
|
||||
let transaction_status =
|
||||
self.get_transaction_status(signature, &confirmed_unrooted_slots)?;
|
||||
let err = match transaction_status {
|
||||
None => None,
|
||||
Some((_slot, status)) => status.status.err(),
|
||||
};
|
||||
let err = transaction_status.and_then(|(_slot, status)| status.status.err());
|
||||
let block_time = self.get_block_time(slot)?;
|
||||
infos.push(ConfirmedTransactionStatusWithSignature {
|
||||
signature,
|
||||
@ -3185,10 +3182,8 @@ fn find_slot_meta_in_cached_state<'a>(
|
||||
) -> Option<Rc<RefCell<SlotMeta>>> {
|
||||
if let Some(entry) = working_set.get(&slot) {
|
||||
Some(entry.new_slot_meta.clone())
|
||||
} else if let Some(entry) = chained_slots.get(&slot) {
|
||||
Some(entry.clone())
|
||||
} else {
|
||||
None
|
||||
chained_slots.get(&slot).cloned()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -212,10 +212,8 @@ impl LeaderScheduleCache {
|
||||
let epoch_schedule = self.get_epoch_leader_schedule(epoch);
|
||||
if epoch_schedule.is_some() {
|
||||
epoch_schedule
|
||||
} else if let Some(epoch_schedule) = self.compute_epoch_schedule(epoch, bank) {
|
||||
Some(epoch_schedule)
|
||||
} else {
|
||||
None
|
||||
self.compute_epoch_schedule(epoch, bank)
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user