Skip to content

Commit b9e20f4

Browse files
kwvgkwvg
committed
refactor: introduce MakePeerManager() helper for test setup
We are going to modify PeerManager multiple times, this should make the diffs that'll attract smaller.
1 parent 6b811c2 commit b9e20f4

File tree

4 files changed

+26
-31
lines changed

4 files changed

+26
-31
lines changed

‎src/test/denialofservice_tests.cpp‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,7 @@ BOOST_AUTO_TEST_CASE(stale_tip_peer_management)
148148
NodeId id{0};
149149
const CChainParams& chainparams = Params();
150150
auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
151-
auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
152-
*m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
153-
*m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
154-
/*active_ctx=*/nullptr, /*cj_walletman=*/nullptr, m_node.llmq_ctx,
155-
/*ignore_incoming_txs=*/false);
151+
auto peerLogic = MakePeerManager(*connman, m_node, /*banman=*/nullptr, /*mn_activeman=*/nullptr, chainparams, /*ignore_incoming_txs=*/false);
156152

157153
constexpr int max_outbound_full_relay = MAX_OUTBOUND_FULL_RELAY_CONNECTIONS;
158154
CConnman::Options options;
@@ -253,11 +249,7 @@ BOOST_AUTO_TEST_CASE(block_relay_only_eviction)
253249
NodeId id{0};
254250
const CChainParams& chainparams = Params();
255251
auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
256-
auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
257-
*m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
258-
*m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
259-
/*active_ctx=*/nullptr, /*cj_walletman=*/nullptr, m_node.llmq_ctx,
260-
/*ignore_incoming_txs=*/false);
252+
auto peerLogic = MakePeerManager(*connman, m_node, /*banman=*/nullptr, /*mn_activeman=*/nullptr, chainparams, /*ignore_incoming_txs=*/false);
261253

262254
constexpr int max_outbound_block_relay{MAX_BLOCK_RELAY_ONLY_CONNECTIONS};
263255
constexpr int64_t MINIMUM_CONNECT_TIME{30};
@@ -321,11 +313,7 @@ BOOST_AUTO_TEST_CASE(peer_discouragement)
321313
const CChainParams& chainparams = Params();
322314
auto banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist", nullptr, DEFAULT_MISBEHAVING_BANTIME);
323315
auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
324-
auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(), *m_node.dstxman,
325-
*m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
326-
*m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
327-
/*active_ctx=*/nullptr, /*cj_walletman=*/nullptr, m_node.llmq_ctx,
328-
/*ignore_incoming_txs=*/false);
316+
auto peerLogic = MakePeerManager(*connman, m_node, banman.get(), /*mn_activeman=*/nullptr, chainparams, /*ignore_incoming_txs=*/false);
329317

330318
CNetAddr tor_netaddr;
331319
BOOST_REQUIRE(
@@ -427,11 +415,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
427415
const CChainParams& chainparams = Params();
428416
auto banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist", nullptr, DEFAULT_MISBEHAVING_BANTIME);
429417
auto connman = std::make_unique<CConnman>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
430-
auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(), *m_node.dstxman,
431-
*m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
432-
*m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
433-
/*active_ctx=*/nullptr, /*cj_walletman=*/nullptr, m_node.llmq_ctx,
434-
/*ignore_incoming_txs=*/false);
418+
auto peerLogic = MakePeerManager(*connman, m_node, banman.get(), /*mn_activeman=*/nullptr, chainparams, /*ignore_incoming_txs=*/false);
435419

436420
banman->ClearBanned();
437421
int64_t nStartTime = GetTime();

‎src/test/net_peer_connection_tests.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,7 @@ BOOST_AUTO_TEST_CASE(test_addnode_getaddednodeinfo_and_connection_detection)
8585
{
8686
const auto& chainparams = Params();
8787
auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
88-
auto peerman = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
89-
*m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
90-
*m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
91-
/*active_ctx=*/nullptr, /*cj_walletman=*/nullptr, m_node.llmq_ctx,
92-
/*ignore_incoming_txs=*/false);
88+
auto peerman = MakePeerManager(*connman, m_node, /*banman=*/nullptr, /*mn_activeman=*/nullptr, chainparams, /*ignore_incoming_txs=*/false);
9389
NodeId id{0};
9490
std::vector<CNode*> nodes;
9591

‎src/test/util/setup_common.cpp‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,18 @@ std::ostream& operator<<(std::ostream& os, const uint256& num)
127127
return os;
128128
}
129129

130+
std::unique_ptr<PeerManager> MakePeerManager(CConnman& connman,
131+
NodeContext& node,
132+
BanMan* banman,
133+
CActiveMasternodeManager* mn_activeman,
134+
const CChainParams& chainparams,
135+
bool ignore_incoming_txs)
136+
{
137+
return PeerManager::make(chainparams, connman, *node.addrman, banman, *node.dstxman, *node.chainman, *node.mempool, *node.mn_metaman,
138+
*node.mn_sync, *node.govman, *node.sporkman, mn_activeman, node.dmnman, /*active_ctx=*/nullptr,
139+
node.cj_walletman.get(), node.llmq_ctx, ignore_incoming_txs);
140+
}
141+
130142
void DashChainstateSetup(ChainstateManager& chainman,
131143
NodeContext& node,
132144
bool llmq_dbs_in_memory,
@@ -374,11 +386,8 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
374386
#endif // ENABLE_WALLET
375387

376388
m_node.banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist", nullptr, DEFAULT_MISBEHAVING_BANTIME);
377-
m_node.peerman = PeerManager::make(chainparams, *m_node.connman, *m_node.addrman, m_node.banman.get(), *m_node.dstxman,
378-
*m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
379-
*m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
380-
/*active_ctx=*/nullptr, m_node.cj_walletman.get(), m_node.llmq_ctx,
381-
/*ignore_incoming_txs=*/false);
389+
m_node.peerman = MakePeerManager(*m_node.connman, m_node, m_node.banman.get(), /*mn_activeman=*/nullptr, chainparams,
390+
/*ignore_incoming_txs=*/false);
382391
{
383392
CConnman::Options options;
384393
options.m_msgproc = m_node.peerman.get();

‎src/test/util/setup_common.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,13 @@ static inline bool InsecureRandBool() { return g_insecure_rand_ctx.randbool(); }
8585

8686
static constexpr CAmount CENT{1000000};
8787

88-
/** Initialize Dash-specific components during chainstate initialization (NodeContext-friendly aliases) */
88+
/** Initialize components during initialization (NodeContext-friendly aliases) */
89+
std::unique_ptr<PeerManager> MakePeerManager(CConnman& connman,
90+
node::NodeContext& node,
91+
BanMan* banman,
92+
CActiveMasternodeManager* mn_activeman,
93+
const CChainParams& chainparams,
94+
bool ignore_incoming_txs);
8995
void DashChainstateSetup(ChainstateManager& chainman,
9096
node::NodeContext& node,
9197
bool llmq_dbs_in_memory,

0 commit comments

Comments
 (0)