chore: fix cyclic dependency in ockam_transport_udp

build-trust · Jul 3, 2024 · ec5e06b · ec5e06b
1 parent 937f5c0
commit ec5e06b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
+  "examples/rust/rendezvous",
   "examples/rust/file_transfer",
   "examples/rust/get_started",
   "examples/rust/tcp_inlet_and_outlet",

diff --git a/examples/rust/rendezvous/Cargo.toml b/examples/rust/rendezvous/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "rendezvous"
+version = "0.1.0"
+authors = ["Ockam Developers"]
+edition = "2021"
+license = "Apache-2.0"
+publish = false
+rust-version = "1.56.0"
+
+[dependencies]
+ockam = { path = "../../../implementations/rust/ockam/ockam" }
+ockam_core = { path = "../../../implementations/rust/ockam/ockam_core" }
+ockam_macros = { path = "../../../implementations/rust/ockam/ockam_macros" }
+ockam_node = { path = "../../../implementations/rust/ockam/ockam_node" }
+ockam_transport_udp = { path = "../../../implementations/rust/ockam/ockam_transport_udp" }
+tracing = { version = "0.1", default-features = false }
+
+[[bin]]
+name = "client"
+
+[[bin]]
+name = "echo_server"
+
+[[bin]]
+name = "rendezvous_server"
diff --git a/...am/ockam_transport_udp/examples/client.rs → examples/rust/rendezvous/src/bin/client.rs b/...am/ockam_transport_udp/examples/client.rs → examples/rust/rendezvous/src/bin/client.rs
diff --git a/...kam_transport_udp/examples/echo_server.rs → ...es/rust/rendezvous/src/bin/echo_server.rs b/...kam_transport_udp/examples/echo_server.rs → ...es/rust/rendezvous/src/bin/echo_server.rs
diff --git a/...ansport_udp/examples/rendezvous_server.rs → ...t/rendezvous/src/bin/rendezvous_server.rs b/...ansport_udp/examples/rendezvous_server.rs → ...t/rendezvous/src/bin/rendezvous_server.rs
diff --git a/implementations/rust/ockam/ockam_transport_udp/Cargo.toml b/implementations/rust/ockam/ockam_transport_udp/Cargo.toml
@@ -41,14 +41,4 @@ tokio-util = { version = "0.7.11", features = ["net", "codec"] }
 tracing = { version = "0.1", default-features = false }
 
 [dev-dependencies]
-ockam = { path = "../ockam", version = "^0.129.0" }
 ockam_macros = { path = "../ockam_macros", version = "^0.34.0" }
-
-[[example]]
-name = "client"
-
-[[example]]
-name = "echo_server"
-
-[[example]]
-name = "rendezvous_server"
diff --git a/implementations/rust/ockam/ockam_transport_udp/tests/utils.rs b/implementations/rust/ockam/ockam_transport_udp/tests/utils.rs
@@ -1,5 +1,4 @@
-use ockam::{errcode::Origin, Error};
-use ockam_core::Result;
+use ockam_core::{errcode::Origin, Error, Result};
 use std::net::SocketAddr;
 use tokio::net::UdpSocket;