diff --git a/Cargo.lock b/Cargo.lock index ec8aed2..97dc2b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -363,28 +363,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "dht" -version = "0.1.0" -dependencies = [ - "anyhow", - "directories", - "futures", - "hex 0.4.3", - "indexmap", - "librqbit-bencode", - "librqbit-clone-to-owned", - "librqbit-core", - "log", - "parking_lot", - "pretty_env_logger", - "rand", - "serde", - "serde_json", - "tokio", - "tokio-stream", -] - [[package]] name = "digest" version = "0.10.7" @@ -889,7 +867,6 @@ dependencies = [ "bitvec", "byteorder", "crypto-hash", - "dht", "futures", "hex 0.4.3", "http", @@ -897,6 +874,7 @@ dependencies = [ "librqbit-buffers", "librqbit-clone-to-owned", "librqbit-core", + "librqbit-dht", "librqbit-peer-protocol", "librqbit-sha1-wrapper", "log", @@ -958,6 +936,28 @@ dependencies = [ "uuid", ] +[[package]] +name = "librqbit-dht" +version = "2.2.1" +dependencies = [ + "anyhow", + "directories", + "futures", + "hex 0.4.3", + "indexmap", + "librqbit-bencode", + "librqbit-clone-to-owned", + "librqbit-core", + "log", + "parking_lot", + "pretty_env_logger", + "rand", + "serde", + "serde_json", + "tokio", + "tokio-stream", +] + [[package]] name = "librqbit-peer-protocol" version = "2.2.1" @@ -1487,9 +1487,9 @@ version = "2.0.0" dependencies = [ "anyhow", "clap", - "dht", "futures", "librqbit", + "librqbit-dht", "log", "parse_duration", "pretty_env_logger", diff --git a/crates/dht/Cargo.toml b/crates/dht/Cargo.toml index 7047db5..b11cf40 100644 --- a/crates/dht/Cargo.toml +++ b/crates/dht/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "dht" -version = "0.1.0" +name = "librqbit-dht" +version = "2.2.1" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/dht/src/main.rs b/crates/dht/src/main.rs index 762829a..fc6f524 100644 --- a/crates/dht/src/main.rs +++ b/crates/dht/src/main.rs @@ -1,7 +1,7 @@ use std::{str::FromStr, time::Duration}; use anyhow::Context; -use dht::{Dht, Id20}; +use librqbit_dht::{Dht, Id20}; use log::info; use tokio_stream::StreamExt; diff --git a/crates/librqbit/Cargo.toml b/crates/librqbit/Cargo.toml index 23d44ca..88d8508 100644 --- a/crates/librqbit/Cargo.toml +++ b/crates/librqbit/Cargo.toml @@ -21,7 +21,7 @@ librqbit-core = {path = "../librqbit_core", version = "2.2.1"} clone_to_owned = {path = "../clone_to_owned", package="librqbit-clone-to-owned", version = "2.2.1"} peer_binary_protocol = {path = "../peer_binary_protocol", package="librqbit-peer-protocol", version = "2.2.1"} sha1w = {path = "../sha1w", default-features=false, package="librqbit-sha1-wrapper", version="2.2.1"} -dht = {path = "../dht"} +dht = {path = "../dht", package="librqbit-dht", version="2.2.1"} tokio = {version = "1", features = ["macros", "rt-multi-thread"]} axum = {version = "0.6"} diff --git a/crates/rqbit/Cargo.toml b/crates/rqbit/Cargo.toml index cd44a01..c34ea49 100644 --- a/crates/rqbit/Cargo.toml +++ b/crates/rqbit/Cargo.toml @@ -15,7 +15,7 @@ rust-tls = ["librqbit/rust-tls"] [dependencies] librqbit = {path="../librqbit", default-features=false} -dht = {path="../dht"} +dht = {path="../dht", package="librqbit-dht", version="2.2.1"} tokio = {version = "1", features = ["macros", "rt-multi-thread"]} anyhow = "1" clap = {version = "4", features = ["derive"]}