diff --git a/src/avalanche/processor.h b/src/avalanche/processor.h --- a/src/avalanche/processor.h +++ b/src/avalanche/processor.h @@ -280,8 +280,6 @@ bool registerVotes(NodeId nodeid, const Response &response, std::vector &updates); - bool addNode(NodeId nodeid, const ProofId &proofid); - template auto withPeerManager(Callable &&func) const { LOCK(cs_peerManager); return func(*peerManager); diff --git a/src/avalanche/processor.cpp b/src/avalanche/processor.cpp --- a/src/avalanche/processor.cpp +++ b/src/avalanche/processor.cpp @@ -518,11 +518,6 @@ return true; } -bool Processor::addNode(NodeId nodeid, const ProofId &proofid) { - LOCK(cs_peerManager); - return peerManager->addNode(nodeid, proofid); -} - CPubKey Processor::getSessionPubKey() const { return sessionKey.GetPubKey(); } diff --git a/src/avalanche/test/processor_tests.cpp b/src/avalanche/test/processor_tests.cpp --- a/src/avalanche/test/processor_tests.cpp +++ b/src/avalanche/test/processor_tests.cpp @@ -125,10 +125,16 @@ return std::make_shared(pb.build()); } + bool addNode(NodeId nodeid, const ProofId &proofid) { + return m_processor->withPeerManager([&](avalanche::PeerManager &pm) { + return pm.addNode(nodeid, proofid); + }); + } + bool addNode(NodeId nodeid) { auto proof = GetProof(); BOOST_CHECK(m_processor->addProof(proof)); - return m_processor->addNode(nodeid, proof->getId()); + return addNode(nodeid, proof->getId()); } std::array ConnectNodes() { @@ -139,7 +145,7 @@ std::array nodes; for (CNode *&n : nodes) { n = ConnectNode(NODE_AVALANCHE); - BOOST_CHECK(m_processor->addNode(n->GetId(), proofid)); + BOOST_CHECK(addNode(n->GetId(), proofid)); } return nodes; @@ -743,7 +749,7 @@ std::array nodes; for (auto &n : nodes) { n = ConnectNode(NODE_AVALANCHE); - BOOST_CHECK(m_processor->addNode(n->GetId(), proof->getId())); + BOOST_CHECK(addNode(n->GetId(), proof->getId())); } // Add a block to poll