chore(agent): incrementally remove ractor - stage 1

Signed-off-by: Joseph Livesey <[email protected]>

Author: suchapalaver

crates/tap-agent/src/agent.rs

@@ -43,9 +43,9 @@ use indexer_monitor::{
     empty_escrow_accounts_watcher, escrow_accounts_v1, escrow_accounts_v2, indexer_allocations,
     DeploymentDetails, SubgraphClient,
 };
-use ractor::concurrency::JoinHandle;
 use sender_account::SenderAccountConfig;
 use sender_accounts_manager_task::SenderAccountsManagerTask;
+use tokio::task::JoinHandle;
 
 use crate::{
     actor_migrate::LifecycleManager,

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

@@ -18,6 +18,7 @@ use indexer_query::{
 };
 use indexer_watcher::watch_pipe;
 use prometheus::{register_gauge_vec, register_int_gauge_vec, GaugeVec, IntGaugeVec};
+#[cfg(any(test, feature = "test"))]
 use ractor::{Actor, ActorProcessingErr, ActorRef, MessagingErr, SupervisionEvent};
 use reqwest::Url;
 use sqlx::PgPool;
@@ -327,6 +328,7 @@ impl PartialEq for SenderAccountMessage {
 #[cfg(any(test, feature = "test"))]
 impl Eq for SenderAccountMessage {}
 
+#[cfg(any(test, feature = "test"))]
 /// A SenderAccount manages the receipts accounting between the indexer and the sender across
 /// multiple allocations.
 ///
@@ -338,6 +340,7 @@ impl Eq for SenderAccountMessage {}
 /// - Requesting the last RAV from the sender's TAP aggregator for all EOL allocations.
 pub struct SenderAccount;
 
+#[cfg(any(test, feature = "test"))]
 /// Arguments received in startup while spawing [SenderAccount] actor
 pub struct SenderAccountArgs {
     /// Configuration derived from config.toml
@@ -371,6 +374,7 @@ pub struct SenderAccountArgs {
     pub sender_type: SenderType,
 }
 
+#[cfg(any(test, feature = "test"))]
 /// State used by the actor
 ///
 /// This is a separate instance that makes it easier to have mutable
@@ -845,6 +849,7 @@ impl State {
     }
 }
 
+#[cfg(any(test, feature = "test"))]
 /// Actor implementation for [SenderAccount]
 #[async_trait::async_trait]
 impl Actor for SenderAccount {

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

@@ -306,6 +306,8 @@ impl SenderAccountTask {
             }
             #[cfg(test)]
             SenderAccountMessage::GetSenderFeeTracker(reply) => {
+                // Note: This is the ractor-based interface for legacy tests
+                // The reply.send() is compatible since ractor RpcReplyPort has a send method
                 let _ = reply.send(state.sender_fee_tracker.clone());
             }
             #[cfg(test)]