From 00f92f520fd6f10d4983d1b57c25903f7fe5128a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 13 Feb 2020 10:43:55 -0800
Subject: [PATCH] get_confirmed_block: expect() less (#8266)

automerge
---
 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 06f314e662..20de86ce4e 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::<cf::SlotMeta>();
-            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(),