From 80619722b8fb25ce1e17a722db38350e5e339446 Mon Sep 17 00:00:00 2001 From: Justin Kilpatrick Date: Fri, 16 Aug 2024 16:22:58 -0400 Subject: [PATCH] fmt --- integration_tests/src/utils.rs | 8 +++++++- rita_client/src/dashboard/mod.rs | 2 +- rita_common/src/dashboard/mod.rs | 2 +- settings/src/lib.rs | 1 - 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/integration_tests/src/utils.rs b/integration_tests/src/utils.rs index 31a643f3d..7dfb41982 100644 --- a/integration_tests/src/utils.rs +++ b/integration_tests/src/utils.rs @@ -38,7 +38,13 @@ use rita_common::{ payment_validator::{ALTHEA_CHAIN_PREFIX, ALTHEA_CONTACT_TIMEOUT}, }; use settings::{ - client::RitaClientSettings, exit::{ExitNetworkSettings, RitaExitSettingsStruct}, localization::LocalizationSettings, logging::LoggingSettings, network::NetworkSettings, operator::ExitOperatorSettings, payment::PaymentSettings + client::RitaClientSettings, + exit::{ExitNetworkSettings, RitaExitSettingsStruct}, + localization::LocalizationSettings, + logging::LoggingSettings, + network::NetworkSettings, + operator::ExitOperatorSettings, + payment::PaymentSettings, }; use std::{ collections::{HashMap, HashSet}, diff --git a/rita_client/src/dashboard/mod.rs b/rita_client/src/dashboard/mod.rs index 5046b2a0f..1bde6438d 100644 --- a/rita_client/src/dashboard/mod.rs +++ b/rita_client/src/dashboard/mod.rs @@ -29,7 +29,6 @@ use crate::dashboard::usage::*; use actix_async::System; use actix_web_async::{web, App, HttpServer}; use rita_common::dashboard::auth::*; -use rita_common::dashboard::operator::*; use rita_common::dashboard::babel::*; use rita_common::dashboard::backup_created::*; use rita_common::dashboard::contact_info::*; @@ -41,6 +40,7 @@ use rita_common::dashboard::localization::*; use rita_common::dashboard::logging::*; use rita_common::dashboard::mesh_ip::*; use rita_common::dashboard::nickname::*; +use rita_common::dashboard::operator::*; use rita_common::dashboard::own_info::*; use rita_common::dashboard::remote_access::*; use rita_common::dashboard::settings::*; diff --git a/rita_common/src/dashboard/mod.rs b/rita_common/src/dashboard/mod.rs index a178615bb..2a7ff8eb4 100644 --- a/rita_common/src/dashboard/mod.rs +++ b/rita_common/src/dashboard/mod.rs @@ -14,6 +14,7 @@ pub mod localization; pub mod logging; pub mod mesh_ip; pub mod nickname; +pub mod operator; pub mod own_info; pub mod remote_access; pub mod settings; @@ -23,4 +24,3 @@ pub mod usage; pub mod wallet; pub mod wg_key; pub mod wifi; -pub mod operator; diff --git a/settings/src/lib.rs b/settings/src/lib.rs index 0be9f636e..59d77a546 100644 --- a/settings/src/lib.rs +++ b/settings/src/lib.rs @@ -353,7 +353,6 @@ pub fn check_if_client() -> bool { } } - /// This code checks to see if the current device/setting is an exit or not pub fn check_if_exit() -> bool { let netns = KI.check_integration_test_netns();