diff options
| -rw-r--r-- | src/main.rs | 7 | ||||
| -rw-r--r-- | src/simtest/identity.rs | 2 | ||||
| -rw-r--r-- | src/transport/libp2p.rs (renamed from src/transport/p2p.rs) | 0 | ||||
| -rw-r--r-- | src/transport/mod.rs | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/main.rs b/src/main.rs index a95d764..708e43d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -208,11 +208,12 @@ async fn main() -> Result<()> { .with_context(|| format!("libp2p-relays {address:?}")) }) .collect::<Result<Vec<_>>>()?; - let key = transport::p2p::Libp2pConfig::load_key(args.libp2p_key_file.as_deref())?; + let key = + transport::libp2p::Libp2pConfig::load_key(args.libp2p_key_file.as_deref())?; ( "libp2p", - Arc::new(transport::p2p::Libp2pTransport::start( - transport::p2p::Libp2pConfig { + Arc::new(transport::libp2p::Libp2pTransport::start( + transport::libp2p::Libp2pConfig { key, listen, announce, diff --git a/src/simtest/identity.rs b/src/simtest/identity.rs index 61a54d5..3d235b0 100644 --- a/src/simtest/identity.rs +++ b/src/simtest/identity.rs @@ -195,7 +195,7 @@ async fn nodes_on_both_transports_carry_the_others() { #[cfg(feature = "libp2p")] #[tokio::test(flavor = "multi_thread", worker_threads = 4)] async fn nodes_over_libp2p() { - use crate::transport::p2p::{Libp2pConfig, Libp2pTransport}; + use crate::transport::libp2p::{Libp2pConfig, Libp2pTransport}; use ::libp2p::identity::Keypair; use sha2::Digest; diff --git a/src/transport/p2p.rs b/src/transport/libp2p.rs index 30fdb23..30fdb23 100644 --- a/src/transport/p2p.rs +++ b/src/transport/libp2p.rs diff --git a/src/transport/mod.rs b/src/transport/mod.rs index 15b286a..50841e0 100644 --- a/src/transport/mod.rs +++ b/src/transport/mod.rs @@ -16,9 +16,9 @@ pub(crate) use crate::document::replica::Epoch; pub(crate) mod challenge; pub(crate) mod firewall; pub(crate) mod identity; -pub(crate) mod mycelium; #[cfg(feature = "libp2p")] -pub(crate) mod p2p; +pub(crate) mod libp2p; +pub(crate) mod mycelium; pub(crate) mod paths; #[cfg(test)] pub(crate) mod sim; |