From 0243a1288abdbdda384d138997d7578cf41e13f9 Mon Sep 17 00:00:00 2001 From: Justin Kilpatrick Date: Sat, 9 Dec 2023 07:23:19 -0500 Subject: [PATCH] Remove the now unused db_uri variable on the exit --- integration_tests/src/setup_utils/rita.rs | 2 -- integration_tests/src/utils.rs | 1 - settings/src/exit.rs | 3 --- 3 files changed, 6 deletions(-) diff --git a/integration_tests/src/setup_utils/rita.rs b/integration_tests/src/setup_utils/rita.rs index ae6e9db07..ff437d1d5 100644 --- a/integration_tests/src/setup_utils/rita.rs +++ b/integration_tests/src/setup_utils/rita.rs @@ -248,8 +248,6 @@ pub fn spawn_rita_exit( resettings.exit_network.exit_price = exit_fee; let veth_exit_to_native = format!("vout-{}-o", ns); resettings.network.external_nic = Some(veth_exit_to_native); - // each exit instance connects to one database in the default net namespace - resettings.db_uri = "postgresql://postgres@10.0.0.1/test".to_string(); // mirrored from rita_bin/src/exit.rs let resettings = clu::exit_init(resettings); diff --git a/integration_tests/src/utils.rs b/integration_tests/src/utils.rs index c261d4be2..b4112c595 100644 --- a/integration_tests/src/utils.rs +++ b/integration_tests/src/utils.rs @@ -370,7 +370,6 @@ pub fn get_default_settings( ) -> (RitaClientSettings, RitaExitSettingsStruct) { let mut exit_servers = HashMap::new(); let mut exit = RitaExitSettingsStruct { - db_uri: "postgres://postgres@localhost/test".to_string(), client_registration_url: "https://7.7.7.1:40400/register_router".to_string(), workers: 2, remote_log: false, diff --git a/settings/src/exit.rs b/settings/src/exit.rs index 651b8c86c..b8fcda5dc 100644 --- a/settings/src/exit.rs +++ b/settings/src/exit.rs @@ -155,8 +155,6 @@ pub struct EmailVerifSettings { /// This is the main settings struct for rita_exit #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] pub struct RitaExitSettingsStruct { - /// starts with file:// or postgres://username:password@localhost/diesel_demo - pub db_uri: String, /// url exit uses to request a clients registration #[serde(default = "default_reg_url")] pub client_registration_url: String, @@ -186,7 +184,6 @@ impl RitaExitSettingsStruct { /// default trait to prevent some future code from picking up on the 'default' implementation pub fn test_default() -> Self { RitaExitSettingsStruct { - db_uri: "".to_string(), client_registration_url: "".to_string(), workers: 1, remote_log: false,