diff options
| author | John Newbery <john@johnnewbery.com> | 2020-10-23 09:34:27 +0100 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2021-03-20 10:24:36 +0000 |
| commit | 1c25adf6d278eb1a1f018986a126d0eb8137e0ee (patch) | |
| tree | d281bae2edbf480286d1eaa417953b2a4c7b13a1 /src/test/util | |
| parent | 3530d5d2d851d025b013b2ea79ed39a57cbbafcd (diff) | |
| download | bitcoin-1c25adf6d278eb1a1f018986a126d0eb8137e0ee.tar.xz | |
[net] Construct addrman outside connman
node.context owns the CAddrMan. CConnman holds a reference to
the CAddrMan.
Diffstat (limited to 'src/test/util')
| -rw-r--r-- | src/test/util/setup_common.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index f866c2a1f9..a4f5aa8b08 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -4,6 +4,7 @@ #include <test/util/setup_common.h> +#include <addrman.h> #include <banman.h> #include <chainparams.h> #include <consensus/consensus.h> @@ -155,6 +156,7 @@ ChainTestingSetup::~ChainTestingSetup() GetMainSignals().UnregisterBackgroundSignalScheduler(); m_node.connman.reset(); m_node.banman.reset(); + m_node.addrman.reset(); m_node.args = nullptr; UnloadBlockIndex(m_node.mempool.get(), *m_node.chainman); m_node.mempool.reset(); @@ -187,8 +189,9 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const throw std::runtime_error(strprintf("ActivateBestChain failed. (%s)", state.ToString())); } + m_node.addrman = std::make_unique<CAddrMan>(); m_node.banman = std::make_unique<BanMan>(GetDataDir() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME); - m_node.connman = std::make_unique<CConnman>(0x1337, 0x1337); // Deterministic randomness for tests. + 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.banman.get(), *m_node.scheduler, *m_node.chainman, *m_node.mempool, false); |