From ab475e48490ccf4a967e12e8ee56ee94ed07d13d Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Wed, 12 Feb 2020 17:53:00 -0700 Subject: [PATCH] get_confirmed_block: expect() less --- ledger/src/blockstore.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ledger/src/blockstore.rs b/ledger/src/blockstore.rs index 8d657e073a..ddde3479a3 100644 --- a/ledger/src/blockstore.rs +++ b/ledger/src/blockstore.rs @@ -1387,9 +1387,13 @@ impl Blockstore { let encoding = encoding.unwrap_or(RpcTransactionEncoding::Json); if self.is_root(slot) { let slot_meta_cf = self.db.column::(); - let slot_meta = slot_meta_cf - .get(slot)? - .expect("Rooted slot must exist in SlotMeta"); + let slot_meta = match slot_meta_cf.get(slot)? { + Some(slot_meta) => slot_meta, + None => { + info!("SlotMeta not found for rooted slot {}", slot); + return Err(BlockstoreError::SlotCleanedUp); + } + }; let slot_entries = self.get_slot_entries(slot, 0, None)?; if !slot_entries.is_empty() { @@ -1407,11 +1411,7 @@ impl Blockstore { let blockhash = get_last_hash(slot_entries.iter()) .unwrap_or_else(|| panic!("Rooted slot {:?} must have blockhash", slot)); - let rewards = self - .rewards_cf - .get(slot) - .expect("Expect rewards get to succeed") - .unwrap_or_else(|| vec![]); + let rewards = self.rewards_cf.get(slot)?.unwrap_or_else(|| vec![]); let block = RpcConfirmedBlock { previous_blockhash: previous_blockhash.to_string(),