refactor: move relay-server to a different crate

Author: varex83

Cargo.lock

@@ -12,6 +12,7 @@ members = [
     "crates/charon-p2p",
     "crates/charon-testutil",
     "crates/tracing",
+    "crates/relay-server"
 ]
 resolver = "3"
 
@@ -65,6 +66,7 @@ charon-k1util = { path = "crates/charon-k1util" }
 charon-p2p = { path = "crates/charon-p2p" }
 charon-testutil = { path = "crates/charon-testutil" }
 charon-tracing = { path = "crates/tracing" }
+charon-relay-server = { path = "crates/relay-server" }
 
 [workspace.lints.rust]
 missing_docs = "deny"

Cargo.toml

@@ -7,6 +7,3 @@ pub mod pluto;
 #[cfg(feature = "mdns")]
 /// Pluto Mdns behaviour.
 pub mod pluto_mdns;
-
-/// Relay server behaviour.
-pub mod relay_server;

crates/charon-p2p/src/behaviours/mod.rs

@@ -28,6 +28,3 @@ pub mod behaviours;
 
 /// K1 utilities.
 pub mod k1;
-
-/// Everything related to relay client / server.
-pub mod relay;

crates/charon-p2p/src/lib.rs

@@ -0,0 +1,27 @@
+[package]
+name = "charon-relay-server"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+publish.workspace = true
+
+[dependencies]
+axum.workspace = true
+libp2p.workspace = true
+thiserror.workspace = true
+k256.workspace = true
+charon-eth2.workspace = true
+vise.workspace = true
+tokio.workspace = true
+tokio-util.workspace = true
+rand.workspace = true
+charon-tracing.workspace = true
+tracing.workspace = true
+charon-p2p.workspace = true
+
+[dev-dependencies]
+vise-exporter.workspace = true
+
+[lints]
+workspace = true

crates/relay-server/Cargo.toml

@@ -1,10 +1,8 @@
 #![allow(missing_docs)]
 use std::str::FromStr;
 
-use charon_p2p::{
-    config::P2PConfig,
-    relay::{config::Config, p2p::run_relay_p2p_node},
-};
+use charon_p2p::config::P2PConfig;
+use charon_relay_server::{config::Config, p2p::run_relay_p2p_node};
 use charon_tracing::TracingConfig;
 use k256::SecretKey;
 use libp2p::multiaddr;

…ates/charon-p2p/examples/relay_server.rs …es/relay-server/examples/relay_server.rscrates/charon-p2p/examples/relay_server.rs renamed to crates/relay-server/examples/relay_server.rs crates/charon-p2p/examples/relay_server.rs renamed to crates/relay-server/examples/relay_server.rs

@@ -1,10 +1,11 @@
+#![allow(missing_docs)] // we need to allow missing docs for the derive macro
 //! Relay server behaviour.
 
 use std::time::Duration;
 
 use libp2p::{identify, identity::Keypair, ping, relay, swarm::NetworkBehaviour};
 
-use crate::gater::ConnGater;
+use charon_p2p::gater::ConnGater;
 
 /// Relay server network behaviour.
 #[derive(NetworkBehaviour)]

…haron-p2p/src/behaviours/relay_server.rs crates/relay-server/src/behaviour.rscrates/charon-p2p/src/behaviours/relay_server.rs renamed to crates/relay-server/src/behaviour.rs crates/charon-p2p/src/behaviours/relay_server.rs renamed to crates/relay-server/src/behaviour.rs

@@ -3,7 +3,7 @@ use std::{path::PathBuf, time::Duration};
 use charon_tracing::TracingConfig;
 use libp2p::relay;
 
-use crate::config::P2PConfig;
+use charon_p2p::config::P2PConfig;
 
 /// One hour in seconds.
 pub const ONE_HOUR_SECONDS: u64 = 60 * 60;

crates/charon-p2p/src/relay/config.rs crates/relay-server/src/config.rscrates/charon-p2p/src/relay/config.rs renamed to crates/relay-server/src/config.rs

@@ -1,13 +1,13 @@
 use libp2p::multiaddr;
 
-use crate::p2p::P2PError;
+use charon_p2p::p2p::P2PError;
 
 /// Relay P2P error.
 #[derive(Debug, thiserror::Error)]
 pub enum RelayP2PError {
     /// Failed to load private key.
     #[error("Failed to load private key")]
-    FailedToLoadPrivateKey(#[from] crate::k1::K1Error),
+    FailedToLoadPrivateKey(#[from] charon_p2p::k1::K1Error),
 
     /// P2P error.
     #[error("P2P error: {0}")]

crates/charon-p2p/src/relay/error.rs crates/relay-server/src/error.rscrates/charon-p2p/src/relay/error.rs renamed to crates/relay-server/src/error.rs

@@ -18,6 +18,9 @@ pub mod error;
 /// Utils.
 pub mod utils;
 
+/// Behaviour.
+pub mod behaviour;
+
 pub use error::RelayP2PError;
 
 pub(crate) use error::Result;