Fix conflicts

solana-labs · Apr 1, 2021 · 4bf233d · 4bf233d
1 parent 9179504
commit 4bf233d
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/ledger/src/blockstore.rs b/ledger/src/blockstore.rs
@@ -2200,12 +2200,8 @@ impl Blockstore {
         let (slot, mut before_excluded_signatures) = match before {
             None => (highest_slot, None),
             Some(before) => {
-<<<<<<< HEAD
-                let transaction_status = self.get_transaction_status(before, true)?;
-=======
                 let transaction_status =
                     self.get_transaction_status(before, &confirmed_unrooted_slots)?;
->>>>>>> da27acabc... Rpc: enable getConfirmedSignaturesForAddress2 to return confirmed (not yet finalized) data (#16281)
                 match transaction_status {
                     None => return Ok(vec![]),
                     Some((slot, _)) => {
@@ -2255,12 +2251,8 @@ impl Blockstore {
         let (lowest_slot, until_excluded_signatures) = match until {
             None => (0, HashSet::new()),
             Some(until) => {
-<<<<<<< HEAD
-                let transaction_status = self.get_transaction_status(until, true)?;
-=======
                 let transaction_status =
                     self.get_transaction_status(until, &confirmed_unrooted_slots)?;
->>>>>>> da27acabc... Rpc: enable getConfirmedSignaturesForAddress2 to return confirmed (not yet finalized) data (#16281)
                 match transaction_status {
                     None => (0, HashSet::new()),
                     Some((slot, _)) => {
@@ -2404,12 +2396,8 @@ impl Blockstore {
         let mut get_status_info_timer = Measure::start("get_status_info_timer");
         let mut infos = vec![];
         for (slot, signature) in address_signatures.into_iter() {
-<<<<<<< HEAD
-            let transaction_status = self.get_transaction_status(signature, true)?;
-=======
             let transaction_status =
                 self.get_transaction_status(signature, &confirmed_unrooted_slots)?;
->>>>>>> da27acabc... Rpc: enable getConfirmedSignaturesForAddress2 to return confirmed (not yet finalized) data (#16281)
             let err = match transaction_status {
                 None => None,
                 Some((_slot, status)) => status.status.err(),