finished refactoring relay

src/xrpld/overlay/detail/OverlayImpl.cpp

@@ -1212,28 +1212,30 @@ OverlayImpl::relay(
         relay = !isPseudoTx(STTx{sit});
     }
 
-    if (!relay) {
+    Overlay::PeerSequence peers = {};
+    std::size_t total = 0;
+    std::size_t disabled = 0;
+    std::size_t enabledInSkip = 0;
+
+    if (!relay)
+    {
         if (!app_.config().TX_REDUCE_RELAY_ENABLE)
             return;
-        auto peers = getActivePeers(toSkip, 0, 0, 0)
-        JLOG(journal_.trace()) << "not relaying tx, total peers " << peers.size();
+
+        peers = getActivePeers(toSkip, total, disabled, enabledInSkip);
+        JLOG(journal_.trace())
+            << "not relaying tx, total peers " << peers.size();
         for (auto const& p : peers)
             p->addTxQueue(hash);
         return;
-   }
+    }
 
     auto& txn = tx->get();
     sm = std::make_shared<Message>(txn, protocol::mtTRANSACTION);
-
-    std::size_t total = 0;
-    std::size_t disabled = 0;
-    std::size_t enabledInSkip = 0;
-
-    // total peers excluding peers in toSkip
-    auto peers = getActivePeers(toSkip, total, disabled, enabledInSkip);
+    peers = getActivePeers(toSkip, total, disabled, enabledInSkip);
     auto const minRelay = app_.config().TX_REDUCE_RELAY_MIN_PEERS + disabled;
 
-    if (relay && (!app_.config().TX_REDUCE_RELAY_ENABLE || total <= minRelay))
+    if (!app_.config().TX_REDUCE_RELAY_ENABLE || total <= minRelay)
     {
         for (auto const& p : peers)
             p->send(sm);
@@ -1268,12 +1270,10 @@ OverlayImpl::relay(
         // always relay to a peer with the disabled feature
         if (!p->txReduceRelayEnabled())
         {
-            if (relay)
-                p->send(sm);
+            p->send(sm);
         }
         else if (enabledAndRelayed < enabledTarget)
         {
-            assert(relay);
             enabledAndRelayed++;
             p->send(sm);
         }