From a2b1917d062ba0fcd74f90fd08cd0a5f64804043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Sun, 26 May 2024 13:30:30 +0100 Subject: [PATCH] explicitly import all macros --- nym-api/Cargo.toml | 5 ++++- nym-api/src/circulating_supply_api/cache/mod.rs | 1 + .../src/circulating_supply_api/cache/refresher.rs | 1 + nym-api/src/circulating_supply_api/routes.rs | 2 +- nym-api/src/coconut/api_routes/mod.rs | 15 +++++++-------- nym-api/src/coconut/client.rs | 1 + nym-api/src/coconut/comm.rs | 1 + nym-api/src/coconut/dkg/controller/keys.rs | 1 + nym-api/src/coconut/dkg/controller/mod.rs | 1 + nym-api/src/coconut/dkg/dealing.rs | 2 +- nym-api/src/coconut/dkg/key_derivation.rs | 2 +- nym-api/src/coconut/dkg/key_finalization.rs | 1 + nym-api/src/coconut/dkg/key_validation.rs | 1 + nym-api/src/coconut/dkg/public_key.rs | 2 +- nym-api/src/coconut/dkg/state/mod.rs | 2 +- nym-api/src/coconut/mod.rs | 1 + nym-api/src/coconut/state.rs | 1 + nym-api/src/coconut/storage/manager.rs | 1 + nym-api/src/coconut/storage/mod.rs | 1 + .../src/epoch_operations/event_reconciliation.rs | 1 + nym-api/src/epoch_operations/mod.rs | 1 + .../epoch_operations/rewarded_set_assignment.rs | 1 + nym-api/src/epoch_operations/rewarding.rs | 1 + .../src/epoch_operations/transition_beginning.rs | 1 + nym-api/src/main.rs | 6 ++---- nym-api/src/network/routes.rs | 2 +- nym-api/src/network_monitor/mod.rs | 1 + nym-api/src/network_monitor/monitor/mod.rs | 2 +- nym-api/src/network_monitor/monitor/preparer.rs | 2 +- nym-api/src/network_monitor/monitor/processor.rs | 2 +- nym-api/src/network_monitor/monitor/receiver.rs | 1 + nym-api/src/node_describe_cache/mod.rs | 2 ++ .../cache/inclusion_probabilities.rs | 1 + nym-api/src/node_status_api/cache/mod.rs | 1 + nym-api/src/node_status_api/cache/refresher.rs | 1 + nym-api/src/node_status_api/local_guard.rs | 1 + nym-api/src/node_status_api/models.rs | 1 + nym-api/src/node_status_api/routes.rs | 5 +++-- nym-api/src/node_status_api/uptime_updater.rs | 2 +- nym-api/src/nym_contract_cache/cache/mod.rs | 1 + nym-api/src/nym_contract_cache/cache/refresher.rs | 1 + nym-api/src/nym_contract_cache/routes.rs | 2 +- nym-api/src/nym_nodes/routes.rs | 2 +- nym-api/src/status/routes.rs | 2 +- nym-api/src/support/caching/refresher.rs | 2 ++ nym-api/src/support/config/mod.rs | 1 + nym-api/src/support/http/helpers.rs | 1 + nym-api/src/support/http/mod.rs | 2 +- nym-api/src/support/storage/mod.rs | 1 + 49 files changed, 63 insertions(+), 29 deletions(-) diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index 989f6a1880..4d8afba3a1 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -61,7 +61,10 @@ rocket_cors = { workspace = true } rocket_okapi = { workspace = true, features = ["swagger"] } okapi = { workspace = true, features = ["impl_json_schema"] } - +#axum.workspace = true +#tower-http = { workspace = true, features = ["cors"] } +#utoipa = { workspace = true, features = ["axum_extras", "time"] } +#utoipa-swagger-ui = { workspace = true, features = ["axum"] } ## ephemera-specific #actix-web = "4" diff --git a/nym-api/src/circulating_supply_api/cache/mod.rs b/nym-api/src/circulating_supply_api/cache/mod.rs index af5568b158..6d854dddc5 100644 --- a/nym-api/src/circulating_supply_api/cache/mod.rs +++ b/nym-api/src/circulating_supply_api/cache/mod.rs @@ -3,6 +3,7 @@ use self::data::CirculatingSupplyCacheData; use cosmwasm_std::Addr; +use log::error; use nym_api_requests::models::CirculatingSupplyResponse; use nym_validator_client::nyxd::error::NyxdError; use nym_validator_client::nyxd::Coin; diff --git a/nym-api/src/circulating_supply_api/cache/refresher.rs b/nym-api/src/circulating_supply_api/cache/refresher.rs index f983390356..3823d8c582 100644 --- a/nym-api/src/circulating_supply_api/cache/refresher.rs +++ b/nym-api/src/circulating_supply_api/cache/refresher.rs @@ -4,6 +4,7 @@ use super::CirculatingSupplyCache; use crate::circulating_supply_api::cache::CirculatingSupplyCacheError; use crate::support::nyxd::Client; +use log::{error, trace}; use nym_contracts_common::truncate_decimal; use nym_task::TaskClient; use nym_validator_client::nyxd::Coin; diff --git a/nym-api/src/circulating_supply_api/routes.rs b/nym-api/src/circulating_supply_api/routes.rs index 5bc76ab8bb..576d15334a 100644 --- a/nym-api/src/circulating_supply_api/routes.rs +++ b/nym-api/src/circulating_supply_api/routes.rs @@ -7,7 +7,7 @@ use nym_api_requests::models::CirculatingSupplyResponse; use nym_validator_client::nyxd::Coin; use rocket::http::Status; use rocket::serde::json::Json; -use rocket::State; +use rocket::{get, State}; use rocket_okapi::openapi; // TODO: this is not the best place to put it, it should be more centralised, diff --git a/nym-api/src/coconut/api_routes/mod.rs b/nym-api/src/coconut/api_routes/mod.rs index d56202f067..9da042c40a 100644 --- a/nym-api/src/coconut/api_routes/mod.rs +++ b/nym-api/src/coconut/api_routes/mod.rs @@ -1,15 +1,8 @@ // Copyright 2023-2024 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only -use std::ops::Deref; - use k256::ecdsa::signature::Verifier; -use rand::rngs::OsRng; -use rand::RngCore; -use rocket::serde::json::Json; -use rocket::State as RocketState; -use time::OffsetDateTime; - +use log::{debug, error, trace}; use nym_api_requests::coconut::models::{ CredentialsRequestBody, EpochCredentialsResponse, FreePassNonceResponse, FreePassRequest, IssuedCredentialResponse, IssuedCredentialsResponse, @@ -26,6 +19,12 @@ use nym_credentials::coconut::bandwidth::{ bandwidth_credential_params, CredentialType, IssuanceBandwidthCredential, }; use nym_validator_client::nyxd::Coin; +use rand::rngs::OsRng; +use rand::RngCore; +use rocket::serde::json::Json; +use rocket::{get, post, State as RocketState}; +use std::ops::Deref; +use time::OffsetDateTime; use crate::coconut::api_routes::helpers::build_credentials_response; use crate::coconut::error::{CoconutError, Result}; diff --git a/nym-api/src/coconut/client.rs b/nym-api/src/coconut/client.rs index d009989996..d80e65383c 100644 --- a/nym-api/src/coconut/client.rs +++ b/nym-api/src/coconut/client.rs @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only use crate::coconut::error::Result; +use async_trait::async_trait; use cw3::{ProposalResponse, VoteResponse}; use cw4::MemberResponse; use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse; diff --git a/nym-api/src/coconut/comm.rs b/nym-api/src/coconut/comm.rs index 48e7823fce..b54e220169 100644 --- a/nym-api/src/coconut/comm.rs +++ b/nym-api/src/coconut/comm.rs @@ -4,6 +4,7 @@ use crate::coconut::error::Result; use crate::nyxd; use crate::support::nyxd::ClientInner; +use async_trait::async_trait; use nym_coconut::VerificationKey; use nym_coconut_dkg_common::types::{Epoch, EpochId}; use nym_credentials::coconut::utils::obtain_aggregate_verification_key; diff --git a/nym-api/src/coconut/dkg/controller/keys.rs b/nym-api/src/coconut/dkg/controller/keys.rs index ce0d16930a..1eb179cef5 100644 --- a/nym-api/src/coconut/dkg/controller/keys.rs +++ b/nym-api/src/coconut/dkg/controller/keys.rs @@ -5,6 +5,7 @@ use crate::coconut::client::Client; use crate::coconut::keys::KeyPairWithEpoch; use crate::support::{config, nyxd}; use anyhow::{anyhow, bail, Context}; +use log::warn; use nym_coconut_dkg_common::types::{EpochId, EpochState}; use nym_dkg::bte::keys::KeyPair as DkgKeyPair; use rand::{CryptoRng, RngCore}; diff --git a/nym-api/src/coconut/dkg/controller/mod.rs b/nym-api/src/coconut/dkg/controller/mod.rs index db9ce0a82c..a6d34421dc 100644 --- a/nym-api/src/coconut/dkg/controller/mod.rs +++ b/nym-api/src/coconut/dkg/controller/mod.rs @@ -8,6 +8,7 @@ use crate::coconut::keys::KeyPair as CoconutKeyPair; use crate::nyxd; use crate::support::config; use anyhow::{bail, Result}; +use log::{debug, error, info, trace, warn}; use nym_coconut_dkg_common::types::{Epoch, EpochId, EpochState}; use nym_crypto::asymmetric::identity; use nym_dkg::bte::keys::KeyPair as DkgKeyPair; diff --git a/nym-api/src/coconut/dkg/dealing.rs b/nym-api/src/coconut/dkg/dealing.rs index 21b5803854..f7191fa77e 100644 --- a/nym-api/src/coconut/dkg/dealing.rs +++ b/nym-api/src/coconut/dkg/dealing.rs @@ -6,7 +6,7 @@ use crate::coconut::dkg::controller::keys::archive_coconut_keypair; use crate::coconut::dkg::controller::DkgController; use crate::coconut::error::CoconutError; use crate::coconut::keys::KeyPairWithEpoch; -use log::debug; +use log::{debug, error, info, warn}; use nym_coconut_dkg_common::dealing::{chunk_dealing, DealingChunkInfo, MAX_DEALING_CHUNK_SIZE}; use nym_coconut_dkg_common::types::{DealingIndex, EpochId}; use nym_dkg::{Dealing, Scalar}; diff --git a/nym-api/src/coconut/dkg/key_derivation.rs b/nym-api/src/coconut/dkg/key_derivation.rs index eb6c5b7214..f8e141d4f7 100644 --- a/nym-api/src/coconut/dkg/key_derivation.rs +++ b/nym-api/src/coconut/dkg/key_derivation.rs @@ -9,7 +9,7 @@ use crate::coconut::error::CoconutError; use crate::coconut::keys::KeyPairWithEpoch; use crate::coconut::state::bandwidth_credential_params; use cosmwasm_std::Addr; -use log::debug; +use log::{debug, error, info, warn}; use nym_coconut::KeyPair as CoconutKeyPair; use nym_coconut::{check_vk_pairing, Base58, SecretKey, VerificationKey}; use nym_coconut_dkg_common::event_attributes::DKG_PROPOSAL_ID; diff --git a/nym-api/src/coconut/dkg/key_finalization.rs b/nym-api/src/coconut/dkg/key_finalization.rs index 628f04daa3..41b819672f 100644 --- a/nym-api/src/coconut/dkg/key_finalization.rs +++ b/nym-api/src/coconut/dkg/key_finalization.rs @@ -4,6 +4,7 @@ use crate::coconut::dkg::controller::DkgController; use crate::coconut::error::CoconutError; use cw3::Status; +use log::{debug, error, info, warn}; use nym_coconut_dkg_common::types::EpochId; use rand::{CryptoRng, RngCore}; use thiserror::Error; diff --git a/nym-api/src/coconut/dkg/key_validation.rs b/nym-api/src/coconut/dkg/key_validation.rs index ada4f72898..b32187a54a 100644 --- a/nym-api/src/coconut/dkg/key_validation.rs +++ b/nym-api/src/coconut/dkg/key_validation.rs @@ -6,6 +6,7 @@ use crate::coconut::error::CoconutError; use crate::coconut::state::bandwidth_credential_params; use cosmwasm_std::Addr; use cw3::Vote; +use log::{debug, error, info, warn}; use nym_coconut::{check_vk_pairing, Base58, VerificationKey}; use nym_coconut_dkg_common::types::EpochId; use nym_coconut_dkg_common::verification_key::ContractVKShare; diff --git a/nym-api/src/coconut/dkg/public_key.rs b/nym-api/src/coconut/dkg/public_key.rs index b7a899b6cb..eb8d8d03bc 100644 --- a/nym-api/src/coconut/dkg/public_key.rs +++ b/nym-api/src/coconut/dkg/public_key.rs @@ -3,7 +3,7 @@ use crate::coconut::dkg::controller::DkgController; use crate::coconut::error::CoconutError; -use log::debug; +use log::{debug, info}; use nym_coconut_dkg_common::types::EpochId; use rand::{CryptoRng, RngCore}; use thiserror::Error; diff --git a/nym-api/src/coconut/dkg/state/mod.rs b/nym-api/src/coconut/dkg/state/mod.rs index 5ef0fae275..1decde92f1 100644 --- a/nym-api/src/coconut/dkg/state/mod.rs +++ b/nym-api/src/coconut/dkg/state/mod.rs @@ -12,7 +12,7 @@ use crate::coconut::dkg::state::registration::{ use crate::coconut::error::CoconutError; use crate::coconut::keys::{KeyPair as CoconutKeyPair, KeyPairWithEpoch}; use cosmwasm_std::Addr; -use log::debug; +use log::{debug, warn}; use nym_coconut_dkg_common::dealer::DealerDetails; use nym_coconut_dkg_common::types::EpochId; use nym_crypto::asymmetric::identity; diff --git a/nym-api/src/coconut/mod.rs b/nym-api/src/coconut/mod.rs index 5047982304..d56774ba48 100644 --- a/nym-api/src/coconut/mod.rs +++ b/nym-api/src/coconut/mod.rs @@ -10,6 +10,7 @@ use nym_config::defaults::NYM_API_VERSION; use nym_crypto::asymmetric::identity; use nym_validator_client::nym_api::routes::{BANDWIDTH, COCONUT_ROUTES}; use rocket::fairing::AdHoc; +use rocket::routes; pub(crate) mod api_routes; pub(crate) mod client; diff --git a/nym-api/src/coconut/state.rs b/nym-api/src/coconut/state.rs index ac7c3632f8..72cbb90fd9 100644 --- a/nym-api/src/coconut/state.rs +++ b/nym-api/src/coconut/state.rs @@ -8,6 +8,7 @@ use crate::coconut::error::{CoconutError, Result}; use crate::coconut::keys::KeyPair; use crate::coconut::storage::CoconutStorageExt; use crate::support::storage::NymApiStorage; +use log::{debug, warn}; use nym_api_requests::coconut::helpers::issued_credential_plaintext; use nym_api_requests::coconut::BlindSignRequestBody; use nym_coconut::{BlindedSignature, VerificationKey}; diff --git a/nym-api/src/coconut/storage/manager.rs b/nym-api/src/coconut/storage/manager.rs index 8cea9ef898..5dc21fa29c 100644 --- a/nym-api/src/coconut/storage/manager.rs +++ b/nym-api/src/coconut/storage/manager.rs @@ -3,6 +3,7 @@ use crate::coconut::storage::models::{EpochCredentials, IssuedCredential}; use crate::support::storage::manager::StorageManager; +use async_trait::async_trait; use nym_coconut_dkg_common::types::EpochId; use thiserror::Error; diff --git a/nym-api/src/coconut/storage/mod.rs b/nym-api/src/coconut/storage/mod.rs index 1b29f51b43..8ef1b0cec0 100644 --- a/nym-api/src/coconut/storage/mod.rs +++ b/nym-api/src/coconut/storage/mod.rs @@ -5,6 +5,7 @@ use crate::coconut::storage::manager::CoconutStorageManagerExt; use crate::coconut::storage::models::{join_attributes, EpochCredentials, IssuedCredential}; use crate::node_status_api::models::NymApiStorageError; use crate::support::storage::NymApiStorage; +use async_trait::async_trait; use nym_api_requests::coconut::models::Pagination; use nym_coconut::{Base58, BlindedSignature}; use nym_coconut_dkg_common::types::EpochId; diff --git a/nym-api/src/epoch_operations/event_reconciliation.rs b/nym-api/src/epoch_operations/event_reconciliation.rs index 47230463c9..da27322def 100644 --- a/nym-api/src/epoch_operations/event_reconciliation.rs +++ b/nym-api/src/epoch_operations/event_reconciliation.rs @@ -3,6 +3,7 @@ use crate::epoch_operations::error::RewardingError; use crate::RewardedSetUpdater; +use log::{error, warn}; use nym_mixnet_contract_common::EpochState; use std::cmp::max; diff --git a/nym-api/src/epoch_operations/mod.rs b/nym-api/src/epoch_operations/mod.rs index 7bb3116086..3edca31440 100644 --- a/nym-api/src/epoch_operations/mod.rs +++ b/nym-api/src/epoch_operations/mod.rs @@ -18,6 +18,7 @@ use crate::support::nyxd::Client; use crate::support::storage::NymApiStorage; use error::RewardingError; pub(crate) use helpers::MixnodeWithPerformance; +use log::{error, info, trace, warn}; use nym_mixnet_contract_common::{CurrentIntervalResponse, Interval}; use nym_task::{TaskClient, TaskManager}; use std::collections::HashSet; diff --git a/nym-api/src/epoch_operations/rewarded_set_assignment.rs b/nym-api/src/epoch_operations/rewarded_set_assignment.rs index 08a794768c..6b3ac1be86 100644 --- a/nym-api/src/epoch_operations/rewarded_set_assignment.rs +++ b/nym-api/src/epoch_operations/rewarded_set_assignment.rs @@ -5,6 +5,7 @@ use crate::epoch_operations::error::RewardingError; use crate::epoch_operations::helpers::stake_to_f64; use crate::RewardedSetUpdater; use cosmwasm_std::Decimal; +use log::{debug, error, warn}; use nym_mixnet_contract_common::families::FamilyHead; use nym_mixnet_contract_common::reward_params::Performance; use nym_mixnet_contract_common::{ diff --git a/nym-api/src/epoch_operations/rewarding.rs b/nym-api/src/epoch_operations/rewarding.rs index 2f8ae6160b..c88693416c 100644 --- a/nym-api/src/epoch_operations/rewarding.rs +++ b/nym-api/src/epoch_operations/rewarding.rs @@ -4,6 +4,7 @@ use crate::epoch_operations::error::RewardingError; use crate::epoch_operations::helpers::MixnodeWithPerformance; use crate::RewardedSetUpdater; +use log::{error, warn}; use nym_mixnet_contract_common::{EpochState, Interval, MixId}; impl RewardedSetUpdater { diff --git a/nym-api/src/epoch_operations/transition_beginning.rs b/nym-api/src/epoch_operations/transition_beginning.rs index f6e8f87b6a..bbabc13f25 100644 --- a/nym-api/src/epoch_operations/transition_beginning.rs +++ b/nym-api/src/epoch_operations/transition_beginning.rs @@ -3,6 +3,7 @@ use crate::epoch_operations::error::RewardingError; use crate::epoch_operations::RewardedSetUpdater; +use log::{error, info}; impl RewardedSetUpdater { // returns boolean indicating whether we should bother continuing diff --git a/nym-api/src/main.rs b/nym-api/src/main.rs index 5731c1ade3..f84a8f2eda 100644 --- a/nym-api/src/main.rs +++ b/nym-api/src/main.rs @@ -1,9 +1,6 @@ // Copyright 2020-2023 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only -#[macro_use] -extern crate rocket; - use crate::coconut::dkg::controller::keys::{ can_validate_coconut_keys, load_bte_keypair, load_coconut_keypair_if_exists, }; @@ -20,6 +17,7 @@ use ::nym_config::defaults::setup_env; use circulating_supply_api::cache::CirculatingSupplyCache; use clap::Parser; use coconut::dkg::controller::DkgController; +use log::{info, trace}; use node_status_api::NodeStatusCache; use nym_bin_common::logging::setup_logging; use nym_config::defaults::NymNetworkDetails; @@ -86,7 +84,7 @@ async fn start_nym_api_tasks(config: Config) -> anyhow::Result let identity_public_key = *identity_keypair.public_key(); // let's build our rocket! - let rocket = http::setup_rocket( + let rocket = http::setup_rest_api( &config, network_details, nyxd_client.clone(), diff --git a/nym-api/src/network/routes.rs b/nym-api/src/network/routes.rs index 73625f8b88..30d3efe5fd 100644 --- a/nym-api/src/network/routes.rs +++ b/nym-api/src/network/routes.rs @@ -5,7 +5,7 @@ use crate::network::models::{ContractInformation, NetworkDetails}; use crate::nym_contract_cache::cache::NymContractCache; use nym_contracts_common::ContractBuildInformation; use rocket::serde::json::Json; -use rocket::State; +use rocket::{get, State}; use rocket_okapi::openapi; use std::collections::HashMap; use std::ops::Deref; diff --git a/nym-api/src/network_monitor/mod.rs b/nym-api/src/network_monitor/mod.rs index 29298be436..18e4a9fb5a 100644 --- a/nym-api/src/network_monitor/mod.rs +++ b/nym-api/src/network_monitor/mod.rs @@ -15,6 +15,7 @@ use crate::nym_contract_cache::cache::NymContractCache; use crate::storage::NymApiStorage; use crate::support::{config, nyxd}; use futures::channel::mpsc; +use log::info; use nym_bandwidth_controller::BandwidthController; use nym_credential_storage::persistent_storage::PersistentStorage; use nym_crypto::asymmetric::{encryption, identity}; diff --git a/nym-api/src/network_monitor/monitor/mod.rs b/nym-api/src/network_monitor/monitor/mod.rs index e4c35d8f4f..b9bea075d5 100644 --- a/nym-api/src/network_monitor/monitor/mod.rs +++ b/nym-api/src/network_monitor/monitor/mod.rs @@ -9,7 +9,7 @@ use crate::network_monitor::test_packet::NodeTestMessage; use crate::network_monitor::test_route::TestRoute; use crate::storage::NymApiStorage; use crate::support::config; -use log::{debug, error, info}; +use log::{debug, error, info, trace}; use nym_sphinx::params::PacketType; use nym_sphinx::receiver::MessageReceiver; use nym_task::TaskClient; diff --git a/nym-api/src/network_monitor/monitor/preparer.rs b/nym-api/src/network_monitor/monitor/preparer.rs index 4e9cfda0fd..c0bda14e96 100644 --- a/nym-api/src/network_monitor/monitor/preparer.rs +++ b/nym-api/src/network_monitor/monitor/preparer.rs @@ -4,7 +4,7 @@ use crate::network_monitor::monitor::sender::GatewayPackets; use crate::network_monitor::test_route::TestRoute; use crate::nym_contract_cache::cache::NymContractCache; -use log::info; +use log::{error, info, trace}; use nym_crypto::asymmetric::{encryption, identity}; use nym_mixnet_contract_common::{GatewayBond, Layer, MixNodeBond}; use nym_node_tester_utils::node::TestableNode; diff --git a/nym-api/src/network_monitor/monitor/processor.rs b/nym-api/src/network_monitor/monitor/processor.rs index 84ac4b3aeb..b5d7f81d68 100644 --- a/nym-api/src/network_monitor/monitor/processor.rs +++ b/nym-api/src/network_monitor/monitor/processor.rs @@ -7,7 +7,7 @@ use crate::network_monitor::ROUTE_TESTING_TEST_NONCE; use futures::channel::mpsc; use futures::lock::{Mutex, MutexGuard}; use futures::{SinkExt, StreamExt}; -use log::warn; +use log::{debug, error, trace, warn}; use nym_crypto::asymmetric::encryption; use nym_node_tester_utils::error::NetworkTestingError; use nym_node_tester_utils::processor::TestPacketProcessor; diff --git a/nym-api/src/network_monitor/monitor/receiver.rs b/nym-api/src/network_monitor/monitor/receiver.rs index be835fcc41..2beca8244e 100644 --- a/nym-api/src/network_monitor/monitor/receiver.rs +++ b/nym-api/src/network_monitor/monitor/receiver.rs @@ -5,6 +5,7 @@ use crate::network_monitor::gateways_reader::{GatewayMessages, GatewaysReader}; use crate::network_monitor::monitor::processor::ReceivedProcessorSender; use futures::channel::mpsc; use futures::StreamExt; +use log::trace; use nym_crypto::asymmetric::identity; use nym_gateway_client::{AcknowledgementReceiver, MixnetMessageReceiver}; use nym_task::TaskClient; diff --git a/nym-api/src/node_describe_cache/mod.rs b/nym-api/src/node_describe_cache/mod.rs index 7518a07402..b0df6a1315 100644 --- a/nym-api/src/node_describe_cache/mod.rs +++ b/nym-api/src/node_describe_cache/mod.rs @@ -6,7 +6,9 @@ use crate::support::caching::cache::{SharedCache, UninitialisedCache}; use crate::support::caching::refresher::{CacheItemProvider, CacheRefresher}; use crate::support::config; use crate::support::config::DEFAULT_NODE_DESCRIBE_BATCH_SIZE; +use async_trait::async_trait; use futures::{stream, StreamExt}; +use log::debug; use nym_api_requests::models::{ IpPacketRouterDetails, NetworkRequesterDetails, NymNodeDescription, }; diff --git a/nym-api/src/node_status_api/cache/inclusion_probabilities.rs b/nym-api/src/node_status_api/cache/inclusion_probabilities.rs index 4d53793d36..f477b08c2d 100644 --- a/nym-api/src/node_status_api/cache/inclusion_probabilities.rs +++ b/nym-api/src/node_status_api/cache/inclusion_probabilities.rs @@ -1,6 +1,7 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only +use log::error; use nym_api_requests::models::InclusionProbability; use nym_contracts_common::truncate_decimal; use nym_mixnet_contract_common::{MixId, MixNodeDetails, RewardingParams}; diff --git a/nym-api/src/node_status_api/cache/mod.rs b/nym-api/src/node_status_api/cache/mod.rs index 9261129e67..7089cf5e61 100644 --- a/nym-api/src/node_status_api/cache/mod.rs +++ b/nym-api/src/node_status_api/cache/mod.rs @@ -4,6 +4,7 @@ use self::data::NodeStatusCacheData; use self::inclusion_probabilities::InclusionProbabilities; use crate::support::caching::Cache; +use log::error; use nym_api_requests::models::{GatewayBondAnnotated, MixNodeBondAnnotated, MixnodeStatus}; use nym_contracts_common::{IdentityKey, IdentityKeyRef}; use nym_mixnet_contract_common::MixId; diff --git a/nym-api/src/node_status_api/cache/refresher.rs b/nym-api/src/node_status_api/cache/refresher.rs index e1dd3896f0..2c9cd20b51 100644 --- a/nym-api/src/node_status_api/cache/refresher.rs +++ b/nym-api/src/node_status_api/cache/refresher.rs @@ -15,6 +15,7 @@ use crate::{ storage::NymApiStorage, support::caching::CacheNotification, }; +use log::error; use nym_task::TaskClient; use std::time::Duration; use tokio::sync::watch; diff --git a/nym-api/src/node_status_api/local_guard.rs b/nym-api/src/node_status_api/local_guard.rs index 9be3a252c2..af5bf7f3d4 100644 --- a/nym-api/src/node_status_api/local_guard.rs +++ b/nym-api/src/node_status_api/local_guard.rs @@ -1,6 +1,7 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only +use log::warn; use rocket::http::Status; use rocket::request::{FromRequest, Outcome}; use rocket::Request; diff --git a/nym-api/src/node_status_api/models.rs b/nym-api/src/node_status_api/models.rs index 7d13d81522..155b98d210 100644 --- a/nym-api/src/node_status_api/models.rs +++ b/nym-api/src/node_status_api/models.rs @@ -3,6 +3,7 @@ use crate::node_status_api::utils::NodeUptimes; use crate::storage::models::NodeStatus; +use log::error; use nym_api_requests::models::{ GatewayStatusReportResponse, GatewayUptimeHistoryResponse, HistoricalUptimeResponse, MixnodeStatusReportResponse, MixnodeUptimeHistoryResponse, NodePerformance, RequestError, diff --git a/nym-api/src/node_status_api/routes.rs b/nym-api/src/node_status_api/routes.rs index 7f2f714a3f..2cd6faeb78 100644 --- a/nym-api/src/node_status_api/routes.rs +++ b/nym-api/src/node_status_api/routes.rs @@ -11,7 +11,7 @@ use nym_api_requests::models::{ }; use nym_mixnet_contract_common::MixId; use rocket::serde::json::Json; -use rocket::State; +use rocket::{get, post, State}; use rocket_okapi::openapi; use super::helpers::_get_gateways_detailed; @@ -233,6 +233,7 @@ pub mod unstable { use crate::node_status_api::models::ErrorResponse; use crate::support::http::helpers::PaginationRequest; use crate::support::storage::NymApiStorage; + use log::{error, trace}; use nym_api_requests::models::{ GatewayTestResultResponse, MixnodeTestResultResponse, PartialTestResult, TestNode, TestRoute, @@ -241,7 +242,7 @@ pub mod unstable { use nym_mixnet_contract_common::MixId; use rocket::http::Status; use rocket::serde::json::Json; - use rocket::State; + use rocket::{get, State}; use rocket_okapi::openapi; use std::cmp::min; use std::collections::HashMap; diff --git a/nym-api/src/node_status_api/uptime_updater.rs b/nym-api/src/node_status_api/uptime_updater.rs index fc09185b53..2730ce56ba 100644 --- a/nym-api/src/node_status_api/uptime_updater.rs +++ b/nym-api/src/node_status_api/uptime_updater.rs @@ -6,7 +6,7 @@ use crate::node_status_api::models::{ }; use crate::node_status_api::ONE_DAY; use crate::storage::NymApiStorage; -use log::error; +use log::{error, info, trace, warn}; use nym_task::{TaskClient, TaskManager}; use std::time::Duration; use time::{OffsetDateTime, PrimitiveDateTime, Time}; diff --git a/nym-api/src/nym_contract_cache/cache/mod.rs b/nym-api/src/nym_contract_cache/cache/mod.rs index cb366a38d3..c28c7f4106 100644 --- a/nym-api/src/nym_contract_cache/cache/mod.rs +++ b/nym-api/src/nym_contract_cache/cache/mod.rs @@ -4,6 +4,7 @@ use crate::nym_contract_cache::cache::data::CachedContractsInfo; use crate::support::caching::Cache; use data::ValidatorCacheData; +use log::{debug, error}; use nym_api_requests::models::MixnodeStatus; use nym_mixnet_contract_common::{ families::FamilyHead, GatewayBond, IdentityKey, Interval, MixId, MixNodeBond, MixNodeDetails, diff --git a/nym-api/src/nym_contract_cache/cache/refresher.rs b/nym-api/src/nym_contract_cache/cache/refresher.rs index ef94eec15d..6abb87a8f4 100644 --- a/nym-api/src/nym_contract_cache/cache/refresher.rs +++ b/nym-api/src/nym_contract_cache/cache/refresher.rs @@ -7,6 +7,7 @@ use crate::nyxd::Client; use crate::support::caching::CacheNotification; use anyhow::Result; use futures::future::join_all; +use log::{error, info, trace, warn}; use nym_mixnet_contract_common::{MixId, MixNodeDetails, RewardedSetNodeStatus}; use nym_task::TaskClient; use nym_validator_client::nyxd::contract_traits::{ diff --git a/nym-api/src/nym_contract_cache/routes.rs b/nym-api/src/nym_contract_cache/routes.rs index 01fbab47ac..01688ace50 100644 --- a/nym-api/src/nym_contract_cache/routes.rs +++ b/nym-api/src/nym_contract_cache/routes.rs @@ -15,7 +15,7 @@ use nym_mixnet_contract_common::{ use nym_name_service_common::response::NamesListResponse; use nym_service_provider_directory_common::response::ServicesListResponse; -use rocket::{serde::json::Json, State}; +use rocket::{get, serde::json::Json, State}; use rocket_okapi::openapi; use std::collections::HashSet; diff --git a/nym-api/src/nym_nodes/routes.rs b/nym-api/src/nym_nodes/routes.rs index 1df0250844..c350487c4d 100644 --- a/nym-api/src/nym_nodes/routes.rs +++ b/nym-api/src/nym_nodes/routes.rs @@ -6,7 +6,7 @@ use crate::nym_contract_cache::cache::NymContractCache; use crate::support::caching::cache::SharedCache; use nym_api_requests::models::DescribedGateway; use rocket::serde::json::Json; -use rocket::State; +use rocket::{get, State}; use rocket_okapi::openapi; use std::ops::Deref; diff --git a/nym-api/src/status/routes.rs b/nym-api/src/status/routes.rs index 614785eeba..a97be2d0fc 100644 --- a/nym-api/src/status/routes.rs +++ b/nym-api/src/status/routes.rs @@ -8,7 +8,7 @@ use nym_bin_common::build_information::BinaryBuildInformationOwned; use nym_coconut::Base58; use rocket::http::Status; use rocket::serde::json::Json; -use rocket::State; +use rocket::{get, State}; use rocket_okapi::openapi; #[openapi(tag = "Api Status")] diff --git a/nym-api/src/support/caching/refresher.rs b/nym-api/src/support/caching/refresher.rs index 6d32bb4f5a..3b91139a7c 100644 --- a/nym-api/src/support/caching/refresher.rs +++ b/nym-api/src/support/caching/refresher.rs @@ -2,6 +2,8 @@ // SPDX-License-Identifier: GPL-3.0-only use crate::support::caching::cache::SharedCache; +use async_trait::async_trait; +use log::error; use nym_task::TaskClient; use std::time::Duration; use tokio::time::interval; diff --git a/nym-api/src/support/config/mod.rs b/nym-api/src/support/config/mod.rs index c5191b7960..86e5a537c1 100644 --- a/nym-api/src/support/config/mod.rs +++ b/nym-api/src/support/config/mod.rs @@ -7,6 +7,7 @@ use crate::support::config::persistence::{ use crate::support::config::r#override::OverrideConfig; use crate::support::config::template::CONFIG_TEMPLATE; use anyhow::bail; +use log::debug; use nym_config::defaults::mainnet::read_parsed_var_if_not_default; use nym_config::defaults::var_names::{CONFIGURED, NYXD}; use nym_config::serde_helpers::de_maybe_stringified; diff --git a/nym-api/src/support/http/helpers.rs b/nym-api/src/support/http/helpers.rs index 45efa8f586..040b625c22 100644 --- a/nym-api/src/support/http/helpers.rs +++ b/nym-api/src/support/http/helpers.rs @@ -1,6 +1,7 @@ // Copyright 2024 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only +use rocket::FromForm; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/nym-api/src/support/http/mod.rs b/nym-api/src/support/http/mod.rs index 5d6493239c..e53ebcdd17 100644 --- a/nym-api/src/support/http/mod.rs +++ b/nym-api/src/support/http/mod.rs @@ -27,7 +27,7 @@ use rocket_okapi::swagger_ui::make_swagger_ui; pub(crate) mod helpers; pub(crate) mod openapi; -pub(crate) async fn setup_rocket( +pub(crate) async fn setup_rest_api( config: &Config, network_details: NetworkDetails, nyxd_client: nyxd::Client, diff --git a/nym-api/src/support/storage/mod.rs b/nym-api/src/support/storage/mod.rs index 201dfec366..2cc2054bbc 100644 --- a/nym-api/src/support/storage/mod.rs +++ b/nym-api/src/support/storage/mod.rs @@ -13,6 +13,7 @@ use crate::storage::models::{NodeStatus, TestingRoute}; use crate::support::storage::models::{ GatewayDetails, MixnodeDetails, TestedGatewayStatus, TestedMixnodeStatus, }; +use log::{error, info, warn}; use nym_mixnet_contract_common::MixId; use rocket::fairing::AdHoc; use sqlx::ConnectOptions;