Merge 8662387309 into merged_master (Bitcoin PR #17997)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:56 +00:00
commit 5aa6af6fa3
6 changed files with 49 additions and 44 deletions

View file

@ -159,7 +159,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::string& fedp
m_node.mempool->setSanityCheck(1.0);
m_node.banman = MakeUnique<BanMan>(GetDataDir() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME);
m_node.connman = MakeUnique<CConnman>(0x1337, 0x1337); // Deterministic randomness for tests.
m_node.peer_logic = MakeUnique<PeerLogicValidation>(m_node.connman.get(), m_node.banman.get(), *m_node.scheduler);
m_node.peer_logic = MakeUnique<PeerLogicValidation>(m_node.connman.get(), m_node.banman.get(), *m_node.scheduler, *m_node.mempool);
}
TestingSetup::~TestingSetup()