From 4e66872a6eaf04229c5df782ef18f9abd96b9066 Mon Sep 17 00:00:00 2001 From: Godmode Galactus Date: Thu, 31 Aug 2023 14:26:46 +0200 Subject: [PATCH] Cargo fmt --- cluster-endpoints/src/json_rpc_leaders_getter.rs | 2 +- lite-rpc/src/cli.rs | 3 ++- lite-rpc/src/lib.rs | 2 +- lite-rpc/src/main.rs | 5 ++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cluster-endpoints/src/json_rpc_leaders_getter.rs b/cluster-endpoints/src/json_rpc_leaders_getter.rs index cc8f6811..a72e2ef3 100644 --- a/cluster-endpoints/src/json_rpc_leaders_getter.rs +++ b/cluster-endpoints/src/json_rpc_leaders_getter.rs @@ -51,7 +51,7 @@ impl JsonRpcLeaderGetter { .get_slot_leaders(first_slot_to_fetch, last_slot_needed - first_slot_to_fetch) .await .context("failed to get slot leaders")?; - + for leader_slot in first_slot_to_fetch..last_slot_needed { let current_leader = (leader_slot - first_slot_to_fetch) as usize; let pubkey = leaders[current_leader]; diff --git a/lite-rpc/src/cli.rs b/lite-rpc/src/cli.rs index c6e5dab3..f1ac9489 100644 --- a/lite-rpc/src/cli.rs +++ b/lite-rpc/src/cli.rs @@ -1,5 +1,6 @@ use crate::{ - DEFAULT_FANOUT_SIZE, DEFAULT_RETRY_TIMEOUT, DEFAULT_RPC_ADDR, DEFAULT_WS_ADDR, MAX_RETRIES, DEFAULT_GRPC_ADDR + DEFAULT_FANOUT_SIZE, DEFAULT_GRPC_ADDR, DEFAULT_RETRY_TIMEOUT, DEFAULT_RPC_ADDR, + DEFAULT_WS_ADDR, MAX_RETRIES, }; use clap::Parser; diff --git a/lite-rpc/src/lib.rs b/lite-rpc/src/lib.rs index 6815a2a3..9a2ba671 100644 --- a/lite-rpc/src/lib.rs +++ b/lite-rpc/src/lib.rs @@ -39,4 +39,4 @@ pub const DEFAULT_TRANSACTION_CONFIRMATION_STATUS: TransactionConfirmationStatus pub const DEFAULT_GRPC_ADDR: &str = "http://127.0.0.0:10000"; #[from_env] -pub const GRPC_VERSION: &str = "1.16.1"; \ No newline at end of file +pub const GRPC_VERSION: &str = "1.16.1"; diff --git a/lite-rpc/src/main.rs b/lite-rpc/src/main.rs index d3f182e8..1bde52bf 100644 --- a/lite-rpc/src/main.rs +++ b/lite-rpc/src/main.rs @@ -5,10 +5,10 @@ use std::time::Duration; use anyhow::bail; use clap::Parser; use dotenv::dotenv; -use lite_rpc::{DEFAULT_MAX_NUMBER_OF_TXS_IN_QUEUE, GRPC_VERSION}; use lite_rpc::postgres::Postgres; use lite_rpc::service_spawner::ServiceSpawner; use lite_rpc::{bridge::LiteBridge, cli::Args}; +use lite_rpc::{DEFAULT_MAX_NUMBER_OF_TXS_IN_QUEUE, GRPC_VERSION}; use solana_lite_rpc_cluster_endpoints::endpoint_stremers::EndpointStreaming; use solana_lite_rpc_cluster_endpoints::grpc_subscription::create_grpc_subscription; @@ -120,8 +120,7 @@ pub async fn start_lite_rpc(args: Args) -> anyhow::Result<()> { // rpc client let rpc_client = Arc::new(RpcClient::new(rpc_addr.clone())); - let (subscriptions, cluster_endpoint_tasks) = if use_grpc - { + let (subscriptions, cluster_endpoint_tasks) = if use_grpc { create_grpc_subscription(rpc_client.clone(), grpc_addr, GRPC_VERSION.to_string())? } else { create_json_rpc_polling_subscription(rpc_client.clone())?