diff --git a/common/topology/src/node.rs b/common/topology/src/node.rs index abd1a08d6b..36aebe9068 100644 --- a/common/topology/src/node.rs +++ b/common/topology/src/node.rs @@ -4,7 +4,6 @@ use nym_api_requests::models::DeclaredRoles; use nym_api_requests::nym_nodes::SkimmedNode; use nym_crypto::asymmetric::{ed25519, x25519}; -use nym_mixnet_contract_common::reward_params::Performance; use nym_mixnet_contract_common::NodeId; use nym_sphinx_addressing::nodes::NymNodeRoutingAddress; use nym_sphinx_types::Node as SphinxNode; @@ -13,6 +12,7 @@ use std::net::{IpAddr, SocketAddr}; use thiserror::Error; pub use nym_mixnet_contract_common::LegacyMixLayer; +pub use nym_mixnet_contract_common::reward_params::Performance; #[derive(Error, Debug)] pub enum RoutingNodeError { diff --git a/nym-network-monitor/src/main.rs b/nym-network-monitor/src/main.rs index e38fcefe8f..068f94a2f2 100644 --- a/nym-network-monitor/src/main.rs +++ b/nym-network-monitor/src/main.rs @@ -10,7 +10,7 @@ use nym_network_defaults::setup_env; use nym_network_defaults::var_names::NYM_API; use nym_sdk::mixnet::{self, MixnetClient}; use nym_sphinx::chunking::monitoring; -use nym_topology::{HardcodedTopologyProvider, NymTopology}; +use nym_topology::{providers::HardcodedTopologyProvider, NymTopology}; use std::fs::File; use std::io::Write; use std::sync::LazyLock; diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml index b5da2b254e..79685d1ae9 100644 --- a/nym-node/Cargo.toml +++ b/nym-node/Cargo.toml @@ -72,7 +72,6 @@ nym-metrics = { path = "../common/nym-metrics" } nym-gateway-stats-storage = { path = "../common/gateway-stats-storage" } nym-topology = { path = "../common/topology" } nym-http-api-client = { path = "../common/http-api-client" } -nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common", features = ["naive_float", "utoipa"] } # http server # useful for `#[axum_macros::debug_handler]` diff --git a/nym-node/src/node/mod.rs b/nym-node/src/node/mod.rs index 5c3dfc1cf2..69877c785a 100644 --- a/nym-node/src/node/mod.rs +++ b/nym-node/src/node/mod.rs @@ -32,7 +32,6 @@ use crate::node::shared_network::{ CachedNetwork, CachedTopologyProvider, NetworkRefresher, RoutingFilter, }; use nym_bin_common::bin_info; -use nym_contracts_common::Percent; use nym_crypto::asymmetric::{ed25519, x25519}; use nym_gateway::node::{ActiveClientsStore, GatewayTasksBuilder}; use nym_mixnet_client::client::ActiveConnections; @@ -52,6 +51,7 @@ use nym_validator_client::models::NodeRefreshBody; use nym_validator_client::{NymApiClient, UserAgent}; use nym_verloc::measurements::SharedVerlocStats; use nym_verloc::{self, measurements::VerlocMeasurer}; +use nym_topology::node::Performance; use nym_wireguard::{peer_controller::PeerControlRequest, WireguardGatewayData}; use rand::rngs::OsRng; use rand::{CryptoRng, RngCore}; @@ -581,7 +581,7 @@ impl NymNode { mixnet_exit: true, }, // Perf metrics are not meaningful in this context. - performance: Percent::hundred(), + performance: Performance::hundred(), }) } diff --git a/sdk/rust/nym-sdk/examples/custom_topology_provider.rs b/sdk/rust/nym-sdk/examples/custom_topology_provider.rs index 7cd5a6f50c..4c5b2f2494 100644 --- a/sdk/rust/nym-sdk/examples/custom_topology_provider.rs +++ b/sdk/rust/nym-sdk/examples/custom_topology_provider.rs @@ -3,7 +3,7 @@ use nym_sdk::mixnet; use nym_sdk::mixnet::MixnetMessageSender; -use nym_topology::provider_trait::{async_trait, TopologyProvider}; +use nym_topology::providers::{async_trait, TopologyProvider}; use nym_topology::NymTopology; use url::Url; diff --git a/sdk/rust/nym-sdk/examples/manually_handle_storage.rs b/sdk/rust/nym-sdk/examples/manually_handle_storage.rs index 05ce8ebf01..459636c035 100644 --- a/sdk/rust/nym-sdk/examples/manually_handle_storage.rs +++ b/sdk/rust/nym-sdk/examples/manually_handle_storage.rs @@ -4,7 +4,7 @@ use nym_sdk::mixnet::{ self, ActiveGateway, BadGateway, ClientKeys, EmptyReplyStorage, EphemeralCredentialStorage, GatewayRegistration, GatewaysDetailsStore, KeyStore, MixnetClientStorage, MixnetMessageSender, }; -use nym_topology::provider_trait::async_trait; +use async_trait::async_trait; #[tokio::main] async fn main() { diff --git a/sdk/rust/nym-sdk/examples/manually_overwrite_topology.rs b/sdk/rust/nym-sdk/examples/manually_overwrite_topology.rs index 38c2b3d7f3..b286f0cd59 100644 --- a/sdk/rust/nym-sdk/examples/manually_overwrite_topology.rs +++ b/sdk/rust/nym-sdk/examples/manually_overwrite_topology.rs @@ -3,7 +3,7 @@ use nym_sdk::mixnet; use nym_sdk::mixnet::MixnetMessageSender; -use nym_topology::{NymTopology, RoutingNode, SupportedRoles}; +use nym_topology::{NymTopology, RoutingNode, SupportedRoles, node::Performance}; #[tokio::main] async fn main() { @@ -30,6 +30,7 @@ async fn main() { mixnet_entry: false, mixnet_exit: false, }, + performance: Performance::hundred(), }, RoutingNode { node_id: 23, @@ -46,6 +47,8 @@ async fn main() { mixnet_entry: false, mixnet_exit: false, }, + performance: Performance::hundred(), + }, RoutingNode { node_id: 66, @@ -62,6 +65,7 @@ async fn main() { mixnet_entry: false, mixnet_exit: false, }, + performance: Performance::hundred(), }, ];