diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml index 3d6c1616..13911ef8 100644 --- a/protocols/floodsub/Cargo.toml +++ b/protocols/floodsub/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libp2p-floodsub" +edition = "2018" description = "Floodsub protocol for libp2p" version = "0.2.0" authors = ["Parity Technologies "] diff --git a/protocols/floodsub/src/handler.rs b/protocols/floodsub/src/handler.rs index d96d26fc..8112e928 100644 --- a/protocols/floodsub/src/handler.rs +++ b/protocols/floodsub/src/handler.rs @@ -157,7 +157,7 @@ where fn shutdown(&mut self) { self.shutting_down = true; for n in (0..self.substreams.len()).rev() { - let mut substream = self.substreams.swap_remove(n); + let substream = self.substreams.swap_remove(n); self.substreams.push(SubstreamState::Closing(substream.into_substream())); } } diff --git a/protocols/floodsub/src/layer.rs b/protocols/floodsub/src/layer.rs index 7a4a1d2e..2e362ec3 100644 --- a/protocols/floodsub/src/layer.rs +++ b/protocols/floodsub/src/layer.rs @@ -18,18 +18,18 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. +use crate::handler::FloodsubHandler; +use crate::protocol::{FloodsubMessage, FloodsubRpc, FloodsubSubscription, FloodsubSubscriptionAction}; +use crate::topic::{Topic, TopicHash}; use cuckoofilter::CuckooFilter; use futures::prelude::*; -use handler::FloodsubHandler; use libp2p_core::swarm::{ConnectedPoint, NetworkBehaviour, NetworkBehaviourAction, PollParameters}; use libp2p_core::{protocols_handler::ProtocolsHandler, PeerId}; -use protocol::{FloodsubMessage, FloodsubRpc, FloodsubSubscription, FloodsubSubscriptionAction}; use rand; use smallvec::SmallVec; use std::{collections::VecDeque, iter, marker::PhantomData}; use std::collections::hash_map::{DefaultHasher, HashMap}; use tokio_io::{AsyncRead, AsyncWrite}; -use topic::{Topic, TopicHash}; /// Network behaviour that automatically identifies nodes periodically, and returns information /// about them. @@ -213,7 +213,7 @@ where ) { // Update connected peers topics for subscription in event.subscriptions { - let mut remote_peer_topics = self.connected_peers + let remote_peer_topics = self.connected_peers .get_mut(&propagation_source) .expect("connected_peers is kept in sync with the peers we are connected to; we are guaranteed to only receive events from connected peers; QED"); match subscription.action { diff --git a/protocols/floodsub/src/protocol.rs b/protocols/floodsub/src/protocol.rs index 16016d66..30c6592e 100644 --- a/protocols/floodsub/src/protocol.rs +++ b/protocols/floodsub/src/protocol.rs @@ -20,13 +20,13 @@ use bytes::{BufMut, BytesMut}; use crate::rpc_proto; +use crate::topic::TopicHash; use futures::future; use libp2p_core::{InboundUpgrade, OutboundUpgrade, UpgradeInfo, PeerId}; use protobuf::Message as ProtobufMessage; use std::{io, iter}; use tokio_codec::{Decoder, Encoder, Framed}; use tokio_io::{AsyncRead, AsyncWrite}; -use topic::TopicHash; use unsigned_varint::codec; /// Implementation of `ConnectionUpgrade` for the floodsub protocol. diff --git a/protocols/floodsub/src/topic.rs b/protocols/floodsub/src/topic.rs index b26e6f15..ca24ce02 100644 --- a/protocols/floodsub/src/topic.rs +++ b/protocols/floodsub/src/topic.rs @@ -19,8 +19,8 @@ // DEALINGS IN THE SOFTWARE. use bs58; +use crate::rpc_proto; use protobuf::Message; -use rpc_proto; /// Represents the hash of a topic. /// diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml index 57cda73f..dcbfd088 100644 --- a/protocols/identify/Cargo.toml +++ b/protocols/identify/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libp2p-identify" +edition = "2018" description = "Nodes identifcation protocol for libp2p" version = "0.2.0" authors = ["Parity Technologies "] diff --git a/protocols/identify/src/id_transport.rs b/protocols/identify/src/id_transport.rs index 1dce14d4..7965758b 100644 --- a/protocols/identify/src/id_transport.rs +++ b/protocols/identify/src/id_transport.rs @@ -20,13 +20,13 @@ //! Contains the `IdentifyTransport` type. +use crate::protocol::{RemoteInfo, IdentifyProtocolConfig}; use futures::{future, prelude::*, stream, AndThen, MapErr}; use libp2p_core::{ Multiaddr, PeerId, PublicKey, muxing, Transport, transport::{TransportError, upgrade::TransportUpgradeError}, upgrade::{self, OutboundUpgradeApply, UpgradeError} }; -use protocol::{RemoteInfo, IdentifyProtocolConfig}; use std::io::{Error as IoError, ErrorKind as IoErrorKind}; use std::mem; use std::sync::Arc; diff --git a/protocols/identify/src/protocol.rs b/protocols/identify/src/protocol.rs index 22f2d484..5b80ca96 100644 --- a/protocols/identify/src/protocol.rs +++ b/protocols/identify/src/protocol.rs @@ -19,6 +19,7 @@ // DEALINGS IN THE SOFTWARE. use bytes::BytesMut; +use crate::structs_proto; use futures::{future::{self, FutureResult}, Async, AsyncSink, Future, Poll, Sink, Stream}; use libp2p_core::{ Multiaddr, PublicKey, @@ -30,7 +31,6 @@ use protobuf::parse_from_bytes as protobuf_parse_from_bytes; use protobuf::RepeatedField; use std::io::{Error as IoError, ErrorKind as IoErrorKind}; use std::iter; -use structs_proto; use tokio_codec::Framed; use tokio_io::{AsyncRead, AsyncWrite}; use unsigned_varint::codec; diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml index 88730dd6..fbc37618 100644 --- a/protocols/kad/Cargo.toml +++ b/protocols/kad/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libp2p-kad" +edition = "2018" description = "Kademlia protocol for libp2p" version = "0.2.1" authors = ["Parity Technologies "] diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs index 53508f84..6d477144 100644 --- a/protocols/kad/src/behaviour.rs +++ b/protocols/kad/src/behaviour.rs @@ -18,20 +18,20 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. +use crate::handler::{KademliaHandler, KademliaHandlerEvent, KademliaHandlerIn, KademliaRequestId}; +use crate::protocol::{KadConnectionType, KadPeer}; +use crate::query::{QueryConfig, QueryState, QueryStatePollOut, QueryTarget}; +use crate::topology::KademliaTopology; use fnv::{FnvHashMap, FnvHashSet}; use futures::{prelude::*, stream}; -use handler::{KademliaHandler, KademliaHandlerEvent, KademliaHandlerIn, KademliaRequestId}; use libp2p_core::swarm::{ConnectedPoint, NetworkBehaviour, NetworkBehaviourAction, PollParameters}; use libp2p_core::{protocols_handler::ProtocolsHandler, topology::Topology, Multiaddr, PeerId}; use multihash::Multihash; -use protocol::{KadConnectionType, KadPeer}; -use query::{QueryConfig, QueryState, QueryStatePollOut, QueryTarget}; use rand; use smallvec::SmallVec; use std::{cmp::Ordering, marker::PhantomData, time::Duration, time::Instant}; use tokio_io::{AsyncRead, AsyncWrite}; use tokio_timer::Interval; -use topology::KademliaTopology; /// Network behaviour that handles Kademlia. pub struct Kademlia { @@ -178,7 +178,7 @@ impl Kademlia { match query { QueryTarget::FindPeer(key) => { - let mut topology = parameters.topology(); + let topology = parameters.topology(); // TODO: insert local_kad_peer somewhere? let closer_peers = topology .closest_peers(key.as_ref(), self.num_results) @@ -191,7 +191,7 @@ impl Kademlia { } }, QueryTarget::GetProviders(key) => { - let mut topology = parameters.topology(); + let topology = parameters.topology(); // TODO: insert local_kad_peer somewhere? let closer_peers = topology .closest_peers(&key, self.num_results) diff --git a/protocols/kad/src/handler.rs b/protocols/kad/src/handler.rs index a20b6a1d..2c9a5cc7 100644 --- a/protocols/kad/src/handler.rs +++ b/protocols/kad/src/handler.rs @@ -18,14 +18,14 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. +use crate::protocol::{ + KadInStreamSink, KadOutStreamSink, KadPeer, KadRequestMsg, KadResponseMsg, + KademliaProtocolConfig, +}; use futures::prelude::*; use libp2p_core::protocols_handler::{ProtocolsHandler, ProtocolsHandlerEvent, ProtocolsHandlerUpgrErr}; use libp2p_core::{upgrade, either::EitherOutput, InboundUpgrade, OutboundUpgrade, PeerId}; use multihash::Multihash; -use protocol::{ - KadInStreamSink, KadOutStreamSink, KadPeer, KadRequestMsg, KadResponseMsg, - KademliaProtocolConfig, -}; use std::{error, fmt, io}; use tokio_io::{AsyncRead, AsyncWrite}; diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs index e70dffda..dc1818fa 100644 --- a/protocols/kad/src/kbucket.rs +++ b/protocols/kad/src/kbucket.rs @@ -323,7 +323,8 @@ impl<'a, Id: 'a, Val: 'a> Bucket<'a, Id, Val> { mod tests { extern crate rand; use self::rand::random; - use kbucket::{KBucketsPeerId, KBucketsTable, UpdateOutcome, MAX_NODES_PER_BUCKET}; + use crate::kbucket::{KBucketsPeerId, KBucketsTable}; + use crate::kbucket::{UpdateOutcome, MAX_NODES_PER_BUCKET}; use multihash::{Multihash, Hash}; use std::thread; use std::time::Duration; diff --git a/protocols/kad/src/protocol.rs b/protocols/kad/src/protocol.rs index 8053b607..a113dba6 100644 --- a/protocols/kad/src/protocol.rs +++ b/protocols/kad/src/protocol.rs @@ -27,11 +27,11 @@ //! used to send messages. use bytes::BytesMut; +use crate::protobuf_structs; use futures::{future, sink, stream, Sink, Stream}; use libp2p_core::{InboundUpgrade, Multiaddr, OutboundUpgrade, PeerId, UpgradeInfo}; use multihash::Multihash; use protobuf::{self, Message}; -use protobuf_structs; use std::io::{Error as IoError, ErrorKind as IoErrorKind}; use std::iter; use tokio_codec::Framed; @@ -54,7 +54,9 @@ pub enum KadConnectionType { impl From for KadConnectionType { #[inline] fn from(raw: protobuf_structs::dht::Message_ConnectionType) -> KadConnectionType { - use protobuf_structs::dht::Message_ConnectionType::*; + use crate::protobuf_structs::dht::Message_ConnectionType::{ + CAN_CONNECT, CANNOT_CONNECT, CONNECTED, NOT_CONNECTED + }; match raw { NOT_CONNECTED => KadConnectionType::NotConnected, CONNECTED => KadConnectionType::Connected, @@ -67,7 +69,9 @@ impl From for KadConnectionType { impl Into for KadConnectionType { #[inline] fn into(self) -> protobuf_structs::dht::Message_ConnectionType { - use protobuf_structs::dht::Message_ConnectionType::*; + use crate::protobuf_structs::dht::Message_ConnectionType::{ + CAN_CONNECT, CANNOT_CONNECT, CONNECTED, NOT_CONNECTED + }; match self { KadConnectionType::NotConnected => NOT_CONNECTED, KadConnectionType::Connected => CONNECTED, diff --git a/protocols/kad/src/query.rs b/protocols/kad/src/query.rs index 50d4f8c4..88d5881b 100644 --- a/protocols/kad/src/query.rs +++ b/protocols/kad/src/query.rs @@ -23,9 +23,9 @@ //! This allows one to create queries that iterate on the DHT on nodes that become closer and //! closer to the target. +use crate::handler::KademliaHandlerIn; +use crate::kbucket::KBucketsPeerId; use futures::prelude::*; -use handler::KademliaHandlerIn; -use kbucket::KBucketsPeerId; use libp2p_core::PeerId; use multihash::Multihash; use smallvec::SmallVec; diff --git a/protocols/kad/src/topology.rs b/protocols/kad/src/topology.rs index 7c4b299a..90fe47ac 100644 --- a/protocols/kad/src/topology.rs +++ b/protocols/kad/src/topology.rs @@ -18,10 +18,10 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -use kbucket::KBucketsPeerId; +use crate::kbucket::KBucketsPeerId; +use crate::protocol::KadConnectionType; use libp2p_core::{Multiaddr, PeerId, topology::MemoryTopology, topology::Topology}; use multihash::Multihash; -use protocol::KadConnectionType; use std::vec; /// Trait allowing retreival of information necessary for the Kadmelia system to work. diff --git a/protocols/observed/Cargo.toml b/protocols/observed/Cargo.toml index 71019445..5bf6b9a5 100644 --- a/protocols/observed/Cargo.toml +++ b/protocols/observed/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libp2p-observed-address" +edition = "2018" description = "Observed addresses protocol for libp2p" version = "0.2.0" authors = ["Parity Technologies "] diff --git a/protocols/plaintext/Cargo.toml b/protocols/plaintext/Cargo.toml index ac19ee75..7abe375e 100644 --- a/protocols/plaintext/Cargo.toml +++ b/protocols/plaintext/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libp2p-plaintext" +edition = "2018" description = "Plaintext encryption dummy protocol for libp2p" version = "0.2.0" authors = ["Parity Technologies "] diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml index 81c44943..a650ec35 100644 --- a/transports/dns/Cargo.toml +++ b/transports/dns/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libp2p-dns" +edition = "2018" description = "DNS transport implementation for libp2p" version = "0.2.0" authors = ["Parity Technologies "] diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs index 174cb822..23f3bd80 100644 --- a/transports/dns/src/lib.rs +++ b/transports/dns/src/lib.rs @@ -327,7 +327,7 @@ mod tests { use futures::future; use swarm::{Transport, transport::TransportError}; use multiaddr::{Protocol, Multiaddr}; - use DnsConfig; + use super::DnsConfig; #[test] fn basic_resolve() { diff --git a/transports/ratelimit/Cargo.toml b/transports/ratelimit/Cargo.toml index 6ad9c5d6..7abafe1a 100644 --- a/transports/ratelimit/Cargo.toml +++ b/transports/ratelimit/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libp2p-ratelimit" +edition = "2018" description = "Transfer rate limiting transport adapter for libp2p" version = "0.2.0" authors = ["Parity Technologies "] diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml index bfc5177f..4f0680a8 100644 --- a/transports/tcp/Cargo.toml +++ b/transports/tcp/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libp2p-tcp" +edition = "2018" description = "TCP/IP transport protocol for libp2p" version = "0.2.0" authors = ["Parity Technologies "] diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml index 5a42695f..7cd61c76 100644 --- a/transports/uds/Cargo.toml +++ b/transports/uds/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libp2p-uds" +edition = "2018" description = "Unix domain sockets transport for libp2p" version = "0.2.0" authors = ["Parity Technologies "]