From 8e07e1ad33c7b3ee78219ac6b66af3a01f5d8b13 Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Thu, 15 Jul 2021 10:51:09 +1000
Subject: [PATCH] Fix conflict in tests

---
 beacon_node/network/src/beacon_processor/tests.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/beacon_node/network/src/beacon_processor/tests.rs b/beacon_node/network/src/beacon_processor/tests.rs
index d6967a9075f..5584a97ecfa 100644
--- a/beacon_node/network/src/beacon_processor/tests.rs
+++ b/beacon_node/network/src/beacon_processor/tests.rs
@@ -578,14 +578,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."
     );
@@ -616,7 +616,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."
     );
@@ -707,14 +707,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."
     );
@@ -727,7 +727,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."
     );
@@ -748,7 +748,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."
     );