diff --git a/src/avalanche/peermanager.h b/src/avalanche/peermanager.h --- a/src/avalanche/peermanager.h +++ b/src/avalanche/peermanager.h @@ -264,7 +264,7 @@ uint64_t getFragmentation() const { return fragmentation; } ProofRef getProof(const ProofId &proofid) const; - bool isValid(const ProofId &proofid) const; + bool isBoundToPeer(const ProofId &proofid) const; bool isOrphan(const ProofId &proofid) const; private: diff --git a/src/avalanche/peermanager.cpp b/src/avalanche/peermanager.cpp --- a/src/avalanche/peermanager.cpp +++ b/src/avalanche/peermanager.cpp @@ -242,7 +242,7 @@ return proof; } -bool PeerManager::isValid(const ProofId &proofid) const { +bool PeerManager::isBoundToPeer(const ProofId &proofid) const { auto &pview = peers.get(); return pview.find(proofid) != pview.end(); } @@ -256,7 +256,7 @@ const ProofId &proofid = proof->getId(); - if (isValid(proofid)) { + if (isBoundToPeer(proofid)) { return false; } @@ -550,8 +550,8 @@ } void PeerManager::addUnbroadcastProof(const ProofId &proofid) { - // The proof should be valid - if (isValid(proofid)) { + // The proof should be bound to a peer + if (isBoundToPeer(proofid)) { m_unbroadcast_proofids.insert(proofid); } } diff --git a/src/avalanche/processor.cpp b/src/avalanche/processor.cpp --- a/src/avalanche/processor.cpp +++ b/src/avalanche/processor.cpp @@ -265,8 +265,8 @@ // TODO We don't want to accept an infinite number of conflicting proofs. // They should be some rules to make them expensive and/or limited by // design. - const bool isAccepted = - WITH_LOCK(cs_peerManager, return peerManager->isValid(proof->getId())); + const bool isAccepted = WITH_LOCK( + cs_peerManager, return peerManager->isBoundToPeer(proof->getId())); proofVoteRecords.getWriteView()->insert( std::make_pair(proof, VoteRecord(isAccepted))); diff --git a/src/avalanche/test/peermanager_tests.cpp b/src/avalanche/test/peermanager_tests.cpp --- a/src/avalanche/test/peermanager_tests.cpp +++ b/src/avalanche/test/peermanager_tests.cpp @@ -501,7 +501,7 @@ pm.updatedBlockTip(); BOOST_CHECK(pm.isOrphan(proofid)); - BOOST_CHECK(!pm.isValid(proofid)); + BOOST_CHECK(!pm.isBoundToPeer(proofid)); for (int i = 0; i < 10; i++) { BOOST_CHECK(TestPeerManager::isNodePending(pm, i)); BOOST_CHECK(!TestPeerManager::nodeBelongToPeer(pm, i, peerid)); @@ -517,7 +517,7 @@ pm.updatedBlockTip(); BOOST_CHECK(!pm.isOrphan(proofid)); - BOOST_CHECK(pm.isValid(proofid)); + BOOST_CHECK(pm.isBoundToPeer(proofid)); // The peerid has certainly been updated peerid = TestPeerManager::registerAndGetPeerId(pm, proof); BOOST_CHECK_NE(peerid, NO_PEER); @@ -650,7 +650,7 @@ BOOST_CHECK(pm.exists(proofid)); BOOST_CHECK_EQUAL(pm.isOrphan(proofid), expectedOrphan); - BOOST_CHECK_EQUAL(pm.isValid(proofid), !expectedOrphan); + BOOST_CHECK_EQUAL(pm.isBoundToPeer(proofid), !expectedOrphan); bool ret = false; pm.forEachPeer([&](const Peer &peer) { @@ -855,7 +855,7 @@ BOOST_CHECK(pm.isOrphan(proofToInvalidate->getId())); BOOST_CHECK(!pm.isOrphan(conflictingProof->getId())); - BOOST_CHECK(pm.isValid(conflictingProof->getId())); + BOOST_CHECK(pm.isBoundToPeer(conflictingProof->getId())); } BOOST_AUTO_TEST_CASE(conflicting_proof_selection) { diff --git a/src/net_processing.cpp b/src/net_processing.cpp --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1143,9 +1143,9 @@ auto unbroadcasted_proofids = pm.getUnbroadcastProofs(); for (const auto &proofid : unbroadcasted_proofids) { - // Sanity check: all unbroadcast proofs should be valid in the - // peermanager - if (pm.isValid(proofid)) { + // Sanity check: all unbroadcast proofs should be bound to a + // peer in the peermanager + if (pm.isBoundToPeer(proofid)) { RelayProof(proofid, m_connman); } else { pm.removeUnbroadcastProof(proofid);