From 8ab848e9632b48e4b1baa9ade2f6f2bd8efc09db Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Mon, 13 Mar 2023 01:46:58 +1100 Subject: [PATCH] feat: introduce `libp2p-identity` crate This patch combines the `libp2p_core::identity` and `libp2p_core::peer_id` modules into a new crate: `libp2p-identity`. Resolves https://github.com/libp2p/rust-libp2p/issues/3349. Pull-Request: #3350. --- Cargo.toml | 1 + examples/autonat_client.rs | 4 +++- examples/autonat_server.rs | 4 +++- src/behaviour.rs | 3 ++- src/behaviour/as_client.rs | 3 ++- src/behaviour/as_server.rs | 3 ++- src/protocol.rs | 3 ++- tests/test_client.rs | 3 ++- tests/test_server.rs | 3 ++- 9 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4c067634c9a..7ddf5688f01 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,7 @@ instant = "0.1" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.0", path = "../../swarm" } libp2p-request-response = { version = "0.24.0", path = "../request-response" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4" rand = "0.8" quick-protobuf = "0.8" diff --git a/examples/autonat_client.rs b/examples/autonat_client.rs index d2a7b2dee2f..4608937954a 100644 --- a/examples/autonat_client.rs +++ b/examples/autonat_client.rs @@ -33,8 +33,10 @@ use clap::Parser; use futures::prelude::*; use libp2p_autonat as autonat; use libp2p_core::multiaddr::Protocol; -use libp2p_core::{identity, upgrade::Version, Multiaddr, PeerId, Transport}; +use libp2p_core::{upgrade::Version, Multiaddr, Transport}; use libp2p_identify as identify; +use libp2p_identity as identity; +use libp2p_identity::PeerId; use libp2p_noise as noise; use libp2p_swarm::{NetworkBehaviour, Swarm, SwarmEvent}; use libp2p_tcp as tcp; diff --git a/examples/autonat_server.rs b/examples/autonat_server.rs index 8163826c830..d3f7fa5957b 100644 --- a/examples/autonat_server.rs +++ b/examples/autonat_server.rs @@ -29,8 +29,10 @@ use clap::Parser; use futures::prelude::*; use libp2p_autonat as autonat; -use libp2p_core::{identity, multiaddr::Protocol, upgrade::Version, Multiaddr, PeerId, Transport}; +use libp2p_core::{multiaddr::Protocol, upgrade::Version, Multiaddr, Transport}; use libp2p_identify as identify; +use libp2p_identity as identity; +use libp2p_identity::PeerId; use libp2p_noise as noise; use libp2p_swarm::{NetworkBehaviour, Swarm, SwarmEvent}; use libp2p_tcp as tcp; diff --git a/src/behaviour.rs b/src/behaviour.rs index 8e97e6395a7..47f15b8def6 100644 --- a/src/behaviour.rs +++ b/src/behaviour.rs @@ -28,7 +28,8 @@ use as_server::AsServer; pub use as_server::{InboundProbeError, InboundProbeEvent}; use futures_timer::Delay; use instant::Instant; -use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr, PeerId}; +use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr}; +use libp2p_identity::PeerId; use libp2p_request_response::{ self as request_response, ProtocolSupport, RequestId, ResponseChannel, }; diff --git a/src/behaviour/as_client.rs b/src/behaviour/as_client.rs index 1018bebd84b..2ab66f8bffc 100644 --- a/src/behaviour/as_client.rs +++ b/src/behaviour/as_client.rs @@ -27,7 +27,8 @@ use super::{ use futures::FutureExt; use futures_timer::Delay; use instant::Instant; -use libp2p_core::{Multiaddr, PeerId}; +use libp2p_core::Multiaddr; +use libp2p_identity::PeerId; use libp2p_request_response::{self as request_response, OutboundFailure, RequestId}; use libp2p_swarm::{ AddressScore, ConnectionId, ExternalAddresses, ListenAddresses, NetworkBehaviourAction, diff --git a/src/behaviour/as_server.rs b/src/behaviour/as_server.rs index ec38678e4f5..69f0474e621 100644 --- a/src/behaviour/as_server.rs +++ b/src/behaviour/as_server.rs @@ -23,7 +23,8 @@ use super::{ ResponseError, }; use instant::Instant; -use libp2p_core::{multiaddr::Protocol, Multiaddr, PeerId}; +use libp2p_core::{multiaddr::Protocol, Multiaddr}; +use libp2p_identity::PeerId; use libp2p_request_response::{ self as request_response, InboundFailure, RequestId, ResponseChannel, }; diff --git a/src/protocol.rs b/src/protocol.rs index 2bee14200d1..82e448cda24 100644 --- a/src/protocol.rs +++ b/src/protocol.rs @@ -21,7 +21,8 @@ use crate::proto; use async_trait::async_trait; use futures::io::{AsyncRead, AsyncWrite, AsyncWriteExt}; -use libp2p_core::{upgrade, Multiaddr, PeerId}; +use libp2p_core::{upgrade, Multiaddr}; +use libp2p_identity::PeerId; use libp2p_request_response::{self as request_response, ProtocolName}; use quick_protobuf::{BytesReader, Writer}; use std::{convert::TryFrom, io}; diff --git a/tests/test_client.rs b/tests/test_client.rs index b8ed029be26..221833c9377 100644 --- a/tests/test_client.rs +++ b/tests/test_client.rs @@ -22,7 +22,8 @@ use async_std::task::JoinHandle; use libp2p_autonat::{ Behaviour, Config, Event, NatStatus, OutboundProbeError, OutboundProbeEvent, ResponseError, }; -use libp2p_core::{Multiaddr, PeerId}; +use libp2p_core::Multiaddr; +use libp2p_identity::PeerId; use libp2p_swarm::{AddressScore, Swarm, SwarmEvent}; use libp2p_swarm_test::SwarmExt as _; use std::time::Duration; diff --git a/tests/test_server.rs b/tests/test_server.rs index 72f3465307d..319fd84865d 100644 --- a/tests/test_server.rs +++ b/tests/test_server.rs @@ -21,7 +21,8 @@ use libp2p_autonat::{ Behaviour, Config, Event, InboundProbeError, InboundProbeEvent, ResponseError, }; -use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr, PeerId}; +use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr}; +use libp2p_identity::PeerId; use libp2p_swarm::DialError; use libp2p_swarm::{AddressScore, Swarm, SwarmEvent}; use libp2p_swarm_test::SwarmExt as _;