fixed ipr imports

service-providers/ip-packet-router/src/cli/init.rs

@@ -1,17 +1,15 @@
-use std::{fmt::Display, fs, path::PathBuf};
-
+use crate::cli::{override_config, try_upgrade_config, OverrideConfig};
 use clap::Args;
 use nym_bin_common::output_format::OutputFormat;
 use nym_client_core::cli_helpers::client_init::{
     initialise_client, CommonClientInitArgs, InitResultsWithConfig, InitialisableClient,
 };
-use serde::Serialize;
-
-use crate::{
-    cli::{override_config, try_upgrade_config, OverrideConfig},
+use nym_ip_packet_router::{
     config::{default_config_directory, default_config_filepath, default_data_directory, Config},
     error::IpPacketRouterError,
 };
+use serde::Serialize;
+use std::{fmt::Display, fs, path::PathBuf};
 
 struct IpPacketRouterInit;
 

service-providers/ip-packet-router/src/cli/mod.rs

@@ -1,11 +1,11 @@
-use crate::config::{BaseClientConfig, Config};
-use crate::error::IpPacketRouterError;
 use clap::{CommandFactory, Parser, Subcommand};
 use log::{error, info, trace};
 use nym_bin_common::completions::{fig_generate, ArgShell};
 use nym_bin_common::{bin_info, version_checker};
 use nym_client_core::client::base_client::storage::migration_helpers::v1_1_33;
 use nym_ip_packet_router::config::old_config_v1::ConfigV1;
+use nym_ip_packet_router::config::{BaseClientConfig, Config};
+use nym_ip_packet_router::error::IpPacketRouterError;
 use std::sync::OnceLock;
 
 mod build_info;

service-providers/ip-packet-router/src/cli/run.rs

@@ -1,11 +1,9 @@
+use crate::cli::{override_config, OverrideConfig};
 use crate::cli::{try_load_current_config, version_check};
-use crate::{
-    cli::{override_config, OverrideConfig},
-    error::IpPacketRouterError,
-};
 use clap::Args;
 use log::error;
 use nym_client_core::cli_helpers::client_run::CommonClientRunArgs;
+use nym_ip_packet_router::error::IpPacketRouterError;
 
 #[allow(clippy::struct_excessive_bools)]
 #[derive(Args, Clone)]
@@ -35,7 +33,7 @@ pub(crate) async fn execute(args: &Run) -> Result<(), IpPacketRouterError> {
     }
 
     log::info!("Starting ip packet router service provider");
-    let mut server = crate::ip_packet_router::IpPacketRouter::new(config);
+    let mut server = nym_ip_packet_router::IpPacketRouter::new(config);
     if let Some(custom_mixnet) = &args.common_args.custom_mixnet {
         server = server.with_stored_topology(custom_mixnet)?
     }

service-providers/ip-packet-router/src/cli/sign.rs

@@ -1,10 +1,10 @@
 use crate::cli::{try_load_current_config, version_check};
-use crate::error::IpPacketRouterError;
 use clap::Args;
 use nym_bin_common::output_format::OutputFormat;
 use nym_client_core::client::key_manager::persistence::OnDiskKeys;
 use nym_client_core::error::ClientCoreError;
 use nym_crypto::asymmetric::identity;
+use nym_ip_packet_router::error::IpPacketRouterError;
 use nym_types::helpers::ConsoleSigningOutput;
 
 #[derive(Args, Clone)]

service-providers/ip-packet-router/src/main.rs

@@ -1,29 +1,9 @@
 #[cfg(target_os = "linux")]
 mod cli;
-#[cfg(target_os = "linux")]
-mod config;
-#[cfg(target_os = "linux")]
-mod connected_client_handler;
-#[cfg(target_os = "linux")]
-mod constants;
-#[cfg(target_os = "linux")]
-mod error;
-#[cfg(target_os = "linux")]
-mod ip_packet_router;
-#[cfg(target_os = "linux")]
-mod mixnet_client;
-#[cfg(target_os = "linux")]
-mod mixnet_listener;
-#[cfg(target_os = "linux")]
-mod request_filter;
-#[cfg(target_os = "linux")]
-mod tun_listener;
-#[cfg(target_os = "linux")]
-mod util;
 
 #[cfg(target_os = "linux")]
 #[tokio::main]
-async fn main() -> Result<(), error::IpPacketRouterError> {
+async fn main() -> Result<(), nym_ip_packet_router::error::IpPacketRouterError> {
     use clap::Parser;
 
     let args = cli::Cli::parse();