fix conflicts

solana-labs · Jan 5, 2024 · 1c96c17 · 1c96c17
1 parent a1d2f04
commit 1c96c17
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/ledger/src/blockstore.rs b/ledger/src/blockstore.rs
@@ -193,12 +193,8 @@ pub struct Blockstore {
     program_costs_cf: LedgerColumn<cf::ProgramCosts>,
     bank_hash_cf: LedgerColumn<cf::BankHash>,
     optimistic_slots_cf: LedgerColumn<cf::OptimisticSlots>,
-<<<<<<< HEAD
-    last_root: RwLock<Slot>,
-=======
-    max_root: AtomicU64,
     merkle_root_meta_cf: LedgerColumn<cf::MerkleRootMeta>,
->>>>>>> e457c02879 (add merkle root meta column to blockstore (#33979))
+    last_root: RwLock<Slot>,
     insert_shreds_lock: Mutex<()>,
     new_shreds_signals: Mutex<Vec<Sender<bool>>>,
     completed_slots_senders: Mutex<Vec<CompletedSlotsSender>>,

diff --git a/ledger/src/blockstore_db.rs b/ledger/src/blockstore_db.rs
@@ -1107,7 +1107,7 @@ impl Column for columns::MerkleRootMeta {
         key
     }
 
-    fn slot((slot, _fec_set_index): Self::Index) -> Slot {
+    fn primary_index((slot, _fec_set_index): Self::Index) -> Slot {
         slot
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1107,7 +1107,7 @@ impl Column for columns::MerkleRootMeta { @@
             key
         }
-        fn slot((slot, _fec_set_index): Self::Index) -> Slot {
+        fn primary_index((slot, _fec_set_index): Self::Index) -> Slot {
             slot
         }
@@ Expand Down @@