fix: missing merge conflicts

Signed-off-by: Gustavo Inacio <gustavo@semiotic.ai>
semiotic-ai · Mar 4, 2024 · 7cf2ed0 · 7cf2ed0
1 parent d03d5d7
commit 7cf2ed0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/tap_core/src/tap_manager/test/manager_test.rs b/tap_core/src/tap_manager/test/manager_test.rs
@@ -3,7 +3,11 @@
 #[cfg(test)]
 #[allow(clippy::too_many_arguments)]
 mod manager_unit_test {
-    use std::{collections::HashMap, str::FromStr, sync::Arc};
+    use std::{
+        collections::{HashMap, HashSet},
+        str::FromStr,
+        sync::Arc,
+    };
 
     use alloy_primitives::Address;
     use alloy_sol_types::Eip712Domain;
@@ -17,7 +21,6 @@ mod manager_unit_test {
             escrow_adapter_mock::EscrowAdapterMock,
             executor_mock::{EscrowStorage, ExecutorMock, QueryAppraisals},
             receipt_storage_adapter::ReceiptRead,
-            receipt_storage_adapter_mock::ReceiptStorageAdapterMock,
         },
         checks::ReceiptCheck,
         eip_712_signed_message::EIP712SignedMessage,
@@ -95,24 +98,6 @@ mod manager_unit_test {
         (escrow_adapter, sender_escrow_storage)
     }
 
-    #[fixture]
-    fn receipt_adapters() -> (ReceiptStorageAdapterMock, Arc<RwLock<HashMap<u64, u128>>>) {
-        let receipt_storage = Arc::new(RwLock::new(HashMap::new()));
-
-        // let allocation_ids_set = Arc::new(RwLock::new(HashSet::from_iter(allocation_ids())));
-        // let sender_ids_set = Arc::new(RwLock::new(HashSet::from_iter(sender_ids())));
-        let query_appraisal_storage = Arc::new(RwLock::new(HashMap::new()));
-
-        // let receipt_checks_adapter = ReceiptChecksAdapterMock::new(
-        //     Arc::clone(&receipt_storage),
-        //     Arc::clone(&query_appraisal_storage),
-        //     Arc::clone(&allocation_ids_set),
-        //     Arc::clone(&sender_ids_set),
-        // );
-
-        (receipt_checks_adapter, query_appraisal_storage)
-    }
-
     #[rstest]
     #[case::full_checks(get_full_list_of_checks())]
     // #[case::partial_checks(todo!())]

diff --git a/tap_integration_tests/tests/showcase.rs b/tap_integration_tests/tests/showcase.rs
@@ -5,7 +5,7 @@
 // The tests use a mock Indexer server running a tap_manager instance and a tap_aggregator to handle RAV requests.
 // An Indexer checks and stores receipts. After receiving a specific number of receipts, the Indexer sends a RAV request to the aggregator.
 use std::{
-    collections::HashMap,
+    collections::{HashMap, HashSet},
     convert::TryInto,
     net::{SocketAddr, TcpListener},
     str::FromStr,