Merge remote-tracking branch 'sean/sync-committee-pools' into network-altair

Author: michaelsproul

beacon_node/network/src/beacon_processor/tests.rs

@@ -583,14 +583,14 @@ fn attestation_to_unknown_block_processed(import_method: BlockImportMethod) {
 
     // Send the attestation but not the block, and check that it was not imported.
 
-    let initial_attns = rig.chain.naive_aggregation_pool.read().num_attestations();
+    let initial_attns = rig.chain.naive_aggregation_pool.read().num_items();
 
     rig.enqueue_next_block_unaggregated_attestation();
 
     rig.assert_event_journal(&[GOSSIP_ATTESTATION, WORKER_FREED, NOTHING_TO_DO]);
 
     assert_eq!(
-        rig.chain.naive_aggregation_pool.read().num_attestations(),
+        rig.chain.naive_aggregation_pool.read().num_items(),
         initial_attns,
         "Attestation should not have been included."
     );
@@ -621,7 +621,7 @@ fn attestation_to_unknown_block_processed(import_method: BlockImportMethod) {
     );
 
     assert_eq!(
-        rig.chain.naive_aggregation_pool.read().num_attestations(),
+        rig.chain.naive_aggregation_pool.read().num_items(),
         initial_attns + 1,
         "Attestation should have been included."
     );
@@ -712,14 +712,14 @@ fn requeue_unknown_block_gossip_attestation_without_import() {
 
     // Send the attestation but not the block, and check that it was not imported.
 
-    let initial_attns = rig.chain.naive_aggregation_pool.read().num_attestations();
+    let initial_attns = rig.chain.naive_aggregation_pool.read().num_items();
 
     rig.enqueue_next_block_unaggregated_attestation();
 
     rig.assert_event_journal(&[GOSSIP_ATTESTATION, WORKER_FREED, NOTHING_TO_DO]);
 
     assert_eq!(
-        rig.chain.naive_aggregation_pool.read().num_attestations(),
+        rig.chain.naive_aggregation_pool.read().num_items(),
         initial_attns,
         "Attestation should not have been included."
     );
@@ -732,7 +732,7 @@ fn requeue_unknown_block_gossip_attestation_without_import() {
     );
 
     assert_eq!(
-        rig.chain.naive_aggregation_pool.read().num_attestations(),
+        rig.chain.naive_aggregation_pool.read().num_items(),
         initial_attns,
         "Attestation should not have been included."
     );
@@ -753,7 +753,7 @@ fn requeue_unknown_block_gossip_aggregated_attestation_without_import() {
     rig.assert_event_journal(&[GOSSIP_AGGREGATE, WORKER_FREED, NOTHING_TO_DO]);
 
     assert_eq!(
-        rig.chain.naive_aggregation_pool.read().num_attestations(),
+        rig.chain.naive_aggregation_pool.read().num_items(),
         initial_attns,
         "Attestation should not have been included."
     );