SCP : replace low/high slot lookup by callback

graydon · Jan 16, 2020 · 5e02356 · 5e02356
1 parent f31df63
commit 5e02356
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 39 deletions.
diff --git a/src/herder/HerderImpl.cpp b/src/herder/HerderImpl.cpp
@@ -515,31 +515,16 @@ HerderImpl::recvSCPEnvelope(SCPEnvelope const& envelope,
 void
 HerderImpl::sendSCPStateToPeer(uint32 ledgerSeq, Peer::pointer peer)
 {
-    if (getSCP().empty())
-    {
-        return;
-    }
-
-    if (getSCP().getLowSlotIndex() > std::numeric_limits<uint32_t>::max() ||
-        getSCP().getHighSlotIndex() >= std::numeric_limits<uint32_t>::max())
-    {
-        return;
-    }
-
-    auto minSeq =
-        std::max(ledgerSeq, static_cast<uint32_t>(getSCP().getLowSlotIndex()));
-    auto maxSeq = static_cast<uint32_t>(getSCP().getHighSlotIndex());
-
-    for (uint32_t seq = minSeq; seq <= maxSeq; seq++)
-    {
+    getSCP().processSlotsAscendingFrom(ledgerSeq, [&](uint64 seq) {
         getSCP().processCurrentState(seq, [&](SCPEnvelope const& e) {
             StellarMessage m;
             m.type(SCP_MESSAGE);
             m.envelope() = e;
             peer->sendMessage(m);
             return true;
         });
-    }
+        return true;
+    });
 }
 
 void

diff --git a/src/scp/SCP.cpp b/src/scp/SCP.cpp
@@ -216,22 +216,6 @@ SCP::empty() const
     return mKnownSlots.empty();
 }
 
-uint64
-SCP::getLowSlotIndex() const
-{
-    assert(!empty());
-    return mKnownSlots.begin()->first;
-}
-
-uint64
-SCP::getHighSlotIndex() const
-{
-    assert(!empty());
-    auto it = mKnownSlots.end();
-    it--;
-    return it->first;
-}
-
 void
 SCP::processCurrentState(uint64 slotIndex,
                          std::function<bool(SCPEnvelope const&)> const& f)
@@ -243,6 +227,20 @@ SCP::processCurrentState(uint64 slotIndex,
     }
 }
 
+void
+SCP::processSlotsAscendingFrom(uint64 startingSlot,
+                               std::function<bool(uint64)> const& f)
+{
+    for (auto iter = mKnownSlots.lower_bound(startingSlot);
+         iter != mKnownSlots.end(); ++iter)
+    {
+        if (!f(iter->first))
+        {
+            break;
+        }
+    }
+}
+
 SCPEnvelope const*
 SCP::getLatestMessage(NodeID const& id)
 {
@@ -384,4 +382,4 @@ SCP::envToStr(SCPStatement const& st, bool fullKeys) const
     oss << " }";
     return oss.str();
 }
-}
+}
diff --git a/src/scp/SCP.h b/src/scp/SCP.h
@@ -100,16 +100,16 @@ class SCP
 
     // check if we are holding some slots
     bool empty() const;
-    // return lowest slot index value
-    uint64 getLowSlotIndex() const;
-    // return highest slot index value
-    uint64 getHighSlotIndex() const;
 
     // invokes f for all latest messages
     // f returns false to stop processing, true otherwise
     void processCurrentState(uint64 slotIndex,
                              std::function<bool(SCPEnvelope const&)> const& f);
 
+    // iterates through slots, starting from ledgerSeq
+    void processSlotsAscendingFrom(uint64 startIndex,
+                                   std::function<bool(uint64)> const& f);
+
     // returns the latest message from a node
     // or nullptr if not found
     SCPEnvelope const* getLatestMessage(NodeID const& id);