Skip to content

Commit

Permalink
hore(tauri): remove nym-config dependency (#1377)
Browse files Browse the repository at this point in the history
  • Loading branch information
doums authored Oct 24, 2024
1 parent d21ca28 commit b347c25
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 136 deletions.
117 changes: 0 additions & 117 deletions nym-vpn-app/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion nym-vpn-app/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ rust_iso3166 = "0.1"
dirs = "5.0.1"

# nym deps
nym-config = { git = "https://github.com/nymtech/nym", rev = "8d305c29eb55b759e7452d5dce82eebb0236c08d" }
nym-vpn-proto = { path = "../../nym-vpn-core/crates/nym-vpn-proto" }

# tauri deps
Expand Down
4 changes: 0 additions & 4 deletions nym-vpn-app/src-tauri/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ pub struct Cli {
#[arg(short, long)]
pub build_info: bool,

/// Path to an env file to load a custom network environment
#[arg(short = 'n', long)]
pub network_env: Option<PathBuf>,

/// Unix socket path of gRPC endpoint in IPC mode
#[arg(short, long)]
pub grpc_socket_endpoint: Option<PathBuf>,
Expand Down
14 changes: 0 additions & 14 deletions nym-vpn-app/src-tauri/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Prevents additional console window on Windows in release, DO NOT REMOVE!!
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]

use std::path::PathBuf;
use std::time::Duration;

use crate::cli::{db_command, Commands};
Expand All @@ -26,7 +25,6 @@ use commands::window as cmd_window;
use commands::*;
#[cfg(windows)]
use db::Key;
use nym_config::defaults;
use states::app::AppState;
#[cfg(windows)]
use states::app::VpnMode;
Expand Down Expand Up @@ -157,18 +155,6 @@ async fn main() -> Result<()> {
};
debug!("app_config: {app_config:?}");

if let Some(env_file) = cli
.network_env
.as_ref()
.or(app_config.network_env_file.as_ref())
{
info!("network environment: custom: {}", env_file.display());
defaults::setup_env(Some(env_file.clone()));
} else {
info!("network environment: mainnet");
defaults::setup_env::<PathBuf>(None);
}

let app_state = AppState::new(&db, &app_config, &cli);
app.manage(Mutex::new(app_state));

Expand Down

0 comments on commit b347c25

Please sign in to comment.