add TxDownloadOptions bool to make deterministic TxRequestTracker

Forward this bool to the TxRequestTracker ctor. This is needed for stablity in TxDownloadManager fuzzers
glozow · Sep 17, 2024 · 632e6a6 · 632e6a6
1 parent 60b3bbf
commit 632e6a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1891,7 +1891,7 @@ PeerManagerImpl::PeerManagerImpl(CConnman& connman, AddrMan& addrman,
       m_banman(banman),
       m_chainman(chainman),
       m_mempool(pool),
-      m_txdownloadman(node::TxDownloadOptions{pool, m_rng, opts.max_orphan_txs}),
+      m_txdownloadman(node::TxDownloadOptions{pool, m_rng, opts.max_orphan_txs, opts.deterministic_rng}),
       m_warnings{warnings},
       m_opts{opts}
 {

diff --git a/src/node/txdownloadman.h b/src/node/txdownloadman.h
@@ -45,6 +45,8 @@ struct TxDownloadOptions {
     FastRandomContext& m_rng;
     /** Maximum number of transactions allowed in orphanage. */
     const uint32_t m_max_orphan_txs;
+    /** Instantiate TxRequestTracker as deterministic (used for tests). */
+    bool m_deterministic_txrequest{false};
 };
 struct TxDownloadConnectionInfo {
     /** Whether this peer is preferred for transaction download. */

diff --git a/src/node/txdownloadman_impl.h b/src/node/txdownloadman_impl.h
@@ -128,7 +128,7 @@ class TxDownloadManagerImpl {
         return *m_lazy_recent_confirmed_transactions;
     }
 
-    TxDownloadManagerImpl(const TxDownloadOptions& options) : m_opts{options} {}
+    TxDownloadManagerImpl(const TxDownloadOptions& options) : m_opts{options}, m_txrequest{options.m_deterministic_txrequest} {}
 
     struct PeerInfo {
         /** Information relevant to scheduling tx requests. */