Add nym prefix to a few more crates (#3092)

* Add nym- prefix to execute crate

* Add nym- prefix to nonexhaustive-delayqueue

* Add nym- prefix to config crate

* Update imports

* Update more module paths

* rustfmt

* Add nym- prefix to statistics-common

* Update explicit module paths

* rustfmt
This commit is contained in:
Jon Häggblad
2023-02-23 10:01:46 +01:00
committed by GitHub
parent 81028c554f
commit 2f2dfff53d
93 changed files with 261 additions and 261 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ use crate::config::Config;
use crate::node::node_description::NodeDescription;
use clap::Args;
use colored::Colorize;
use config::NymConfig;
use nym_config::NymConfig;
use std::io;
use std::io::Write;
+1 -1
View File
@@ -7,7 +7,7 @@ use crate::node::MixNode;
use crate::OutputFormat;
use crate::{commands::override_config, config::persistence::pathfinder::MixNodePathfinder};
use clap::Args;
use config::NymConfig;
use nym_config::NymConfig;
use nym_crypto::asymmetric::{encryption, identity};
use std::net::IpAddr;
use validator_client::nyxd;
+3 -3
View File
@@ -5,10 +5,10 @@ use crate::{config::Config, Cli};
use clap::CommandFactory;
use clap::Subcommand;
use colored::Colorize;
use config::defaults::var_names::{BECH32_PREFIX, NYM_API};
use config::OptionalSet;
use nym_bin_common::completions::{fig_generate, ArgShell};
use nym_bin_common::version_checker;
use nym_config::defaults::var_names::{BECH32_PREFIX, NYM_API};
use nym_config::OptionalSet;
use nym_crypto::bech32_address_validation;
use std::net::IpAddr;
use std::process;
@@ -100,7 +100,7 @@ fn override_config(mut config: Config, args: OverrideConfig) -> Config {
Config::with_custom_nym_apis,
args.nym_apis,
NYM_API,
config::parse_urls,
nym_config::parse_urls,
)
.with_optional(
|cfg, wallet_address| {
+1 -1
View File
@@ -5,7 +5,7 @@ use crate::config::Config;
use crate::node::MixNode;
use crate::OutputFormat;
use clap::Args;
use config::NymConfig;
use nym_config::NymConfig;
#[derive(Args)]
pub(crate) struct NodeDetails {
+1 -1
View File
@@ -7,7 +7,7 @@ use crate::config::Config;
use crate::node::MixNode;
use crate::OutputFormat;
use clap::Args;
use config::NymConfig;
use nym_config::NymConfig;
use std::net::IpAddr;
use validator_client::nyxd;
+1 -1
View File
@@ -8,8 +8,8 @@ use crate::config::{persistence::pathfinder::MixNodePathfinder, Config};
use crate::node::MixNode;
use anyhow::{anyhow, Result};
use clap::{ArgGroup, Args};
use config::NymConfig;
use log::error;
use nym_config::NymConfig;
use nym_crypto::asymmetric::identity;
use validator_client::nyxd;
+1 -1
View File
@@ -3,8 +3,8 @@
use crate::config::{missing_string_value, Config};
use clap::Args;
use config::NymConfig;
use nym_bin_common::version_checker::Version;
use nym_config::NymConfig;
use std::fmt::Display;
use std::process;
+3 -3
View File
@@ -2,11 +2,11 @@
// SPDX-License-Identifier: Apache-2.0
use crate::config::template::config_template;
use config::defaults::mainnet::NYM_API;
use config::defaults::{
use nym_config::defaults::mainnet::NYM_API;
use nym_config::defaults::{
DEFAULT_HTTP_API_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT, DEFAULT_VERLOC_LISTENING_PORT,
};
use config::NymConfig;
use nym_config::NymConfig;
use serde::{Deserialize, Deserializer, Serialize};
use std::net::{IpAddr, SocketAddr};
use std::path::PathBuf;
+1 -1
View File
@@ -4,7 +4,7 @@
#[macro_use]
extern crate rocket;
use ::config::defaults::setup_env;
use ::nym_config::defaults::setup_env;
use clap::{crate_name, crate_version, Parser, ValueEnum};
use lazy_static::lazy_static;
use nym_bin_common::logging::setup_logging;
+1 -1
View File
@@ -19,10 +19,10 @@ use crate::node::node_statistics::SharedNodeStats;
use crate::node::packet_delayforwarder::{DelayForwarder, PacketDelayForwardSender};
use crate::OutputFormat;
use colored::Colorize;
use config::NymConfig;
use log::{error, info, warn};
use mixnode_common::verloc::{self, AtomicVerlocResult, VerlocMeasurer};
use nym_bin_common::version_checker::parse_version;
use nym_config::NymConfig;
use nym_crypto::asymmetric::{encryption, identity};
use nym_task::{TaskClient, TaskManager};
use rand::seq::SliceRandom;
+1 -1
View File
@@ -4,7 +4,7 @@
use crate::node::node_statistics::UpdateSender;
use futures::channel::mpsc;
use futures::StreamExt;
use nonexhaustive_delayqueue::{Expired, NonExhaustiveDelayQueue};
use nym_nonexhaustive_delayqueue::{Expired, NonExhaustiveDelayQueue};
use nym_sphinx::forwarding::packet::MixPacket;
use std::io;
use tokio::time::Instant;