Remove dead code in Herder

Author: marta-lokhova

src/herder/HerderImpl.cpp

@@ -504,7 +504,7 @@ HerderImpl::broadcast(SCPEnvelope const& e)
                    e.statement.slotIndex);
 
         mSCPMetrics.mEnvelopeEmit.Mark();
-        mApp.getOverlayManager().broadcastMessage(m, false);
+        mApp.getOverlayManager().broadcastMessage(m);
     }
 }
 

src/herder/TransactionQueue.cpp

@@ -1115,7 +1115,7 @@ TransactionQueue::broadcastTx(AccountState& state, TimestampedTx& tx)
         return BroadcastStatus::BROADCAST_STATUS_SKIPPED;
     }
     return mApp.getOverlayManager().broadcastMessage(
-               tx.mTx->toStellarMessage(), false,
+               tx.mTx->toStellarMessage(),
                std::make_optional<Hash>(tx.mTx->getFullHash()))
                ? BroadcastStatus::BROADCAST_STATUS_SUCCESS
                : BroadcastStatus::BROADCAST_STATUS_ALREADY;

src/overlay/Floodgate.cpp

@@ -85,8 +85,7 @@ Floodgate::addRecord(StellarMessage const& msg, Peer::pointer peer, Hash& index)
 
 // send message to anyone you haven't gotten it from
 bool
-Floodgate::broadcast(StellarMessage const& msg, bool force,
-                     std::optional<Hash> const& hash)
+Floodgate::broadcast(StellarMessage const& msg, std::optional<Hash> const& hash)
 {
     ZoneScoped;
     if (mShuttingDown)
@@ -102,7 +101,7 @@ Floodgate::broadcast(StellarMessage const& msg, bool force,
 
     FloodRecord::pointer fr;
     auto result = mFloodMap.find(index);
-    if (result == mFloodMap.end() || force)
+    if (result == mFloodMap.end())
     { // no one has sent us this message / start from scratch
         fr = std::make_shared<FloodRecord>(
             mApp.getHerder().trackingConsensusLedgerIndex(), Peer::pointer());

src/overlay/Floodgate.h

@@ -60,7 +60,7 @@ class Floodgate
 
     // returns true if msg was sent to at least one peer
     // The hash required for transactions
-    bool broadcast(StellarMessage const& msg, bool force,
+    bool broadcast(StellarMessage const& msg,
                    std::optional<Hash> const& hash = std::nullopt);
 
     // returns the list of peers that sent us the item with hash `msgID`

src/overlay/OverlayManager.h

@@ -77,7 +77,7 @@ class OverlayManager
     // When passing a transaction message,
     // the hash of TransactionEnvelope must be passed also for pull mode.
     virtual bool
-    broadcastMessage(StellarMessage const& msg, bool force = false,
+    broadcastMessage(StellarMessage const& msg,
                      std::optional<Hash> const hash = std::nullopt) = 0;
 
     // Make a note in the FloodGate that a given peer has provided us with a

src/overlay/OverlayManagerImpl.cpp

@@ -1151,11 +1151,11 @@ OverlayManagerImpl::forgetFloodedMsg(Hash const& msgID)
 }
 
 bool
-OverlayManagerImpl::broadcastMessage(StellarMessage const& msg, bool force,
+OverlayManagerImpl::broadcastMessage(StellarMessage const& msg,
                                      std::optional<Hash> const hash)
 {
     ZoneScoped;
-    auto res = mFloodGate.broadcast(msg, force, hash);
+    auto res = mFloodGate.broadcast(msg, hash);
     if (res)
     {
         mOverlayMetrics.mMessagesBroadcast.Mark();

src/overlay/OverlayManagerImpl.h

@@ -139,7 +139,7 @@ class OverlayManagerImpl : public OverlayManager
                           Hash& msgID) override;
     void forgetFloodedMsg(Hash const& msgID) override;
     bool
-    broadcastMessage(StellarMessage const& msg, bool force = false,
+    broadcastMessage(StellarMessage const& msg,
                      std::optional<Hash> const hash = std::nullopt) override;
     void connectTo(PeerBareAddress const& address) override;
 

src/overlay/SurveyManager.cpp

@@ -345,7 +345,7 @@ SurveyManager::processTopologyRequest(SurveyRequestMessage const& request) const
 void
 SurveyManager::broadcast(StellarMessage const& msg) const
 {
-    mApp.getOverlayManager().broadcastMessage(msg, false);
+    mApp.getOverlayManager().broadcastMessage(msg);
 }
 
 void

src/overlay/test/FloodTests.cpp

@@ -160,7 +160,7 @@ TEST_CASE("Flooding", "[flood][overlay][acceptance]")
             auto msg = tx1->toStellarMessage();
             auto res = inApp->getHerder().recvTransaction(tx1, false);
             REQUIRE(res == TransactionQueue::AddResult::ADD_STATUS_PENDING);
-            inApp->getOverlayManager().broadcastMessage(msg, false,
+            inApp->getOverlayManager().broadcastMessage(msg,
                                                         tx1->getFullHash());
         };
 
@@ -277,7 +277,7 @@ TEST_CASE("Flooding", "[flood][overlay][acceptance]")
                         auto before =
                             overlaytestutils::getAdvertisedHashCount(node);
                         node->getOverlayManager().broadcastMessage(
-                            testTransaction->toStellarMessage(), false,
+                            testTransaction->toStellarMessage(),
                             testTransaction->getFullHash());
                         REQUIRE(before ==
                                 overlaytestutils::getAdvertisedHashCount(node));
@@ -301,7 +301,7 @@ TEST_CASE("Flooding", "[flood][overlay][acceptance]")
                         auto before =
                             overlaytestutils::getAdvertisedHashCount(node);
                         node->getOverlayManager().broadcastMessage(
-                            testTransaction->toStellarMessage(), false,
+                            testTransaction->toStellarMessage(),
                             testTransaction->getFullHash());
 
                         REQUIRE(before + 1 ==

src/overlay/test/OverlayManagerTests.cpp

@@ -295,7 +295,7 @@ class OverlayManagerTests
             }
         }
         auto broadcastTxnMsg = [&](auto msg) {
-            pm.broadcastMessage(msg, false, xdrSha256(msg.transaction()));
+            pm.broadcastMessage(msg, xdrSha256(msg.transaction()));
         };
         broadcastTxnMsg(AtoB);
         crank(10);

src/simulation/LoadGenerator.cpp

@@ -2027,8 +2027,7 @@ LoadGenerator::execute(TransactionFramePtr& txf, LoadGenMode mode,
     }
     else
     {
-        mApp.getOverlayManager().broadcastMessage(msg, false,
-                                                  txf->getFullHash());
+        mApp.getOverlayManager().broadcastMessage(msg, txf->getFullHash());
     }
 
     return status;