diff --git a/Cargo.toml b/Cargo.toml index 71cc7c43..73b7ea29 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ resolver = "3" members = [ "rust/exo_pyo3_bindings", - "rust/iroh_networking", + "rust/networking", ] [workspace.package] @@ -22,7 +22,7 @@ opt-level = 3 # Common configurations include versions, paths, features, etc. [workspace.dependencies] ## Crate members as common dependencies -iroh_networking = { path = "rust/iroh_networking" } +networking = { path = "rust/networking" } extend = "1.2" diff --git a/rust/exo_pyo3_bindings/Cargo.toml b/rust/exo_pyo3_bindings/Cargo.toml index accef84b..ab9e7377 100644 --- a/rust/exo_pyo3_bindings/Cargo.toml +++ b/rust/exo_pyo3_bindings/Cargo.toml @@ -20,25 +20,24 @@ doc = false workspace = true [dependencies] -iroh_networking = { workspace = true } +networking.workspace = true # interop pyo3 = { workspace = true, features = ["experimental-async"] } -pyo3-stub-gen = { workspace = true } -pyo3-async-runtimes = { workspace = true, features = ["attributes", "tokio-runtime", "testing"] } -pyo3-log = { workspace = true } +pyo3-stub-gen.workspace = true +# pyo3-async-runtimes = { workspace = true, features = ["attributes", "tokio-runtime", "testing"] } +pyo3-log.workspace = true # macro dependencies -extend = { workspace = true } +extend.workspace = true # async runtime tokio = { workspace = true, features = ["full", "tracing"] } # utility dependencies postcard = { workspace = true, features = ["use-std"] } -thiserror = { workspace = true } -rand = { workspace = true } -n0-future = { workspace = true } +rand.workspace = true +n0-future.workspace = true # Tracing diff --git a/rust/exo_pyo3_bindings/src/lib.rs b/rust/exo_pyo3_bindings/src/lib.rs index c5ea698b..eec7f365 100644 --- a/rust/exo_pyo3_bindings/src/lib.rs +++ b/rust/exo_pyo3_bindings/src/lib.rs @@ -6,11 +6,10 @@ mod allow_threading; mod identity; -mod iroh_networking; -// mod examples; +mod networking; use crate::identity::ident_submodule; -use crate::iroh_networking::networking_submodule; +use crate::networking::networking_submodule; use pyo3::prelude::*; use pyo3_stub_gen::define_stub_info_gatherer; diff --git a/rust/exo_pyo3_bindings/src/iroh_networking.rs b/rust/exo_pyo3_bindings/src/networking.rs similarity index 99% rename from rust/exo_pyo3_bindings/src/iroh_networking.rs rename to rust/exo_pyo3_bindings/src/networking.rs index d8b7b200..99f15fac 100644 --- a/rust/exo_pyo3_bindings/src/iroh_networking.rs +++ b/rust/exo_pyo3_bindings/src/networking.rs @@ -4,8 +4,8 @@ use iroh::SecretKey; use iroh::discovery::EndpointInfo; use iroh::discovery::mdns::DiscoveryEvent; use iroh_gossip::api::{ApiError, Event, GossipReceiver, GossipSender, Message}; -use iroh_networking::ExoNet; use n0_future::{Stream, StreamExt as _}; +use networking::ExoNet; use pyo3::exceptions::{PyRuntimeError, PyStopAsyncIteration}; use pyo3::prelude::*; use pyo3::types::PyBytes; diff --git a/rust/iroh_networking/Cargo.toml b/rust/networking/Cargo.toml similarity index 94% rename from rust/iroh_networking/Cargo.toml rename to rust/networking/Cargo.toml index 49e7581e..b101c063 100644 --- a/rust/iroh_networking/Cargo.toml +++ b/rust/networking/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "iroh_networking" +name = "networking" version.workspace = true edition.workspace = true diff --git a/rust/iroh_networking/examples/chatroom.rs b/rust/networking/examples/chatroom.rs similarity index 100% rename from rust/iroh_networking/examples/chatroom.rs rename to rust/networking/examples/chatroom.rs diff --git a/rust/iroh_networking/examples/mdns_responder.rs b/rust/networking/examples/mdns_responder.rs similarity index 100% rename from rust/iroh_networking/examples/mdns_responder.rs rename to rust/networking/examples/mdns_responder.rs diff --git a/rust/iroh_networking/src/lib.rs b/rust/networking/src/lib.rs similarity index 100% rename from rust/iroh_networking/src/lib.rs rename to rust/networking/src/lib.rs