From ae71f2a1a929250ae86b9b851ebd052f670a7b70 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2019 08:22:07 -0700
Subject: [PATCH] Fix caching data shreds as coding shreds (#6877) (#6904)

(cherry picked from commit 5670cafda49f46eb9d42e966c760f6ab45020a67)
---
 ledger/src/blocktree.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/ledger/src/blocktree.rs b/ledger/src/blocktree.rs
index b4c0bee5bd..0a7f6283d1 100644
--- a/ledger/src/blocktree.rs
+++ b/ledger/src/blocktree.rs
@@ -505,7 +505,7 @@ impl Blocktree {
                             &mut index_working_set,
                             &mut slot_meta_working_set,
                             &mut write_batch,
-                            &mut just_inserted_coding_shreds,
+                            &mut just_inserted_data_shreds,
                             &mut index_meta_time,
                         );
                     }
@@ -684,12 +684,7 @@ impl Blocktree {
 
         // Assert guaranteed by integrity checks on the shred that happen before
         // `insert_coding_shred` is called
-        if shred.is_data() || shred_index < u64::from(shred.coding_header.position) {
-            error!("Due to earlier validation, shred index must be >= pos");
-            return Err(BlocktreeError::InvalidShredData(Box::new(
-                bincode::ErrorKind::Custom("shred index < pos".to_string()),
-            )));
-        }
+        assert!(shred.is_code() && shred_index >= u64::from(shred.coding_header.position));
 
         let set_index = shred_index - u64::from(shred.coding_header.position);
         let erasure_config = ErasureConfig::new(