GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge d6e0d78c31 into merged_master (Bitcoin PR bitcoin/bitcoin#20966)

Browse source
This commit is contained in:
Andrew Poelstra 2021-07-28 14:05:54 +00:00
commit e8b84fa091
10 changed files with 193 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/util/setup_common.cpp
View file

@ -221,7 +221,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::string& fedp
}
m_node.addrman = std::make_unique<CAddrMan>();
m_node.banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME);
m_node.banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist", nullptr, DEFAULT_MISBEHAVING_BANTIME);
m_node.connman = std::make_unique<CConnman>(0x1337, 0x1337, *m_node.addrman); // Deterministic randomness for tests.
m_node.peerman = PeerManager::make(chainparams, *m_node.connman, *m_node.addrman,
m_node.banman.get(), *m_node.scheduler, *m_node.chainman,