test: update all tests to use get_grpc_url

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

Author: gusinacio

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

@@ -609,7 +609,7 @@ mod tests {
     use reqwest::Url;
     use ruint::aliases::U256;
     use sqlx::{postgres::PgListener, PgPool};
-    use test_assets::{flush_messages, TAP_SENDER as SENDER};
+    use test_assets::{flush_messages, TAP_SENDER as SENDER, TAP_SIGNER as SIGNER};
     use thegraph_core::alloy::hex::ToHexExt;
     use tokio::sync::{mpsc, mpsc::error::TryRecvError, watch, Notify};
 
@@ -625,8 +625,7 @@ mod tests {
         test::{
             actors::{DummyActor, MockSenderAccount, MockSenderAllocation, TestableActor},
             create_rav, create_received_receipt, get_grpc_url, store_rav, store_receipt,
-            ALLOCATION_ID_0, ALLOCATION_ID_1, INDEXER, SENDER_2, SIGNER,
-            TAP_EIP712_DOMAIN_SEPARATOR,
+            ALLOCATION_ID_0, ALLOCATION_ID_1, INDEXER, SENDER_2, TAP_EIP712_DOMAIN_SEPARATOR,
         },
     };
 

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

@@ -871,7 +871,6 @@ pub mod tests {
     use serde_json::json;
     use sqlx::PgPool;
     use tap_aggregator::grpc::{tap_aggregator_client::TapAggregatorClient, RavResponse};
-    use tap_aggregator::server::run_server;
     use tap_core::receipt::{
         checks::{Check, CheckError, CheckList, CheckResult},
         state::Checking,
@@ -948,9 +947,7 @@ pub mod tests {
             None => create_mock_sender_account().await.1,
         };
 
-        let endpoint = Endpoint::new(sender_aggregator_endpoint.to_string())
-            .unwrap()
-            .connect_timeout(Duration::default());
+        let endpoint = Endpoint::new(sender_aggregator_endpoint.to_string()).unwrap();
 
         let sender_aggregator = TapAggregatorClient::connect(endpoint.clone())
             .await
@@ -1162,19 +1159,6 @@ pub mod tests {
 
     #[sqlx::test(migrations = "../../migrations")]
     async fn test_trigger_rav_request(pgpool: PgPool) {
-        // Start a TAP aggregator server.
-        let (_handle, aggregator_endpoint) = run_server(
-            0,
-            SIGNER.0.clone(),
-            vec![SIGNER.1].into_iter().collect(),
-            TAP_EIP712_DOMAIN_SEPARATOR.clone(),
-            100 * 1024,
-            100 * 1024,
-            1,
-        )
-        .await
-        .unwrap();
-
         // Start a mock graphql server using wiremock
         let mock_server = MockServer::start().await;
 
@@ -1208,7 +1192,7 @@ pub mod tests {
         // Create a sender_allocation.
         let (sender_allocation, notify) = create_sender_allocation(
             pgpool.clone(),
-            "http://".to_owned() + &aggregator_endpoint.to_string(),
+            get_grpc_url().await,
             &mock_server.uri(),
             Some(sender_account),
         )
@@ -1614,19 +1598,6 @@ pub mod tests {
 
     #[sqlx::test(migrations = "../../migrations")]
     async fn test_rav_request_when_all_receipts_invalid(pgpool: PgPool) {
-        // Start a TAP aggregator server.
-        let (_handle, aggregator_endpoint) = run_server(
-            0,
-            SIGNER.0.clone(),
-            vec![SIGNER.1].into_iter().collect(),
-            TAP_EIP712_DOMAIN_SEPARATOR.clone(),
-            100 * 1024,
-            100 * 1024,
-            1,
-        )
-        .await
-        .unwrap();
-
         // Start a mock graphql server using wiremock
         let mock_server = MockServer::start().await;
 
@@ -1665,7 +1636,7 @@ pub mod tests {
 
         let (sender_allocation, notify) = create_sender_allocation(
             pgpool.clone(),
-            "http://".to_owned() + &aggregator_endpoint.to_string(),
+            get_grpc_url().await,
             &mock_server.uri(),
             Some(sender_account),
         )

crates/tap-agent/src/tap/context/rav.rs

@@ -135,11 +135,11 @@ impl RAVStore for TapAgentContext {
 mod test {
     use indexer_monitor::EscrowAccounts;
     use sqlx::PgPool;
-    use test_assets::TAP_SENDER as SENDER;
+    use test_assets::{TAP_SENDER as SENDER, TAP_SIGNER as SIGNER};
     use tokio::sync::watch;
 
     use super::*;
-    use crate::test::{create_rav, ALLOCATION_ID_0, SIGNER};
+    use crate::test::{create_rav, ALLOCATION_ID_0};
 
     #[derive(Debug)]
     struct TestableRav(SignedRAV);

crates/tap-agent/src/test.rs

@@ -5,29 +5,27 @@ use bigdecimal::num_bigint::BigInt;
 use lazy_static::lazy_static;
 use sqlx::{types::BigDecimal, PgPool};
 use std::net::SocketAddr;
-use std::u32;
-use std::{collections::HashSet, time::Duration};
 use tap_aggregator::server::run_server;
 use tap_core::{
     rav::{ReceiptAggregateVoucher, SignedRAV},
     receipt::{state::Checking, Receipt, ReceiptWithState, SignedReceipt},
     signed_message::EIP712SignedMessage,
     tap_eip712_domain,
 };
+use test_assets::TAP_SIGNER as SIGNER;
 use thegraph_core::alloy::{
     primitives::{address, hex::ToHexExt, Address},
     signers::local::{coins_bip39::English, MnemonicBuilder, PrivateKeySigner},
     sol_types::Eip712Domain,
 };
-use tokio::{sync::OnceCell, task::JoinHandle};
+use tokio::task::JoinHandle;
 
 pub const ALLOCATION_ID_0: Address = address!("abababababababababababababababababababab");
 pub const ALLOCATION_ID_1: Address = address!("bcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbc");
 
 lazy_static! {
     // pub static ref SENDER: (PrivateKeySigner, Address) = wallet(0);
     pub static ref SENDER_2: (PrivateKeySigner, Address) = wallet(1);
-    pub static ref SIGNER: (PrivateKeySigner, Address) = wallet(2);
     pub static ref INDEXER: (PrivateKeySigner, Address) = wallet(3);
     pub static ref TAP_EIP712_DOMAIN_SEPARATOR: Eip712Domain =
         tap_eip712_domain(1, Address::from([0x11u8; 20]),);
@@ -160,14 +158,12 @@ pub async fn get_grpc_url() -> String {
 
 /// Function to start a aggregator server for testing
 async fn create_grpc_aggregator() -> (JoinHandle<()>, SocketAddr) {
-    let wallet = PrivateKeySigner::random();
-    let address = wallet.address();
-    let accepted_addresses = HashSet::from([address]);
-    let domain_separator = tap_eip712_domain(1, Address::from([0x11u8; 20]));
+    let wallet = SIGNER.0.clone();
+    let accepted_addresses = vec![SIGNER.1].into_iter().collect();
+    let domain_separator = TAP_EIP712_DOMAIN_SEPARATOR.clone();
     let max_request_body_size = 1024 * 1024; // 1 MB
     let max_response_body_size = 1024 * 1024; // 1 MB
-    let max_concurrent_connections = 10;
-    // Use port `1234` as it is the default being used in tests
+    let max_concurrent_connections = 255;
     let port = 0;
 
     run_server(