test: fix some typos

test: remove commented code; fix typos

build: move deps to workspace

Author: neithanmo

Cargo.toml

@@ -122,6 +122,8 @@ tracing-subscriber = { version = "0.3", features = [
 uuid = { version = "1.11.0", features = ["v7"] }
 wiremock = "0.6.1"
 wiremock-grpc = { git = "https://github.com/suchapalaver/wiremock-grpc-rs.git", branch = "main" }
+rdkafka = { version = "0.38.0", features = ["gssapi", "tracing"] }
+regex = "1"
 
 # Insta benefits from being compiled in release mode, even as dev dependency
 # see https://insta.rs/docs/quickstart

integration-tests/Cargo.toml

@@ -40,6 +40,5 @@ sqlx = { workspace = true, features = [
     "rust_decimal",
     "uuid",
 ] }
-# rdkafka = { workspace = true }
-rdkafka = { version = "0.38.0", features = ["gssapi", "tracing"] }
-regex = "1"
+rdkafka = { workspace = true }
+regex = { workspace = true }

integration-tests/src/main.rs

@@ -7,9 +7,9 @@ mod env_loader;
 #[allow(dead_code)]
 mod indexer_cli;
 mod load_test;
-// Lets keep the metrics parser disable
+// Lets keep the metrics parser disabled
 // we are moving towards using database_checker
-// for more robust checks and using the soley source of truth
+// for more robust checks and using the sole source of truth
 // mod metrics;
 mod rav_tests;
 mod signature_test;

integration-tests/src/rav_tests.rs

@@ -29,12 +29,12 @@ use crate::{
 };
 
 const WAIT_TIME_BATCHES: u64 = 40;
-const NUM_RECEIPTS: u32 = 30; // Increased to 30 receipts per batch
+const NUM_RECEIPTS: u32 = 30;
 
 // Send receipts in batches with a delay in between
 // to ensure some receipts get outside the timestamp buffer
-const BATCHES: u32 = 15; // Increased to 15 batches for total 450 receipts in Stage 1
-const MAX_TRIGGERS: usize = 20000; // Increased trigger attempts to 200
+const BATCHES: u32 = 15;
+const MAX_TRIGGERS: usize = 20000;
 
 // Function to test the tap RAV generation
 // Function to test the TAP RAV generation for V1 using the database checker

integration-tests/src/utils.rs

@@ -215,10 +215,6 @@ impl GatewayReceiptSigner {
             .try_into()
             .map_err(|_| anyhow::anyhow!("failed to convert timestamp to ns"))?;
 
-        // let timestamp_ns = SystemTime::now()
-        //     .duration_since(SystemTime::UNIX_EPOCH)?
-        //     .as_nanos() as u64;
-
         // Use the same domain creation as working V2 tests
         let eip712_domain_separator = tap_eip712_domain(
             self.chain_id,

setup-test-network.sh

@@ -184,13 +184,11 @@ echo "Starting core infrastructure services..."
 docker compose up -d chain ipfs postgres graph-node
 # Wait for graph-node to be healthy
 echo "Waiting for graph-node to be healthy..."
-# timeout 300 bash -c 'until docker ps | grep graph-node | grep -q healthy; do sleep 5; done'
 interruptible_wait 300 'docker ps | grep graph-node | grep -q healthy' "Waiting for graph-node to be healthy"
 
 echo "Deploying contract services..."
 docker compose up -d graph-contracts
 # Wait for contracts to be deployed
-# timeout 300 bash -c 'until docker ps -a | grep graph-contracts | grep -q "Exited (0)"; do sleep 5; done'
 interruptible_wait 300 'docker ps -a | grep graph-contracts | grep -q "Exited (0)"' "Waiting for contracts to be deployed"
 
 # Verify the contracts have code using horizon structure
@@ -255,22 +253,19 @@ docker compose up -d tap-contracts
 echo "Starting indexer services..."
 docker compose up -d block-oracle
 echo "Waiting for block-oracle to be healthy..."
-# timeout 300 bash -c 'until docker ps | grep block-oracle | grep -q healthy; do sleep 5; done'
 interruptible_wait 300 'docker ps | grep block-oracle | grep -q healthy' "Waiting for block-oracle to be healthy"
 
 # export INDEXER_AGENT_SOURCE_ROOT=/home/neithanmo/Documents/Work/Semiotic/indexer-rs/indexer-src
 # If INDEXER_AGENT_SOURCE_ROOT is set, use dev override; otherwise start only indexer-agent
-# export INDEXER_AGENT_SOURCE_ROOT=/home/neithanmo/Documents/Work/Semiotic/indexer-rs/indexer-agent
 if [[ -n "${INDEXER_AGENT_SOURCE_ROOT:-}" ]]; then
     echo "INDEXER_AGENT_SOURCE_ROOT set; using dev override for indexer-agent."
     docker compose -f docker-compose.yaml -f overrides/indexer-agent-dev/indexer-agent-dev.yaml up -d
 else
-    echo "Starting indexer-agent from oficial release"
+    echo "Starting indexer-agent from official release"
     docker compose up -d indexer-agent
 fi
 
 echo "Waiting for indexer-agent to be healthy..."
-# timeout 300 bash -c 'until docker ps | grep indexer-agent | grep -q healthy; do sleep 5; done'
 interruptible_wait 300 'docker ps | grep indexer-agent | grep -q healthy' "Waiting for indexer-agent to be healthy"
 
 # Ensure indexer-agent DB migrations completed (denylist tables must exist)
@@ -339,23 +334,18 @@ fi
 # Run the custom services using the override file
 docker compose -f docker-compose.yml -f docker-compose.override.yml up --build -d
 
-
 # Wait for indexer-service and tap-agent to be healthy with better timeouts
 echo "Waiting for indexer-service to be healthy..."
-# timeout 120 bash -c 'until docker ps | grep indexer-service | grep -q healthy; do echo "Still waiting for indexer-service..."; sleep 5; done'
 interruptible_wait 120 'docker ps | grep indexer-service | grep -q healthy' "Waiting for indexer-service to be healthy"
 
 echo "Waiting for tap-agent to be healthy..."
-# timeout 120 bash -c 'until docker ps | grep tap-agent | grep -q healthy; do echo "Still waiting for tap-agent..."; sleep 5; done'
 interruptible_wait 120 'docker ps | grep tap-agent | grep -q healthy' "Waiting for tap-agent to be healthy"
 
 # Additional check to ensure services are responding
 echo "Verifying indexer-service is responding..."
-# timeout 60 bash -c 'until curl -f http://localhost:7601/health > /dev/null 2>&1; do echo "Waiting for indexer-service health endpoint..."; sleep 3; done'
 interruptible_wait 60 'curl -f http://localhost:7601/health > /dev/null 2>&1' "Verifying indexer-service is responding"
 
 echo "Verifying tap-agent is responding..."
-# timeout 60 bash -c 'until curl -f http://localhost:7300/metrics > /dev/null 2>&1; do echo "Waiting for tap-agent metrics endpoint..."; sleep 3; done'
 interruptible_wait 60 'curl -f http://localhost:7300/metrics > /dev/null 2>&1' "Verifying tap-agent is responding"
 
 # Wait for indexer to sync with chain before starting gateway
@@ -410,7 +400,6 @@ for i in {1..3}; do
 done
 
 # Ensure gateway is ready before testing
-# timeout 100 bash -c 'until curl -f http://localhost:7700/ > /dev/null 2>&1; do echo "Waiting for gateway service..."; sleep 5; done'
 interruptible_wait 100 'curl -f http://localhost:7700/ > /dev/null 2>&1' "Waiting for gateway service"
 
 # Build and start indexer-cli for integration testing (last container)