refactor: add types to monitor

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

Author: gusinacio

crates/monitor/src/allocations.rs

@@ -12,13 +12,15 @@ use std::{
 };
 use tokio::sync::watch::Receiver;
 
+pub type AllocationWatcher = Receiver<HashMap<Address, Allocation>>;
+
 /// An always up-to-date list of an indexer's active and recently closed allocations.
 pub async fn indexer_allocations(
     network_subgraph: &'static SubgraphClient,
     indexer_address: Address,
     interval: Duration,
     recently_closed_allocation_buffer: Duration,
-) -> anyhow::Result<Receiver<HashMap<Address, Allocation>>> {
+) -> anyhow::Result<AllocationWatcher> {
     new_watcher(interval, move || async move {
         get_allocations(
             network_subgraph,

crates/monitor/src/attestation.rs

@@ -11,13 +11,15 @@ use thegraph_core::{Address, ChainId};
 use tokio::sync::watch::Receiver;
 use tracing::warn;
 
+pub type AttestationWatcher = Receiver<HashMap<Address, AttestationSigner>>;
+
 /// An always up-to-date list of attestation signers, one for each of the indexer's allocations.
 pub fn attestation_signers(
     indexer_allocations_rx: Receiver<HashMap<Address, Allocation>>,
     indexer_mnemonic: Mnemonic,
     chain_id: ChainId,
     dispute_manager_rx: Receiver<Address>,
-) -> Receiver<HashMap<Address, AttestationSigner>> {
+) -> AttestationWatcher {
     let attestation_signers_map: &'static Mutex<HashMap<Address, AttestationSigner>> =
         Box::leak(Box::new(Mutex::new(HashMap::new())));
     let indexer_mnemonic = Arc::new(indexer_mnemonic.to_string());

crates/monitor/src/deployment_to_allocation.rs

@@ -8,11 +8,13 @@ use tokio::sync::watch::Receiver;
 use indexer_allocation::Allocation;
 use indexer_watcher::map_watcher;
 
+pub type DeploymentToAllocationWatcher = Receiver<HashMap<DeploymentId, Address>>;
+
 /// Watcher of indexer allocation
 /// returning a map of subgraph deployment to allocation id
 pub fn deployment_to_allocation(
     indexer_allocations_rx: Receiver<HashMap<Address, Allocation>>,
-) -> Receiver<HashMap<DeploymentId, Address>> {
+) -> DeploymentToAllocationWatcher {
     map_watcher(indexer_allocations_rx, move |allocation| {
         allocation
             .iter()

crates/monitor/src/dispute_manager.rs

@@ -9,10 +9,12 @@ use indexer_watcher::new_watcher;
 use std::time::Duration;
 use tokio::sync::watch::Receiver;
 
+pub type DisputeManagerWatcher = Receiver<Address>;
+
 pub async fn dispute_manager(
     network_subgraph: &'static SubgraphClient,
     interval: Duration,
-) -> anyhow::Result<Receiver<Address>> {
+) -> anyhow::Result<DisputeManagerWatcher> {
     new_watcher(interval, move || async move {
         let response = network_subgraph
             .query::<DisputeManager, _>(dispute_manager::Variables {})

crates/monitor/src/escrow_accounts.rs

@@ -87,12 +87,14 @@ impl EscrowAccounts {
     }
 }
 
+pub type EscrowAccountsWatcher = Receiver<EscrowAccounts>;
+
 pub async fn escrow_accounts(
     escrow_subgraph: &'static SubgraphClient,
     indexer_address: Address,
     interval: Duration,
     reject_thawing_signers: bool,
-) -> Result<Receiver<EscrowAccounts>, anyhow::Error> {
+) -> Result<EscrowAccountsWatcher, anyhow::Error> {
     indexer_watcher::new_watcher(interval, move || {
         get_escrow_accounts(escrow_subgraph, indexer_address, reject_thawing_signers)
     })

crates/monitor/src/lib.rs

@@ -9,10 +9,12 @@ mod dispute_manager;
 mod escrow_accounts;
 
 pub use crate::{
-    allocations::indexer_allocations,
-    attestation::attestation_signers,
+    allocations::{indexer_allocations, AllocationWatcher},
+    attestation::{attestation_signers, AttestationWatcher},
     client::{DeploymentDetails, SubgraphClient},
-    deployment_to_allocation::deployment_to_allocation,
-    dispute_manager::dispute_manager,
-    escrow_accounts::{escrow_accounts, EscrowAccounts, EscrowAccountsError},
+    deployment_to_allocation::{deployment_to_allocation, DeploymentToAllocationWatcher},
+    dispute_manager::{dispute_manager, DisputeManagerWatcher},
+    escrow_accounts::{
+        escrow_accounts, EscrowAccounts, EscrowAccountsError, EscrowAccountsWatcher,
+    },
 };