Skip to content

Commit 8ab848e

Browse files
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 libp2p#3349. Pull-Request: libp2p#3350.
1 parent 621fe2f commit 8ab848e

File tree

9 files changed

+19
-8
lines changed

9 files changed

+19
-8
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ instant = "0.1"
1818
libp2p-core = { version = "0.39.0", path = "../../core" }
1919
libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
2020
libp2p-request-response = { version = "0.24.0", path = "../request-response" }
21+
libp2p-identity = { version = "0.1.0", path = "../../identity" }
2122
log = "0.4"
2223
rand = "0.8"
2324
quick-protobuf = "0.8"

examples/autonat_client.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ use clap::Parser;
3333
use futures::prelude::*;
3434
use libp2p_autonat as autonat;
3535
use libp2p_core::multiaddr::Protocol;
36-
use libp2p_core::{identity, upgrade::Version, Multiaddr, PeerId, Transport};
36+
use libp2p_core::{upgrade::Version, Multiaddr, Transport};
3737
use libp2p_identify as identify;
38+
use libp2p_identity as identity;
39+
use libp2p_identity::PeerId;
3840
use libp2p_noise as noise;
3941
use libp2p_swarm::{NetworkBehaviour, Swarm, SwarmEvent};
4042
use libp2p_tcp as tcp;

examples/autonat_server.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
use clap::Parser;
3030
use futures::prelude::*;
3131
use libp2p_autonat as autonat;
32-
use libp2p_core::{identity, multiaddr::Protocol, upgrade::Version, Multiaddr, PeerId, Transport};
32+
use libp2p_core::{multiaddr::Protocol, upgrade::Version, Multiaddr, Transport};
3333
use libp2p_identify as identify;
34+
use libp2p_identity as identity;
35+
use libp2p_identity::PeerId;
3436
use libp2p_noise as noise;
3537
use libp2p_swarm::{NetworkBehaviour, Swarm, SwarmEvent};
3638
use libp2p_tcp as tcp;

src/behaviour.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ use as_server::AsServer;
2828
pub use as_server::{InboundProbeError, InboundProbeEvent};
2929
use futures_timer::Delay;
3030
use instant::Instant;
31-
use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr, PeerId};
31+
use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr};
32+
use libp2p_identity::PeerId;
3233
use libp2p_request_response::{
3334
self as request_response, ProtocolSupport, RequestId, ResponseChannel,
3435
};

src/behaviour/as_client.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ use super::{
2727
use futures::FutureExt;
2828
use futures_timer::Delay;
2929
use instant::Instant;
30-
use libp2p_core::{Multiaddr, PeerId};
30+
use libp2p_core::Multiaddr;
31+
use libp2p_identity::PeerId;
3132
use libp2p_request_response::{self as request_response, OutboundFailure, RequestId};
3233
use libp2p_swarm::{
3334
AddressScore, ConnectionId, ExternalAddresses, ListenAddresses, NetworkBehaviourAction,

src/behaviour/as_server.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ use super::{
2323
ResponseError,
2424
};
2525
use instant::Instant;
26-
use libp2p_core::{multiaddr::Protocol, Multiaddr, PeerId};
26+
use libp2p_core::{multiaddr::Protocol, Multiaddr};
27+
use libp2p_identity::PeerId;
2728
use libp2p_request_response::{
2829
self as request_response, InboundFailure, RequestId, ResponseChannel,
2930
};

src/protocol.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
use crate::proto;
2222
use async_trait::async_trait;
2323
use futures::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
24-
use libp2p_core::{upgrade, Multiaddr, PeerId};
24+
use libp2p_core::{upgrade, Multiaddr};
25+
use libp2p_identity::PeerId;
2526
use libp2p_request_response::{self as request_response, ProtocolName};
2627
use quick_protobuf::{BytesReader, Writer};
2728
use std::{convert::TryFrom, io};

tests/test_client.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ use async_std::task::JoinHandle;
2222
use libp2p_autonat::{
2323
Behaviour, Config, Event, NatStatus, OutboundProbeError, OutboundProbeEvent, ResponseError,
2424
};
25-
use libp2p_core::{Multiaddr, PeerId};
25+
use libp2p_core::Multiaddr;
26+
use libp2p_identity::PeerId;
2627
use libp2p_swarm::{AddressScore, Swarm, SwarmEvent};
2728
use libp2p_swarm_test::SwarmExt as _;
2829
use std::time::Duration;

tests/test_server.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
use libp2p_autonat::{
2222
Behaviour, Config, Event, InboundProbeError, InboundProbeEvent, ResponseError,
2323
};
24-
use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr, PeerId};
24+
use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr};
25+
use libp2p_identity::PeerId;
2526
use libp2p_swarm::DialError;
2627
use libp2p_swarm::{AddressScore, Swarm, SwarmEvent};
2728
use libp2p_swarm_test::SwarmExt as _;

0 commit comments

Comments
 (0)