Merge 147d50d63e into merged_master (Bitcoin PR #19791)

This commit is contained in:
Andrew Poelstra 2020-11-29 02:07:46 +00:00
commit b657dd4a3a
9 changed files with 147 additions and 123 deletions

View file

@ -194,10 +194,10 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::string& fedp
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, m_node.banman.get(), *m_node.scheduler, *m_node.chainman, *m_node.mempool);
m_node.peerman = MakeUnique<PeerManager>(chainparams, *m_node.connman, m_node.banman.get(), *m_node.scheduler, *m_node.chainman, *m_node.mempool);
{
CConnman::Options options;
options.m_msgproc = m_node.peer_logic.get();
options.m_msgproc = m_node.peerman.get();
m_node.connman->Init(options);
}
}