File tree Expand file tree Collapse file tree 7 files changed +11
-10
lines changed
Expand file tree Collapse file tree 7 files changed +11
-10
lines changed Original file line number Diff line number Diff line change 11use std:: env;
22
33use agg_mode_batcher:: config:: Config ;
4- use agg_mode_batcher:: payments:: PaymentsPooler ;
4+ use agg_mode_batcher:: payments:: PaymentsPoller ;
55use agg_mode_batcher:: { db:: Db , server:: http:: BatcherServer } ;
66use tracing_subscriber:: { EnvFilter , FmtSubscriber } ;
77
88fn read_config_filepath_from_args ( ) -> String {
99 let args: Vec < String > = env:: args ( ) . collect ( ) ;
1010 if args. len ( ) < 2 {
1111 panic ! (
12- "You mus provide a config file. Usage: {} <config-file-path>" ,
12+ "You must provide a config file. Usage: {} <config-file-path>" ,
1313 args[ 0 ]
1414 ) ;
1515 }
@@ -32,7 +32,7 @@ async fn main() {
3232 . await
3333 . expect ( "db to start" ) ;
3434
35- let payment_poller = PaymentsPooler :: new ( db. clone ( ) , config. clone ( ) ) ;
35+ let payment_poller = PaymentsPoller :: new ( db. clone ( ) , config. clone ( ) ) ;
3636 let http_server = BatcherServer :: new ( db, config. clone ( ) ) ;
3737
3838 let payment_poller_handle = tokio:: spawn ( async move { payment_poller. start ( ) . await } ) ;
Original file line number Diff line number Diff line change @@ -50,13 +50,13 @@ type RpcProvider = alloy::providers::fillers::FillProvider<
5050 alloy:: providers:: RootProvider ,
5151> ;
5252
53- pub struct PaymentsPooler {
53+ pub struct PaymentsPoller {
5454 db : Db ,
5555 proof_aggregation_service : AggregationModePaymentServiceContract ,
5656 rpc_provider : RpcProvider ,
5757}
5858
59- impl PaymentsPooler {
59+ impl PaymentsPoller {
6060 pub fn new ( db : Db , config : Config ) -> Self {
6161 let rpc_url = config. eth_rpc_url . parse ( ) . expect ( "RPC URL should be valid" ) ;
6262 let rpc_provider = ProviderBuilder :: new ( ) . connect_http ( rpc_url) ;
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ use sqlx::types::BigDecimal;
1212
1313use super :: {
1414 helpers:: format_merkle_path,
15- types:: { AppResponse , ProofMerkleQuery } ,
15+ types:: { AppResponse , GetProofMerklePathQueryParams } ,
1616} ;
1717
1818use crate :: {
@@ -169,7 +169,7 @@ impl BatcherServer {
169169
170170 async fn get_proof_merkle_path (
171171 req : HttpRequest ,
172- params : web:: Query < ProofMerkleQuery > ,
172+ params : web:: Query < GetProofMerklePathQueryParams > ,
173173 ) -> impl Responder {
174174 let Some ( state) = req. app_data :: < Data < BatcherServer > > ( ) else {
175175 return HttpResponse :: InternalServerError ( )
Original file line number Diff line number Diff line change @@ -26,8 +26,9 @@ impl AppResponse {
2626 }
2727}
2828
29+ /// Query parameters accepted by `GET /proof/merkle`, containing an optional proof id.
2930#[ derive( Deserialize , Clone ) ]
30- pub ( super ) struct ProofMerkleQuery {
31+ pub ( super ) struct GetProofMerklePathQueryParams {
3132 pub id : Option < String > ,
3233}
3334
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ fn read_db_conn_from_args() -> String {
44 let args: Vec < String > = std:: env:: args ( ) . collect ( ) ;
55 if args. len ( ) < 2 {
66 panic ! (
7- "You mus provide a config file. Usage: {} <config-file-path>" ,
7+ "You must provide a config file. Usage: {} <config-file-path>" ,
88 args[ 0 ]
99 ) ;
1010 }
File renamed without changes.
Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ aggregation_mode_payment_service_output=./script/output/devnet/aggregation_mode_
106106proof_aggregation_service_temp1=$proof_aggregation_service_output .temp1.json
107107proof_aggregation_service_temp2=$proof_aggregation_service_output .temp2.json
108108
109- forge script script/deploy/AggregationModePaymentService .s.sol \
109+ forge script script/deploy/AggregationModePaymentServiceDeployer .s.sol \
110110 ./script/deploy/config/devnet/proof-aggregator-service.devnet.config.json \
111111 $aggregation_mode_payment_service_output \
112112 --rpc-url " http://localhost:8545" \
You can’t perform that action at this time.
0 commit comments