Fix clippy lints

This commit is contained in:
Paul Hauner
2019-04-03 16:23:09 +11:00
parent 1d34e2b2a5
commit 1913be0c6f
22 changed files with 76 additions and 105 deletions

View File

@@ -41,7 +41,7 @@ pub enum HandlerMessage {
/// An RPC response/request has been received.
RPC(PeerId, RPCEvent),
/// A gossip message has been received.
PubsubMessage(PeerId, PubsubMessage),
PubsubMessage(PeerId, Box<PubsubMessage>),
}
impl MessageHandler {
@@ -93,7 +93,7 @@ impl MessageHandler {
}
// we have received an RPC message request/response
HandlerMessage::PubsubMessage(peer_id, gossip) => {
self.handle_gossip(peer_id, gossip);
self.handle_gossip(peer_id, *gossip);
}
//TODO: Handle all messages
_ => {}

View File

@@ -17,7 +17,7 @@ use types::Topic;
/// Service that handles communication between internal services and the eth2_libp2p network service.
pub struct Service {
//libp2p_service: Arc<Mutex<LibP2PService>>,
libp2p_exit: oneshot::Sender<()>,
_libp2p_exit: oneshot::Sender<()>,
network_send: crossbeam_channel::Sender<NetworkMessage>,
//message_handler: MessageHandler,
//message_handler_send: Sender<HandlerMessage>,
@@ -54,7 +54,7 @@ impl Service {
log,
)?;
let network_service = Service {
libp2p_exit,
_libp2p_exit: libp2p_exit,
network_send: network_send.clone(),
};
@@ -131,9 +131,7 @@ fn network_service(
);
}
Libp2pEvent::PubsubMessage {
source,
topics: _,
message,
source, message, ..
} => {
//TODO: Decide if we need to propagate the topic upwards. (Potentially for
//attestations)
@@ -167,7 +165,7 @@ fn network_service(
}
Ok(NetworkMessage::Publish { topics, message }) => {
debug!(log, "Sending pubsub message on topics {:?}", topics);
libp2p_service.swarm.publish(topics, message);
libp2p_service.swarm.publish(topics, *message);
}
Err(TryRecvError::Empty) => break,
Err(TryRecvError::Disconnected) => {
@@ -190,7 +188,7 @@ pub enum NetworkMessage {
/// Publish a message to pubsub mechanism.
Publish {
topics: Vec<Topic>,
message: PubsubMessage,
message: Box<PubsubMessage>,
},
}

View File

@@ -65,7 +65,7 @@ pub enum PeerStatus {
}
impl PeerStatus {
pub fn should_handshake(&self) -> bool {
pub fn should_handshake(self) -> bool {
match self {
PeerStatus::DifferentNetworkId => false,
PeerStatus::FinalizedEpochNotInChain => false,