Skip to content

Commit

Permalink
Run clippy on ping.rs and fix warnings
Browse files Browse the repository at this point in the history
This gets rid of all the redundant clone() calls.
  • Loading branch information
thomaseizinger committed Mar 4, 2021
1 parent 9b71112 commit c151f0c
Showing 1 changed file with 22 additions and 25 deletions.
47 changes: 22 additions & 25 deletions protocols/request-response/tests/ping.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ fn is_response_outbound() {
let cfg = RequestResponseConfig::default();

let (peer1_id, trans) = mk_transport();
let ping_proto1 = RequestResponse::new(PingCodec(), protocols.clone(), cfg.clone());
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id.clone());
let ping_proto1 = RequestResponse::new(PingCodec(), protocols, cfg);
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id);

let request_id1 = swarm1.send_request(&offline_peer, ping.clone());

Expand All @@ -60,7 +60,7 @@ fn is_response_outbound() {
e => panic!("Peer: Unexpected event: {:?}", e),
}

let request_id2 = swarm1.send_request(&offline_peer, ping.clone());
let request_id2 = swarm1.send_request(&offline_peer, ping);

assert!(!swarm1.is_pending_outbound(&offline_peer, &request_id1));
assert!(swarm1.is_pending_outbound(&offline_peer, &request_id2));
Expand All @@ -77,11 +77,11 @@ fn ping_protocol() {

let (peer1_id, trans) = mk_transport();
let ping_proto1 = RequestResponse::new(PingCodec(), protocols.clone(), cfg.clone());
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id.clone());
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id);

let (peer2_id, trans) = mk_transport();
let ping_proto2 = RequestResponse::new(PingCodec(), protocols, cfg);
let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id.clone());
let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id);

let (mut tx, mut rx) = mpsc::channel::<Multiaddr>(1);

Expand Down Expand Up @@ -157,17 +157,17 @@ fn emits_inbound_connection_closed_failure() {

let (peer1_id, trans) = mk_transport();
let ping_proto1 = RequestResponse::new(PingCodec(), protocols.clone(), cfg.clone());
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id.clone());
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id);

let (peer2_id, trans) = mk_transport();
let ping_proto2 = RequestResponse::new(PingCodec(), protocols, cfg);
let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id.clone());
let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id);

let addr = "/ip4/127.0.0.1/tcp/0".parse().unwrap();
Swarm::listen_on(&mut swarm1, addr).unwrap();

futures::executor::block_on(async move {
while let Some(_) = swarm1.next().now_or_never() {}
while swarm1.next().now_or_never().is_some() {}
let addr1 = Swarm::listeners(&swarm1).next().unwrap();

swarm2.add_address(&peer1_id, addr1.clone());
Expand Down Expand Up @@ -215,17 +215,17 @@ fn emits_inbound_connection_closed_if_channel_is_dropped() {

let (peer1_id, trans) = mk_transport();
let ping_proto1 = RequestResponse::new(PingCodec(), protocols.clone(), cfg.clone());
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id.clone());
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id);

let (peer2_id, trans) = mk_transport();
let ping_proto2 = RequestResponse::new(PingCodec(), protocols, cfg);
let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id.clone());
let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id);

let addr = "/ip4/127.0.0.1/tcp/0".parse().unwrap();
Swarm::listen_on(&mut swarm1, addr).unwrap();

futures::executor::block_on(async move {
while let Some(_) = swarm1.next().now_or_never() {}
while swarm1.next().now_or_never().is_some() {}
let addr1 = Swarm::listeners(&swarm1).next().unwrap();

swarm2.add_address(&peer1_id, addr1.clone());
Expand All @@ -234,18 +234,15 @@ fn emits_inbound_connection_closed_if_channel_is_dropped() {
// Wait for swarm 1 to receive request by swarm 2.
let event = loop {
futures::select!(
event = swarm1.next().fuse() => match event {
RequestResponseEvent::Message {
peer,
message: RequestResponseMessage::Request { request, channel, .. }
} => {
assert_eq!(&request, &ping);
assert_eq!(&peer, &peer2_id);

drop(channel);
continue;
},
_ => {}
event = swarm1.next().fuse() => if let RequestResponseEvent::Message {
peer,
message: RequestResponseMessage::Request { request, channel, .. }
} = event {
assert_eq!(&request, &ping);
assert_eq!(&peer, &peer2_id);

drop(channel);
continue;
},
event = swarm2.next().fuse() => {
break event;
Expand All @@ -272,11 +269,11 @@ fn ping_protocol_throttled() {

let (peer1_id, trans) = mk_transport();
let ping_proto1 = RequestResponse::throttled(PingCodec(), protocols.clone(), cfg.clone());
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id.clone());
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id);

let (peer2_id, trans) = mk_transport();
let ping_proto2 = RequestResponse::throttled(PingCodec(), protocols, cfg);
let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id.clone());
let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id);

let (mut tx, mut rx) = mpsc::channel::<Multiaddr>(1);

Expand Down

0 comments on commit c151f0c

Please sign in to comment.