From e080f6381128320df9cf3a475a5f971415df49df Mon Sep 17 00:00:00 2001 From: Age Manning Date: Wed, 20 Mar 2019 15:09:24 +1100 Subject: [PATCH] Rename libp2p to eth2-libp2p --- Cargo.toml | 1 + .../{libp2p => eth2-libp2p}/Cargo.toml | 2 +- .../{libp2p => eth2-libp2p}/src/behaviour.rs | 0 .../{libp2p => eth2-libp2p}/src/error.rs | 0 .../{libp2p => eth2-libp2p}/src/lib.rs | 0 .../src/network_config.rs | 0 .../src/rpc/methods.rs | 0 .../{libp2p => eth2-libp2p}/src/rpc/mod.rs | 0 .../src/rpc/protocol.rs | 0 .../{libp2p => eth2-libp2p}/src/service.rs | 0 beacon_node/network/Cargo.toml | 2 +- beacon_node/network/src/error.rs | 4 +- beacon_node/network/src/lib.rs | 2 +- beacon_node/network/src/message_handler.rs | 4 +- beacon_node/network/src/service.rs | 52 ++++++++++--------- beacon_node/network/src/sync/simple_sync.rs | 4 +- 16 files changed, 37 insertions(+), 34 deletions(-) rename beacon_node/{libp2p => eth2-libp2p}/Cargo.toml (95%) rename beacon_node/{libp2p => eth2-libp2p}/src/behaviour.rs (100%) rename beacon_node/{libp2p => eth2-libp2p}/src/error.rs (100%) rename beacon_node/{libp2p => eth2-libp2p}/src/lib.rs (100%) rename beacon_node/{libp2p => eth2-libp2p}/src/network_config.rs (100%) rename beacon_node/{libp2p => eth2-libp2p}/src/rpc/methods.rs (100%) rename beacon_node/{libp2p => eth2-libp2p}/src/rpc/mod.rs (100%) rename beacon_node/{libp2p => eth2-libp2p}/src/rpc/protocol.rs (100%) rename beacon_node/{libp2p => eth2-libp2p}/src/service.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index d34f6fd30e..cb070cc2da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,7 @@ members = [ "beacon_node/db", "beacon_node/client", "beacon_node/network", + "beacon_node/eth2-libp2p", "beacon_node/rpc", "beacon_node/version", "beacon_node/beacon_chain", diff --git a/beacon_node/libp2p/Cargo.toml b/beacon_node/eth2-libp2p/Cargo.toml similarity index 95% rename from beacon_node/libp2p/Cargo.toml rename to beacon_node/eth2-libp2p/Cargo.toml index dcbc04d0b9..4dd2e9c7b4 100644 --- a/beacon_node/libp2p/Cargo.toml +++ b/beacon_node/eth2-libp2p/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "libp2p" +name = "eth2-libp2p" version = "0.1.0" authors = ["Age Manning "] edition = "2018" diff --git a/beacon_node/libp2p/src/behaviour.rs b/beacon_node/eth2-libp2p/src/behaviour.rs similarity index 100% rename from beacon_node/libp2p/src/behaviour.rs rename to beacon_node/eth2-libp2p/src/behaviour.rs diff --git a/beacon_node/libp2p/src/error.rs b/beacon_node/eth2-libp2p/src/error.rs similarity index 100% rename from beacon_node/libp2p/src/error.rs rename to beacon_node/eth2-libp2p/src/error.rs diff --git a/beacon_node/libp2p/src/lib.rs b/beacon_node/eth2-libp2p/src/lib.rs similarity index 100% rename from beacon_node/libp2p/src/lib.rs rename to beacon_node/eth2-libp2p/src/lib.rs diff --git a/beacon_node/libp2p/src/network_config.rs b/beacon_node/eth2-libp2p/src/network_config.rs similarity index 100% rename from beacon_node/libp2p/src/network_config.rs rename to beacon_node/eth2-libp2p/src/network_config.rs diff --git a/beacon_node/libp2p/src/rpc/methods.rs b/beacon_node/eth2-libp2p/src/rpc/methods.rs similarity index 100% rename from beacon_node/libp2p/src/rpc/methods.rs rename to beacon_node/eth2-libp2p/src/rpc/methods.rs diff --git a/beacon_node/libp2p/src/rpc/mod.rs b/beacon_node/eth2-libp2p/src/rpc/mod.rs similarity index 100% rename from beacon_node/libp2p/src/rpc/mod.rs rename to beacon_node/eth2-libp2p/src/rpc/mod.rs diff --git a/beacon_node/libp2p/src/rpc/protocol.rs b/beacon_node/eth2-libp2p/src/rpc/protocol.rs similarity index 100% rename from beacon_node/libp2p/src/rpc/protocol.rs rename to beacon_node/eth2-libp2p/src/rpc/protocol.rs diff --git a/beacon_node/libp2p/src/service.rs b/beacon_node/eth2-libp2p/src/service.rs similarity index 100% rename from beacon_node/libp2p/src/service.rs rename to beacon_node/eth2-libp2p/src/service.rs diff --git a/beacon_node/network/Cargo.toml b/beacon_node/network/Cargo.toml index 8b87a9d502..5275ed82fe 100644 --- a/beacon_node/network/Cargo.toml +++ b/beacon_node/network/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] beacon_chain = { path = "../beacon_chain" } -libp2p = { path = "../libp2p" } +eth2-libp2p = { path = "../eth2-libp2p" } version = { path = "../version" } types = { path = "../../eth2/types" } slog = "2.4.1" diff --git a/beacon_node/network/src/error.rs b/beacon_node/network/src/error.rs index 2005f76ae9..cdd6b62094 100644 --- a/beacon_node/network/src/error.rs +++ b/beacon_node/network/src/error.rs @@ -1,5 +1,5 @@ // generates error types -use libp2p; +use eth2_libp2p; use error_chain::{ error_chain, error_chain_processing, impl_error_chain_kind, impl_error_chain_processed, @@ -8,6 +8,6 @@ use error_chain::{ error_chain! { links { - Libp2p(libp2p::error::Error, libp2p::error::ErrorKind); + Libp2p(eth2_libp2p::error::Error, eth2_libp2p::error::ErrorKind); } } diff --git a/beacon_node/network/src/lib.rs b/beacon_node/network/src/lib.rs index 1e47b9a731..61a29ed356 100644 --- a/beacon_node/network/src/lib.rs +++ b/beacon_node/network/src/lib.rs @@ -5,5 +5,5 @@ mod message_handler; mod service; pub mod sync; -pub use libp2p::NetworkConfig; +pub use eth2_libp2p::NetworkConfig; pub use service::Service; diff --git a/beacon_node/network/src/message_handler.rs b/beacon_node/network/src/message_handler.rs index 4cd0ab951c..dbf8c7d9da 100644 --- a/beacon_node/network/src/message_handler.rs +++ b/beacon_node/network/src/message_handler.rs @@ -3,11 +3,11 @@ use crate::error; use crate::service::{NetworkMessage, OutgoingMessage}; use crate::sync::SimpleSync; use crossbeam_channel::{unbounded as channel, Sender}; -use futures::future; -use libp2p::{ +use eth2_libp2p::{ rpc::{RPCMethod, RPCRequest, RPCResponse}, HelloMessage, PeerId, RPCEvent, }; +use futures::future; use slog::warn; use slog::{debug, trace}; use std::collections::HashMap; diff --git a/beacon_node/network/src/service.rs b/beacon_node/network/src/service.rs index c3045d280c..14f994e4a5 100644 --- a/beacon_node/network/src/service.rs +++ b/beacon_node/network/src/service.rs @@ -3,20 +3,20 @@ use crate::error; use crate::message_handler::{HandlerMessage, MessageHandler}; use crate::NetworkConfig; use crossbeam_channel::{unbounded as channel, Sender, TryRecvError}; +use eth2_libp2p::RPCEvent; +use eth2_libp2p::Service as LibP2PService; +use eth2_libp2p::{Libp2pEvent, PeerId}; use futures::prelude::*; use futures::sync::oneshot; use futures::Stream; -use libp2p::RPCEvent; -use libp2p::Service as LibP2PService; -use libp2p::{Libp2pEvent, PeerId}; use slog::{debug, info, o, trace}; use std::sync::Arc; use tokio::runtime::TaskExecutor; -/// Service that handles communication between internal services and the libp2p network service. +/// Service that handles communication between internal services and the eth2_libp2p network service. pub struct Service { - //libp2p_service: Arc>, - libp2p_exit: oneshot::Sender<()>, + //eth2_libp2p_service: Arc>, + eth2_libp2p_exit: oneshot::Sender<()>, network_send: crossbeam_channel::Sender, //message_handler: MessageHandler, //message_handler_send: Sender, @@ -40,20 +40,20 @@ impl Service { message_handler_log, )?; - // launch libp2p service - let libp2p_log = log.new(o!("Service" => "Libp2p")); - let libp2p_service = LibP2PService::new(config.clone(), libp2p_log)?; + // launch eth2_libp2p service + let eth2_libp2p_log = log.new(o!("Service" => "Libp2p")); + let eth2_libp2p_service = LibP2PService::new(config.clone(), eth2_libp2p_log)?; - // TODO: Spawn thread to handle libp2p messages and pass to message handler thread. - let libp2p_exit = spawn_service( - libp2p_service, + // TODO: Spawn thread to handle eth2_libp2p messages and pass to message handler thread. + let eth2_libp2p_exit = spawn_service( + eth2_libp2p_service, network_recv, message_handler_send, executor, log, )?; let network_service = Service { - libp2p_exit, + eth2_libp2p_exit, network_send: network_send.clone(), }; @@ -72,7 +72,7 @@ impl Service { } fn spawn_service( - libp2p_service: LibP2PService, + eth2_libp2p_service: LibP2PService, network_recv: crossbeam_channel::Receiver, message_handler_send: crossbeam_channel::Sender, executor: &TaskExecutor, @@ -83,7 +83,7 @@ fn spawn_service( // spawn on the current executor executor.spawn( network_service( - libp2p_service, + eth2_libp2p_service, network_recv, message_handler_send, log.clone(), @@ -100,18 +100,18 @@ fn spawn_service( } fn network_service( - mut libp2p_service: LibP2PService, + mut eth2_libp2p_service: LibP2PService, network_recv: crossbeam_channel::Receiver, message_handler_send: crossbeam_channel::Sender, log: slog::Logger, -) -> impl futures::Future { - futures::future::poll_fn(move || -> Result<_, libp2p::error::Error> { +) -> impl futures::Future { + futures::future::poll_fn(move || -> Result<_, eth2_libp2p::error::Error> { // poll the swarm loop { - match libp2p_service.poll() { + match eth2_libp2p_service.poll() { Ok(Async::Ready(Some(Libp2pEvent::RPC(peer_id, rpc_event)))) => { trace!( - libp2p_service.log, + eth2_libp2p_service.log, "RPC Event: RPC message received: {:?}", rpc_event ); @@ -120,13 +120,13 @@ fn network_service( .map_err(|_| "failed to send rpc to handler")?; } Ok(Async::Ready(Some(Libp2pEvent::PeerDialed(peer_id)))) => { - debug!(libp2p_service.log, "Peer Dialed: {:?}", peer_id); + debug!(eth2_libp2p_service.log, "Peer Dialed: {:?}", peer_id); message_handler_send .send(HandlerMessage::PeerDialed(peer_id)) .map_err(|_| "failed to send rpc to handler")?; } Ok(Async::Ready(Some(Libp2pEvent::Message(m)))) => debug!( - libp2p_service.log, + eth2_libp2p_service.log, "Network Service: Message received: {}", m ), _ => break, @@ -143,7 +143,7 @@ fn network_service( trace!(log, "Sending RPC Event: {:?}", rpc_event); //TODO: Make swarm private //TODO: Implement correct peer id topic message handling - libp2p_service.swarm.send_rpc(peer_id, rpc_event); + eth2_libp2p_service.swarm.send_rpc(peer_id, rpc_event); } OutgoingMessage::NotifierTest => { debug!(log, "Received message from notifier"); @@ -152,7 +152,9 @@ fn network_service( } Err(TryRecvError::Empty) => break, Err(TryRecvError::Disconnected) => { - return Err(libp2p::error::Error::from("Network channel disconnected")); + return Err(eth2_libp2p::error::Error::from( + "Network channel disconnected", + )); } } } @@ -163,7 +165,7 @@ fn network_service( /// Types of messages that the network service can receive. #[derive(Debug, Clone)] pub enum NetworkMessage { - /// Send a message to libp2p service. + /// Send a message to eth2_libp2p service. //TODO: Define typing for messages across the wire Send(PeerId, OutgoingMessage), } diff --git a/beacon_node/network/src/sync/simple_sync.rs b/beacon_node/network/src/sync/simple_sync.rs index ea09f9c0ce..0f7de6ab97 100644 --- a/beacon_node/network/src/sync/simple_sync.rs +++ b/beacon_node/network/src/sync/simple_sync.rs @@ -1,6 +1,6 @@ use crate::beacon_chain::BeaconChain; -use libp2p::rpc::HelloMessage; -use libp2p::PeerId; +use eth2_libp2p::rpc::HelloMessage; +use eth2_libp2p::PeerId; use slog::{debug, o}; use std::collections::HashMap; use std::sync::Arc;