[cleanup] replace TxOrphanage::Size() with CountUniqueOrphans

Author: glozow

src/node/txdownloadman_impl.cpp

@@ -572,7 +572,7 @@ void TxDownloadManagerImpl::CheckIsEmpty(NodeId nodeid)
 void TxDownloadManagerImpl::CheckIsEmpty()
 {
     assert(m_orphanage->TotalOrphanUsage() == 0);
-    assert(m_orphanage->Size() == 0);
+    assert(m_orphanage->CountUniqueOrphans() == 0);
     assert(m_txrequest.Size() == 0);
     assert(m_num_wtxid_peers == 0);
 }

src/node/txorphanage.cpp

@@ -229,7 +229,6 @@ class TxOrphanageImpl final : public TxOrphanage {
     std::vector<std::pair<Wtxid, NodeId>> AddChildrenToWorkSet(const CTransaction& tx, FastRandomContext& rng) override;
     bool HaveTxToReconsider(NodeId peer) override;
     std::vector<CTransactionRef> GetChildrenFromSamePeer(const CTransactionRef& parent, NodeId nodeid) const override;
-    size_t Size() const override { return m_unique_orphans; }
     std::vector<OrphanTxBase> GetOrphanTransactions() const override;
     TxOrphanage::Usage TotalOrphanUsage() const override;
     void SanityCheck() const override;

src/node/txorphanage.h

@@ -98,9 +98,6 @@ class TxOrphanage {
      * recent to least recent. */
     virtual std::vector<CTransactionRef> GetChildrenFromSamePeer(const CTransactionRef& parent, NodeId nodeid) const = 0;
 
-    /** Return how many entries exist in the orphange */
-    virtual size_t Size() const = 0;
-
     /** Get all orphan transactions */
     virtual std::vector<OrphanTxBase> GetOrphanTransactions() const = 0;
 

src/test/orphanage_tests.cpp

@@ -498,19 +498,19 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
         BOOST_CHECK(!orphanage->AddTx(MakeTransactionRef(tx), i));
     }
 
-    size_t expected_num_orphans = orphanage->Size();
+    size_t expected_num_orphans = orphanage->CountUniqueOrphans();
 
     // Non-existent peer; nothing should be deleted
     orphanage->EraseForPeer(/*peer=*/-1);
-    BOOST_CHECK_EQUAL(orphanage->Size(), expected_num_orphans);
+    BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_num_orphans);
 
     // Each of first three peers stored
     // two transactions each.
     for (NodeId i = 0; i < 3; i++)
     {
         orphanage->EraseForPeer(i);
         expected_num_orphans -= 2;
-        BOOST_CHECK(orphanage->Size() == expected_num_orphans);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_num_orphans);
     }
 }
 
@@ -732,7 +732,7 @@ BOOST_AUTO_TEST_CASE(process_block)
         BOOST_CHECK(!orphanage->HaveTx(expected_removed_wtxid));
     }
     // Only remaining tx is control_tx
-    BOOST_CHECK_EQUAL(orphanage->Size(), 1);
+    BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), 1);
     BOOST_CHECK(orphanage->HaveTx(control_tx->GetWitnessHash()));
 }
 
@@ -753,11 +753,11 @@ BOOST_AUTO_TEST_CASE(multiple_announcers)
         BOOST_CHECK(orphanage->AddTx(ptx, node0));
         BOOST_CHECK(orphanage->HaveTx(wtxid));
         expected_total_count += 1;
-        BOOST_CHECK_EQUAL(orphanage->Size(), expected_total_count);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_total_count);
 
         // Adding again should do nothing.
         BOOST_CHECK(!orphanage->AddTx(ptx, node0));
-        BOOST_CHECK_EQUAL(orphanage->Size(), expected_total_count);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_total_count);
 
         // We can add another tx with the same txid but different witness.
         auto ptx_mutated{MakeMutation(ptx)};
@@ -769,15 +769,15 @@ BOOST_AUTO_TEST_CASE(multiple_announcers)
 
         // Adding a new announcer should not change overall accounting.
         BOOST_CHECK(orphanage->AddAnnouncer(ptx->GetWitnessHash(), node2));
-        BOOST_CHECK_EQUAL(orphanage->Size(), expected_total_count);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_total_count);
 
         // If we already have this announcer, AddAnnouncer returns false.
         BOOST_CHECK(orphanage->HaveTxFromPeer(ptx->GetWitnessHash(), node2));
         BOOST_CHECK(!orphanage->AddAnnouncer(ptx->GetWitnessHash(), node2));
 
         // Same with using AddTx for an existing tx, which is equivalent to using AddAnnouncer
         BOOST_CHECK(!orphanage->AddTx(ptx, node1));
-        BOOST_CHECK_EQUAL(orphanage->Size(), expected_total_count);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_total_count);
 
         // if EraseForPeer is called for an orphan with multiple announcers, the orphanage should only
         // erase that peer from the announcers set.
@@ -787,15 +787,15 @@ BOOST_AUTO_TEST_CASE(multiple_announcers)
         // node0 is the only one that announced ptx_mutated
         BOOST_CHECK(!orphanage->HaveTx(ptx_mutated->GetWitnessHash()));
         expected_total_count -= 1;
-        BOOST_CHECK_EQUAL(orphanage->Size(), expected_total_count);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_total_count);
 
         // EraseForPeer should delete the orphan if it's the only announcer left.
         orphanage->EraseForPeer(node1);
-        BOOST_CHECK_EQUAL(orphanage->Size(), expected_total_count);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_total_count);
         BOOST_CHECK(orphanage->HaveTx(ptx->GetWitnessHash()));
         orphanage->EraseForPeer(node2);
         expected_total_count -= 1;
-        BOOST_CHECK_EQUAL(orphanage->Size(), expected_total_count);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_total_count);
         BOOST_CHECK(!orphanage->HaveTx(ptx->GetWitnessHash()));
     }
 
@@ -809,13 +809,13 @@ BOOST_AUTO_TEST_CASE(multiple_announcers)
 
         expected_total_count += 1;
 
-        BOOST_CHECK_EQUAL(orphanage->Size(), expected_total_count);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_total_count);
 
         orphanage->EraseForBlock(block);
 
         expected_total_count -= 1;
 
-        BOOST_CHECK_EQUAL(orphanage->Size(), expected_total_count);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), expected_total_count);
     }
 }
 BOOST_AUTO_TEST_CASE(peer_worksets)
@@ -863,7 +863,7 @@ BOOST_AUTO_TEST_CASE(peer_worksets)
 
         // Delete this tx, clearing the orphanage.
         BOOST_CHECK_EQUAL(orphanage->EraseTx(orphan_wtxid), 1);
-        BOOST_CHECK_EQUAL(orphanage->Size(), 0);
+        BOOST_CHECK_EQUAL(orphanage->CountUniqueOrphans(), 0);
         for (NodeId node = node0; node <= node2; ++node) {
             BOOST_CHECK_EQUAL(orphanage->GetTxToReconsider(node), nullptr);
             BOOST_CHECK(!orphanage->HaveTxFromPeer(orphan_wtxid, node));