From 89cddc62cc1e17fc29cd481f06737937638574f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Fri, 6 Oct 2023 12:19:04 +0100 Subject: [PATCH] cargo fmt --- common/client-libs/validator-client/src/nym_api/mod.rs | 8 +++++++- nym-api/src/support/caching/refresher.rs | 2 +- nym-api/src/support/config/mod.rs | 3 +-- nym-node/nym-node-requests/src/api/client.rs | 9 ++++++--- nym-node/nym-node-requests/src/api/mod.rs | 2 +- nym-node/nym-node-requests/src/api/v1/mixnode/mod.rs | 2 +- .../src/api/v1/network_requester/mod.rs | 2 +- nym-node/nym-node-requests/src/api/v1/node/mod.rs | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/common/client-libs/validator-client/src/nym_api/mod.rs b/common/client-libs/validator-client/src/nym_api/mod.rs index 1d9f1d136f..21ac049840 100644 --- a/common/client-libs/validator-client/src/nym_api/mod.rs +++ b/common/client-libs/validator-client/src/nym_api/mod.rs @@ -8,7 +8,13 @@ use http_api_client::{ApiClient, NO_PARAMS}; use nym_api_requests::coconut::{ BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse, }; -use nym_api_requests::models::{ComputeRewardEstParam, DescribedGateway, GatewayBondAnnotated, GatewayCoreStatusResponse, GatewayStatusReportResponse, GatewayUptimeHistoryResponse, InclusionProbabilityResponse, MixNodeBondAnnotated, MixnodeCoreStatusResponse, MixnodeStatusReportResponse, MixnodeStatusResponse, MixnodeUptimeHistoryResponse, RewardEstimationResponse, StakeSaturationResponse, UptimeResponse}; +use nym_api_requests::models::{ + ComputeRewardEstParam, DescribedGateway, GatewayBondAnnotated, GatewayCoreStatusResponse, + GatewayStatusReportResponse, GatewayUptimeHistoryResponse, InclusionProbabilityResponse, + MixNodeBondAnnotated, MixnodeCoreStatusResponse, MixnodeStatusReportResponse, + MixnodeStatusResponse, MixnodeUptimeHistoryResponse, RewardEstimationResponse, + StakeSaturationResponse, UptimeResponse, +}; use nym_mixnet_contract_common::mixnode::MixNodeDetails; use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId}; use nym_name_service_common::response::NamesListResponse; diff --git a/nym-api/src/support/caching/refresher.rs b/nym-api/src/support/caching/refresher.rs index 9487f5130c..bb0435a6cf 100644 --- a/nym-api/src/support/caching/refresher.rs +++ b/nym-api/src/support/caching/refresher.rs @@ -113,7 +113,7 @@ where pub async fn run(&self, mut task_client: TaskClient) { self.provider.wait_until_ready().await; - + let mut refresh_interval = interval(self.refreshing_interval); while !task_client.is_shutdown() { tokio::select! { diff --git a/nym-api/src/support/config/mod.rs b/nym-api/src/support/config/mod.rs index a215bdd4aa..43eb0ddf8a 100644 --- a/nym-api/src/support/config/mod.rs +++ b/nym-api/src/support/config/mod.rs @@ -53,7 +53,6 @@ const DEFAULT_CIRCULATING_SUPPLY_CACHE_INTERVAL: Duration = Duration::from_secs( pub(crate) const DEFAULT_NODE_DESCRIBE_CACHE_INTERVAL: Duration = Duration::from_secs(4500); pub(crate) const DEFAULT_NODE_DESCRIBE_BATCH_SIZE: usize = 50; - const DEFAULT_MONITOR_THRESHOLD: u8 = 60; const DEFAULT_MIN_MIXNODE_RELIABILITY: u8 = 50; const DEFAULT_MIN_GATEWAY_RELIABILITY: u8 = 20; @@ -459,7 +458,7 @@ pub struct TopologyCacherDebug { #[serde(with = "humantime_serde")] pub node_describe_caching_interval: Duration, - + pub node_describe_batch_size: usize, } diff --git a/nym-node/nym-node-requests/src/api/client.rs b/nym-node/nym-node-requests/src/api/client.rs index acd3fbb503..2a20f38604 100644 --- a/nym-node/nym-node-requests/src/api/client.rs +++ b/nym-node/nym-node-requests/src/api/client.rs @@ -19,9 +19,12 @@ pub trait NymNodeApiClientExt: ApiClient { self.get_json_from(routes::api::v1::host_info_absolute()) .await } - - async fn get_build_information(&self) -> Result { - self.get_json_from(routes::api::v1::build_info_absolute()).await + + async fn get_build_information( + &self, + ) -> Result { + self.get_json_from(routes::api::v1::build_info_absolute()) + .await } // TODO: implement calls for other endpoints; for now I only care about the wss diff --git a/nym-node/nym-node-requests/src/api/mod.rs b/nym-node/nym-node-requests/src/api/mod.rs index 22cf67ce10..e947b76885 100644 --- a/nym-node/nym-node-requests/src/api/mod.rs +++ b/nym-node/nym-node-requests/src/api/mod.rs @@ -57,7 +57,7 @@ impl SignedHostInformation { let Ok(pub_key) = identity::PublicKey::from_base58_string(&self.keys.ed25519) else { return false; }; - + self.verify(&pub_key) } } diff --git a/nym-node/nym-node-requests/src/api/v1/mixnode/mod.rs b/nym-node/nym-node-requests/src/api/v1/mixnode/mod.rs index afafedca78..c57081432b 100644 --- a/nym-node/nym-node-requests/src/api/v1/mixnode/mod.rs +++ b/nym-node/nym-node-requests/src/api/v1/mixnode/mod.rs @@ -1,4 +1,4 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -pub mod models; \ No newline at end of file +pub mod models; diff --git a/nym-node/nym-node-requests/src/api/v1/network_requester/mod.rs b/nym-node/nym-node-requests/src/api/v1/network_requester/mod.rs index afafedca78..c57081432b 100644 --- a/nym-node/nym-node-requests/src/api/v1/network_requester/mod.rs +++ b/nym-node/nym-node-requests/src/api/v1/network_requester/mod.rs @@ -1,4 +1,4 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -pub mod models; \ No newline at end of file +pub mod models; diff --git a/nym-node/nym-node-requests/src/api/v1/node/mod.rs b/nym-node/nym-node-requests/src/api/v1/node/mod.rs index afafedca78..c57081432b 100644 --- a/nym-node/nym-node-requests/src/api/v1/node/mod.rs +++ b/nym-node/nym-node-requests/src/api/v1/node/mod.rs @@ -1,4 +1,4 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -pub mod models; \ No newline at end of file +pub mod models;