test: update create_manager() to receive list of initial accounts

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

crates/tap-agent/src/test.rs

@@ -44,7 +44,7 @@ use crate::{
         },
         sender_accounts_manager::{
             AllocationId, SenderAccountsManager, SenderAccountsManagerArgs,
-            SenderAccountsManagerMessage,
+            SenderAccountsManagerMessage, SenderType,
         },
     },
     tap::{
@@ -178,6 +178,7 @@ pub async fn create_sender_account(
         allocation_ids: HashSet::new(),
         prefix: Some(prefix.clone()),
         retry_interval: RETRY_DURATION,
+        sender_type: SenderType::Legacy,
     };
 
     let actor = TestableActor::new(SenderAccount);
@@ -198,6 +199,8 @@ pub async fn create_sender_accounts_manager(
     pgpool: PgPool,
     network_subgraph: Option<&str>,
     escrow_subgraph: Option<&str>,
+    initial_escrow_accounts_v1: Option<EscrowAccounts>,
+    initial_escrow_accounts_v2: Option<EscrowAccounts>,
 ) -> (
     String,
     Arc<Notify>,
@@ -222,21 +225,27 @@ pub async fn create_sender_accounts_manager(
         .await,
     ));
     let (escrow_accounts_tx, escrow_accounts_rx) = watch::channel(EscrowAccounts::default());
-    escrow_accounts_tx
-        .send(EscrowAccounts::new(
-            HashMap::from([(SENDER.1, U256::from(ESCROW_VALUE))]),
-            HashMap::from([(SENDER.1, vec![SIGNER.1])]),
-        ))
-        .expect("Failed to update escrow_accounts channel");
+    if let Some(escrow_acccounts) = initial_escrow_accounts_v1 {
+        escrow_accounts_tx
+            .send(escrow_acccounts)
+            .expect("Failed to update escrow_accounts channel");
+    }
+
+    let (escrow_accounts_tx_v2, escrow_accounts_rx_v2) = watch::channel(EscrowAccounts::default());
+    if let Some(escrow_acccounts) = initial_escrow_accounts_v2 {
+        escrow_accounts_tx_v2
+            .send(escrow_acccounts)
+            .expect("Failed to update escrow_accounts channel");
+    }
 
     let prefix = generate_random_prefix();
     let args = SenderAccountsManagerArgs {
         config,
         domain_separator: TAP_EIP712_DOMAIN_SEPARATOR.clone(),
         pgpool,
         indexer_allocations: allocations_rx,
-        escrow_accounts_v1: escrow_accounts_rx.clone(),
-        escrow_accounts_v2: escrow_accounts_rx,
+        escrow_accounts_v1: escrow_accounts_rx,
+        escrow_accounts_v2: escrow_accounts_rx_v2,
         escrow_subgraph,
         network_subgraph,
         sender_aggregator_endpoints: HashMap::from([

crates/tap-agent/tests/sender_account_manager_test.rs

@@ -1,8 +1,9 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::collections::HashSet;
+use std::collections::{HashMap, HashSet};
 
+use indexer_monitor::EscrowAccounts;
 use indexer_tap_agent::{
     agent::{
         sender_account::SenderAccountMessage,
@@ -11,12 +12,14 @@ use indexer_tap_agent::{
     },
     test::{
         create_received_receipt, create_sender_accounts_manager, store_receipt, ALLOCATION_ID_0,
+        ESCROW_VALUE,
     },
 };
 use ractor::{ActorRef, ActorStatus};
 use serde_json::json;
 use sqlx::PgPool;
 use test_assets::{assert_while_retry, flush_messages, TAP_SENDER as SENDER, TAP_SIGNER as SIGNER};
+use thegraph_core::alloy::primitives::U256;
 use wiremock::{
     matchers::{body_string_contains, method},
     Mock, MockServer, ResponseTemplate,
@@ -26,7 +29,7 @@ const TRIGGER_VALUE: u128 = 100;
 
 // This test should ensure the full flow starting from
 // sender account manager layer to work, up to closing an allocation
-#[sqlx::test(migrations = "../../migrations")]
+#[test_log::test(sqlx::test(migrations = "../../migrations"))]
 async fn sender_account_manager_layer_test(pgpool: PgPool) {
     let mock_network_subgraph_server: MockServer = MockServer::start().await;
     mock_network_subgraph_server
@@ -63,6 +66,10 @@ async fn sender_account_manager_layer_test(pgpool: PgPool) {
         .pgpool(pgpool.clone())
         .network_subgraph(&mock_network_subgraph_server.uri())
         .escrow_subgraph(&mock_escrow_subgraph_server.uri())
+        .initial_escrow_accounts_v1(EscrowAccounts::new(
+            HashMap::from([(SENDER.1, U256::from(ESCROW_VALUE))]),
+            HashMap::from([(SENDER.1, vec![SIGNER.1])]),
+        ))
         .call()
         .await;
 
@@ -72,6 +79,14 @@ async fn sender_account_manager_layer_test(pgpool: PgPool) {
         ))
         .unwrap();
     flush_messages(&notify).await;
+    assert_while_retry!({
+        ActorRef::<SenderAccountMessage>::where_is(format!(
+            "{}:legacy:{}",
+            prefix.clone(),
+            SENDER.1
+        ))
+        .is_none()
+    });
 
     // verify if create sender account
     let sender_account_ref = ActorRef::<SenderAccountMessage>::where_is(format!(
@@ -134,12 +149,13 @@ async fn sender_account_manager_layer_test(pgpool: PgPool) {
 
     sender_account_ref.unwrap().wait(None).await.unwrap();
     // verify if it gets removed
-    let actor_ref = ActorRef::<SenderAccountMessage>::where_is(format!("{}:{}", prefix, SENDER.1));
+    let actor_ref =
+        ActorRef::<SenderAccountMessage>::where_is(format!("{}:legacy:{}", prefix, SENDER.1));
     assert!(actor_ref.is_none());
 
     let rav_marked_as_last = sqlx::query!(
         r#"
-            SELECT * FROM scalar_tap_ravs WHERE last;
+            SELECT * FROM scalar_tap_ravs;
         "#,
     )
     .fetch_all(&pgpool)

crates/tap-agent/tests/tap_agent_test.rs

@@ -101,7 +101,7 @@ pub async fn start_agent(
         pgpool,
         indexer_allocations: indexer_allocations1,
         escrow_accounts_v1: escrow_accounts.clone(),
-        escrow_accounts_v2: escrow_accounts,
+        escrow_accounts_v2: watch::channel(EscrowAccounts::default()).1,
         escrow_subgraph,
         network_subgraph,
         sender_aggregator_endpoints: sender_aggregator_endpoints.clone(),
@@ -119,9 +119,11 @@ async fn test_start_tap_agent(pgpool: PgPool) {
     flush_messages(&notify).await;
 
     // verify if create sender account
-    let actor_ref = ActorRef::<SenderAccountMessage>::where_is(format!("legacy:{}", TAP_SENDER.1));
-
-    assert!(actor_ref.is_some());
+    assert_while_retry!(ActorRef::<SenderAccountMessage>::where_is(format!(
+        "legacy:{}",
+        TAP_SENDER.1
+    ))
+    .is_none());
 
     // Add batch receits to the database.
     const AMOUNT_OF_RECEIPTS: u64 = 3000;
@@ -141,6 +143,15 @@ async fn test_start_tap_agent(pgpool: PgPool) {
     }
     let res = store_batch_receipts(&pgpool, receipts).await;
     assert!(res.is_ok());
+
+    assert_while_retry!({
+        ActorRef::<SenderAllocationMessage>::where_is(format!(
+            "{}:{}",
+            TAP_SENDER.1, ALLOCATION_ID_0,
+        ))
+        .is_none()
+    });
+
     let sender_allocation_ref = ActorRef::<SenderAllocationMessage>::where_is(format!(
         "{}:{}",
         TAP_SENDER.1, ALLOCATION_ID_0,