From 8ea19366d2f7e034dcc272b935b10964f0bc5ef7 Mon Sep 17 00:00:00 2001 From: jstuczyn Date: Thu, 5 Nov 2020 11:45:16 +0000 Subject: [PATCH] Renamed 'sphinx-socks' to 'network-requester' --- Cargo.lock | 40 +++++++++---------- Cargo.toml | 4 +- .../Cargo.toml | 2 +- .../allowed.list.sample | 0 .../src/allowed_hosts.rs | 4 +- .../src/connection.rs | 0 .../src/core.rs | 0 .../src/main.rs | 0 .../src/websocket.rs | 0 9 files changed, 25 insertions(+), 25 deletions(-) rename service-providers/{sphinx-socks => network-requester}/Cargo.toml (96%) rename service-providers/{sphinx-socks => network-requester}/allowed.list.sample (100%) rename service-providers/{sphinx-socks => network-requester}/src/allowed_hosts.rs (98%) rename service-providers/{sphinx-socks => network-requester}/src/connection.rs (100%) rename service-providers/{sphinx-socks => network-requester}/src/core.rs (100%) rename service-providers/{sphinx-socks => network-requester}/src/main.rs (100%) rename service-providers/{sphinx-socks => network-requester}/src/websocket.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 7281a6559f9..cb0697397ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1495,6 +1495,26 @@ dependencies = [ "version-checker", ] +[[package]] +name = "network-requester" +version = "0.9.0-dev" +dependencies = [ + "clap", + "dirs 2.0.2", + "futures 0.3.5", + "log", + "nymsphinx", + "ordered-buffer", + "pretty_env_logger", + "proxy-helpers", + "publicsuffix", + "rand", + "socks5-requests", + "tokio", + "tokio-tungstenite", + "websocket-requests", +] + [[package]] name = "nonexhaustive-delayqueue" version = "0.1.0" @@ -2563,26 +2583,6 @@ dependencies = [ "sha2 0.8.2", ] -[[package]] -name = "sphinx-socks" -version = "0.9.0-dev" -dependencies = [ - "clap", - "dirs 2.0.2", - "futures 0.3.5", - "log", - "nymsphinx", - "ordered-buffer", - "pretty_env_logger", - "proxy-helpers", - "publicsuffix", - "rand", - "socks5-requests", - "tokio", - "tokio-tungstenite", - "websocket-requests", -] - [[package]] name = "stream-cipher" version = "0.3.2" diff --git a/Cargo.toml b/Cargo.toml index 156792af310..520d183d944 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ members = [ "gateway/gateway-requests", "mixnode", "network-monitor", - "service-providers/sphinx-socks", + "service-providers/network-requester", ] default-members = [ @@ -48,7 +48,7 @@ default-members = [ "clients/socks5", # "clients/webassembly", "gateway", - "service-providers/sphinx-socks", + "service-providers/network-requester", "mixnode", "network-monitor", ] diff --git a/service-providers/sphinx-socks/Cargo.toml b/service-providers/network-requester/Cargo.toml similarity index 96% rename from service-providers/sphinx-socks/Cargo.toml rename to service-providers/network-requester/Cargo.toml index 84c33b2d285..286b86af211 100644 --- a/service-providers/sphinx-socks/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "sphinx-socks" +name = "network-requester" version = "0.9.0-dev" authors = ["Dave Hrycyszyn ", "Jędrzej Stuczyński "] edition = "2018" diff --git a/service-providers/sphinx-socks/allowed.list.sample b/service-providers/network-requester/allowed.list.sample similarity index 100% rename from service-providers/sphinx-socks/allowed.list.sample rename to service-providers/network-requester/allowed.list.sample diff --git a/service-providers/sphinx-socks/src/allowed_hosts.rs b/service-providers/network-requester/src/allowed_hosts.rs similarity index 98% rename from service-providers/sphinx-socks/src/allowed_hosts.rs rename to service-providers/network-requester/src/allowed_hosts.rs index 51e79083584..d0ec405fb37 100644 --- a/service-providers/sphinx-socks/src/allowed_hosts.rs +++ b/service-providers/network-requester/src/allowed_hosts.rs @@ -153,7 +153,7 @@ impl HostsStore { } fn setup_storefile(base_dir: PathBuf, filename: PathBuf) -> PathBuf { - let dirpath = base_dir.join("service-providers").join("sphinx-socks"); + let dirpath = base_dir.join("service-providers").join("network-requester"); fs::create_dir_all(&dirpath).expect(&format!( "could not create storage directory at {:?}", dirpath @@ -348,7 +348,7 @@ mod tests { fn create_test_storefile() -> (PathBuf, PathBuf, PathBuf) { let base_dir = test_base_dir(); let filename = PathBuf::from(format!("hosts-store-{}.list", random_string())); - let dirpath = base_dir.join("service-providers").join("sphinx-socks"); + let dirpath = base_dir.join("service-providers").join("network-requester"); fs::create_dir_all(&dirpath).expect(&format!( "could not create storage directory at {:?}", dirpath diff --git a/service-providers/sphinx-socks/src/connection.rs b/service-providers/network-requester/src/connection.rs similarity index 100% rename from service-providers/sphinx-socks/src/connection.rs rename to service-providers/network-requester/src/connection.rs diff --git a/service-providers/sphinx-socks/src/core.rs b/service-providers/network-requester/src/core.rs similarity index 100% rename from service-providers/sphinx-socks/src/core.rs rename to service-providers/network-requester/src/core.rs diff --git a/service-providers/sphinx-socks/src/main.rs b/service-providers/network-requester/src/main.rs similarity index 100% rename from service-providers/sphinx-socks/src/main.rs rename to service-providers/network-requester/src/main.rs diff --git a/service-providers/sphinx-socks/src/websocket.rs b/service-providers/network-requester/src/websocket.rs similarity index 100% rename from service-providers/sphinx-socks/src/websocket.rs rename to service-providers/network-requester/src/websocket.rs