fix: tests that fixtures werent available

Author: carlosvdr

crates/monitor/src/client/monitor.rs

@@ -62,7 +62,6 @@ pub async fn check_deployment_status(
 
 #[cfg(test)]
 mod tests {
-    use axum::error_handling::future;
     use reqwest::Url;
     use serde_json::json;
     use thegraph_core::deployment_id;

crates/tap-agent/src/agent/sender_account.rs

@@ -1701,20 +1701,22 @@ pub mod tests {
             .as_nanos() as u64
     }
 
-    #[sqlx::test(migrations = "../../migrations")]
-    async fn test_update_receipt_fees_no_rav(pgpool: PgPool) {
-        let (sender_account, _, prefix, _) = create_sender_account().pgpool(pgpool).call().await;
-
+    #[rstest::rstest]
+    #[tokio::test]
+    async fn test_update_receipt_fees_no_rav(
+        #[future(awt)] basic_sender_account: TestSenderAccount,
+    ) {
         // create a fake sender allocation
         let (triggered_rav_request, _, _) = create_mock_sender_allocation(
-            prefix,
+            basic_sender_account.prefix,
             SENDER.1,
             ALLOCATION_ID_0,
-            sender_account.clone(),
+            basic_sender_account.sender_account.clone(),
         )
         .await;
 
-        sender_account
+        basic_sender_account
+            .sender_account
             .cast(SenderAccountMessage::UpdateReceiptFees(
                 ALLOCATION_ID_0,
                 ReceiptFees::NewReceipt(TRIGGER_VALUE - 1, get_current_timestamp_u64_ns()),
@@ -1727,40 +1729,42 @@ pub mod tests {
         assert_not_triggered!(&triggered_rav_request);
     }
 
-    #[sqlx::test(migrations = "../../migrations")]
-    async fn test_update_receipt_fees_trigger_rav(pgpool: PgPool) {
-        let (sender_account, notify, prefix, _) =
-            create_sender_account().pgpool(pgpool).call().await;
-
+    #[rstest::rstest]
+    #[tokio::test]
+    async fn test_update_receipt_fees_trigger_rav(
+        #[future(awt)] basic_sender_account: TestSenderAccount,
+    ) {
         // create a fake sender allocation
         let (triggered_rav_request, _, _) = create_mock_sender_allocation(
-            prefix,
+            basic_sender_account.prefix,
             SENDER.1,
             ALLOCATION_ID_0,
-            sender_account.clone(),
+            basic_sender_account.sender_account.clone(),
         )
         .await;
 
-        sender_account
+        basic_sender_account
+            .sender_account
             .cast(SenderAccountMessage::UpdateReceiptFees(
                 ALLOCATION_ID_0,
                 ReceiptFees::NewReceipt(TRIGGER_VALUE, get_current_timestamp_u64_ns()),
             ))
             .unwrap();
 
-        flush_messages(&notify).await;
+        flush_messages(&basic_sender_account.notify).await;
         assert_not_triggered!(&triggered_rav_request);
 
         // wait for it to be outside buffer
         tokio::time::sleep(BUFFER_DURATION).await;
 
-        sender_account
+        basic_sender_account
+            .sender_account
             .cast(SenderAccountMessage::UpdateReceiptFees(
                 ALLOCATION_ID_0,
                 ReceiptFees::Retry,
             ))
             .unwrap();
-        flush_messages(&notify).await;
+        flush_messages(&basic_sender_account.notify).await;
 
         assert_triggered!(&triggered_rav_request);
     }
@@ -1851,6 +1855,7 @@ pub mod tests {
 
     /// Test that the deny status is correctly loaded from the DB at the start of the actor
     #[rstest::rstest]
+    #[tokio::test]
     async fn test_init_deny(#[future(awt)] pgpool: PgPool) {
         sqlx::query!(
             r#"

crates/tap-agent/src/agent/sender_accounts_manager.rs

@@ -1042,16 +1042,21 @@ mod tests {
     }
 
     #[rstest::rstest]
-    async fn test_pending_sender_allocations(
-        #[future(awt)] state: TestState,
-        #[future(awt)] pgpool: PgPool,
-        #[future(awt)] _receipts: (),
-    ) {
+    #[tokio::test]
+    async fn test_pending_sender_allocations(#[future(awt)] pgpool: PgPool) {
+        let (_, state) = create_state(pgpool.clone()).await;
+        // add receipts to the database
+        for i in 1..=10 {
+            let receipt = create_received_receipt(&ALLOCATION_ID_0, &SIGNER.0, i, i, i.into());
+            store_receipt(&pgpool, receipt.signed_receipt())
+                .await
+                .unwrap();
+        }
         // add non-final ravs
         let signed_rav = create_rav(ALLOCATION_ID_1, SIGNER.0.clone(), 4, 10);
         store_rav(&pgpool, signed_rav, SENDER.1).await.unwrap();
 
-        let pending_allocation_id = state.state.get_pending_sender_allocation_id_v1().await;
+        let pending_allocation_id = state.get_pending_sender_allocation_id_v1().await;
 
         // check if pending allocations are correct
         assert_eq!(pending_allocation_id.len(), 1);
@@ -1108,6 +1113,7 @@ mod tests {
     }
 
     #[rstest::rstest]
+    #[tokio::test]
     async fn test_create_sender_account(
         #[future(awt)] state: TestState,
         #[future(awt)] supervisor: ActorRef<()>,
@@ -1132,13 +1138,13 @@ mod tests {
     }
 
     #[rstest::rstest]
+    #[tokio::test]
     async fn test_deny_sender_account_on_failure(
         #[future(awt)] pgpool: PgPool,
-        #[future(awt)] state: TestState,
         #[future(awt)] supervisor: ActorRef<()>,
     ) {
+        let (_prefix, state) = create_state(pgpool.clone()).await;
         state
-            .state
             .create_or_deny_sender(
                 supervisor.get_cell(),
                 INDEXER.1,
@@ -1167,10 +1173,8 @@ mod tests {
     }
 
     #[rstest::rstest]
-    async fn test_receive_notifications(
-        #[future(awt)] pglistener: PgListener,
-        #[future(awt)] _receipts: (),
-    ) {
+    #[tokio::test]
+    async fn test_receive_notifications(#[future(awt)] pgpool: PgPool) {
         let prefix = generate_random_prefix();
         // create dummy allocation
 
@@ -1190,6 +1194,17 @@ mod tests {
         .await
         .unwrap();
 
+        // create tokio task to listen for notifications
+
+        let mut pglistener = PgListener::connect_with(&pgpool.clone()).await.unwrap();
+        pglistener
+            .listen("scalar_tap_receipt_notification")
+            .await
+            .expect(
+                "should be able to subscribe to Postgres Notify events on the channel \
+            'scalar_tap_receipt_notification'",
+            );
+
         let escrow_accounts_rx = watch::channel(EscrowAccounts::new(
             HashMap::from([(SENDER.1, U256::from(1000))]),
             HashMap::from([(SENDER.1, vec![SIGNER.1])]),
@@ -1208,7 +1223,13 @@ mod tests {
 
         let receipts_count = 10;
 
-        // receipts added through fixture
+        // add receipts to the database
+        for i in 1..=receipts_count {
+            let receipt = create_received_receipt(&ALLOCATION_ID_0, &SIGNER.0, i, i, i.into());
+            store_receipt(&pgpool, receipt.signed_receipt())
+                .await
+                .unwrap();
+        }
 
         flush_messages(&notify).await;
 
@@ -1224,10 +1245,17 @@ mod tests {
     }
 
     #[rstest::rstest]
-    async fn test_manager_killed_in_database_connection(
-        #[future(awt)] pgpool: PgPool,
-        #[future(awt)] pglistener: PgListener,
-    ) {
+    #[tokio::test]
+    async fn test_manager_killed_in_database_connection(#[future(awt)] pgpool: PgPool) {
+        let mut pglistener = PgListener::connect_with(&pgpool).await.unwrap();
+        pglistener
+            .listen("scalar_tap_receipt_notification")
+            .await
+            .expect(
+                "should be able to subscribe to Postgres Notify events on the channel \
+                'scalar_tap_receipt_notification'",
+            );
+
         let escrow_accounts_rx = watch::channel(EscrowAccounts::default()).1;
         let dummy_actor = DummyActor::spawn().await;