Move the poller files to a separate folder in src

Author: maximopalopoli

aggregation_mode/batcher/src/lib.rs

@@ -1,4 +1,4 @@
 pub mod config;
 pub mod db;
-pub mod payments;
+pub mod poller;
 pub mod server;

aggregation_mode/batcher/src/main.rs

@@ -1,7 +1,7 @@
 use std::env;
 
 use agg_mode_batcher::config::Config;
-use agg_mode_batcher::payments::PaymentsPoller;
+use agg_mode_batcher::poller::payments::PaymentsPoller;
 use agg_mode_batcher::{db::Db, server::http::BatcherServer};
 use tracing_subscriber::{EnvFilter, FmtSubscriber};
 

aggregation_mode/batcher/src/poller/mod.rs

@@ -0,0 +1,2 @@
+pub mod payments;
+mod types;

aggregation_mode/batcher/src/payments.rs …tion_mode/batcher/src/poller/payments.rsaggregation_mode/batcher/src/payments.rs renamed to aggregation_mode/batcher/src/poller/payments.rs aggregation_mode/batcher/src/payments.rs renamed to aggregation_mode/batcher/src/poller/payments.rs

@@ -4,51 +4,12 @@ use crate::{config::Config, db::Db};
 use alloy::{
     primitives::Address,
     providers::{Provider, ProviderBuilder},
-    sol,
 };
 use sqlx::types::BigDecimal;
 
-sol!(
-    #[sol(rpc)]
-    AggregationModePaymentService,
-    "abi/AggregationModePaymentService.json"
-);
-
-type AggregationModePaymentServiceContract =
-    AggregationModePaymentService::AggregationModePaymentServiceInstance<
-        alloy::providers::fillers::FillProvider<
-            alloy::providers::fillers::JoinFill<
-                alloy::providers::Identity,
-                alloy::providers::fillers::JoinFill<
-                    alloy::providers::fillers::GasFiller,
-                    alloy::providers::fillers::JoinFill<
-                        alloy::providers::fillers::BlobGasFiller,
-                        alloy::providers::fillers::JoinFill<
-                            alloy::providers::fillers::NonceFiller,
-                            alloy::providers::fillers::ChainIdFiller,
-                        >,
-                    >,
-                >,
-            >,
-            alloy::providers::RootProvider,
-        >,
-    >;
-type RpcProvider = alloy::providers::fillers::FillProvider<
-    alloy::providers::fillers::JoinFill<
-        alloy::providers::Identity,
-        alloy::providers::fillers::JoinFill<
-            alloy::providers::fillers::GasFiller,
-            alloy::providers::fillers::JoinFill<
-                alloy::providers::fillers::BlobGasFiller,
-                alloy::providers::fillers::JoinFill<
-                    alloy::providers::fillers::NonceFiller,
-                    alloy::providers::fillers::ChainIdFiller,
-                >,
-            >,
-        >,
-    >,
-    alloy::providers::RootProvider,
->;
+use crate::poller::types::{
+    AggregationModePaymentService, AggregationModePaymentServiceContract, RpcProvider,
+};
 
 pub struct PaymentsPoller {
     db: Db,

aggregation_mode/batcher/src/poller/types.rs

@@ -0,0 +1,43 @@
+use alloy::sol;
+
+sol!(
+    #[sol(rpc)]
+    AggregationModePaymentService,
+    "abi/AggregationModePaymentService.json"
+);
+
+pub(crate) type AggregationModePaymentServiceContract =
+    AggregationModePaymentService::AggregationModePaymentServiceInstance<
+        alloy::providers::fillers::FillProvider<
+            alloy::providers::fillers::JoinFill<
+                alloy::providers::Identity,
+                alloy::providers::fillers::JoinFill<
+                    alloy::providers::fillers::GasFiller,
+                    alloy::providers::fillers::JoinFill<
+                        alloy::providers::fillers::BlobGasFiller,
+                        alloy::providers::fillers::JoinFill<
+                            alloy::providers::fillers::NonceFiller,
+                            alloy::providers::fillers::ChainIdFiller,
+                        >,
+                    >,
+                >,
+            >,
+            alloy::providers::RootProvider,
+        >,
+    >;
+pub(crate) type RpcProvider = alloy::providers::fillers::FillProvider<
+    alloy::providers::fillers::JoinFill<
+        alloy::providers::Identity,
+        alloy::providers::fillers::JoinFill<
+            alloy::providers::fillers::GasFiller,
+            alloy::providers::fillers::JoinFill<
+                alloy::providers::fillers::BlobGasFiller,
+                alloy::providers::fillers::JoinFill<
+                    alloy::providers::fillers::NonceFiller,
+                    alloy::providers::fillers::ChainIdFiller,
+                >,
+            >,
+        >,
+    >,
+    alloy::providers::RootProvider,
+>;