Skip to content

Commit

Permalink
feat: introduce libp2p-identity crate
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
thomaseizinger authored Mar 12, 2023
1 parent 621fe2f commit 8ab848e
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 8 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion examples/autonat_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion examples/autonat_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/behaviour.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
3 changes: 2 additions & 1 deletion src/behaviour/as_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion src/behaviour/as_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
3 changes: 2 additions & 1 deletion src/protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
3 changes: 2 additions & 1 deletion tests/test_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion tests/test_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 _;
Expand Down

0 comments on commit 8ab848e

Please sign in to comment.