mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-17 21:51:06 +00:00
Apply some clippy lints (#11154)
* Apply some clippy hints * Revert clippy ci changes * Update client/cli/src/commands/generate.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/commands/inspect_key.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/db/src/bench.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/db/src/bench.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/service/src/client/block_rules.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/service/src/client/block_rules.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/network/src/transactions.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/network/src/protocol.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Revert due to missing `or_default` function. * Fix compilation and simplify code * Undo change that corrupts benchmark. * fix clippy * Update client/service/test/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/state-db/src/noncanonical.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/state-db/src/noncanonical.rs remove leftovers! * Update client/tracing/src/logging/directives.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update utils/fork-tree/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * added needed ref * Update frame/referenda/src/benchmarking.rs * Simplify byte-vec creation * let's just not overlap the ranges * Correction * cargo fmt * Update utils/frame/benchmarking-cli/src/shared/stats.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update utils/frame/benchmarking-cli/src/pallet/command.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update utils/frame/benchmarking-cli/src/pallet/command.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Giles Cope <gilescope@gmail.com>
This commit is contained in:
Falco Hirschenberger
committed by
GitHub
GitHub
parent
a990473cf9
commit
b581604aa7
@@ -619,11 +619,9 @@ impl Peerset {
|
||||
|
||||
self.update_time();
|
||||
|
||||
if self.reserved_nodes[set_id.0].1 {
|
||||
if !self.reserved_nodes[set_id.0].0.contains(&peer_id) {
|
||||
self.message_queue.push_back(Message::Reject(index));
|
||||
return
|
||||
}
|
||||
if self.reserved_nodes[set_id.0].1 && !self.reserved_nodes[set_id.0].0.contains(&peer_id) {
|
||||
self.message_queue.push_back(Message::Reject(index));
|
||||
return
|
||||
}
|
||||
|
||||
let not_connected = match self.data.peer(set_id.0, &peer_id) {
|
||||
@@ -730,8 +728,7 @@ impl Stream for Peerset {
|
||||
return Poll::Ready(Some(message))
|
||||
}
|
||||
|
||||
if let Poll::Ready(_) = Future::poll(Pin::new(&mut self.next_periodic_alloc_slots), cx)
|
||||
{
|
||||
if Future::poll(Pin::new(&mut self.next_periodic_alloc_slots), cx).is_ready() {
|
||||
self.next_periodic_alloc_slots = Delay::new(Duration::new(1, 0));
|
||||
|
||||
for set_index in 0..self.data.num_sets() {
|
||||
@@ -798,7 +795,7 @@ mod tests {
|
||||
|
||||
fn next_message(mut peerset: Peerset) -> Result<(Message, Peerset), ()> {
|
||||
let next = futures::executor::block_on_stream(&mut peerset).next();
|
||||
let message = next.ok_or_else(|| ())?;
|
||||
let message = next.ok_or(())?;
|
||||
Ok((message, peerset))
|
||||
}
|
||||
|
||||
|
||||
@@ -169,9 +169,7 @@ impl PeersState {
|
||||
|
||||
/// Returns an object that grants access to the reputation value of a peer.
|
||||
pub fn peer_reputation(&mut self, peer_id: PeerId) -> Reputation {
|
||||
if !self.nodes.contains_key(&peer_id) {
|
||||
self.nodes.insert(peer_id, Node::new(self.sets.len()));
|
||||
}
|
||||
self.nodes.entry(peer_id).or_insert_with(|| Node::new(self.sets.len()));
|
||||
|
||||
let entry = match self.nodes.entry(peer_id) {
|
||||
Entry::Vacant(_) => unreachable!("guaranteed to be inserted above; qed"),
|
||||
@@ -652,7 +650,7 @@ mod tests {
|
||||
let id1 = PeerId::random();
|
||||
let id2 = PeerId::random();
|
||||
|
||||
peers_state.add_no_slot_node(0, id1.clone());
|
||||
peers_state.add_no_slot_node(0, id1);
|
||||
if let Peer::Unknown(p) = peers_state.peer(0, &id1) {
|
||||
assert!(p.discover().try_accept_incoming().is_ok());
|
||||
} else {
|
||||
@@ -705,43 +703,28 @@ mod tests {
|
||||
assert!(peers_state.highest_not_connected_peer(0).is_none());
|
||||
peers_state.peer(0, &id1).into_unknown().unwrap().discover().set_reputation(50);
|
||||
peers_state.peer(0, &id2).into_unknown().unwrap().discover().set_reputation(25);
|
||||
assert_eq!(
|
||||
peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()),
|
||||
Some(id1.clone())
|
||||
);
|
||||
assert_eq!(peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()), Some(id1));
|
||||
peers_state.peer(0, &id2).into_not_connected().unwrap().set_reputation(75);
|
||||
assert_eq!(
|
||||
peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()),
|
||||
Some(id2.clone())
|
||||
);
|
||||
assert_eq!(peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()), Some(id2));
|
||||
peers_state
|
||||
.peer(0, &id2)
|
||||
.into_not_connected()
|
||||
.unwrap()
|
||||
.try_accept_incoming()
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()),
|
||||
Some(id1.clone())
|
||||
);
|
||||
assert_eq!(peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()), Some(id1));
|
||||
peers_state.peer(0, &id1).into_not_connected().unwrap().set_reputation(100);
|
||||
peers_state.peer(0, &id2).into_connected().unwrap().disconnect();
|
||||
assert_eq!(
|
||||
peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()),
|
||||
Some(id1.clone())
|
||||
);
|
||||
assert_eq!(peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()), Some(id1));
|
||||
peers_state.peer(0, &id1).into_not_connected().unwrap().set_reputation(-100);
|
||||
assert_eq!(
|
||||
peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()),
|
||||
Some(id2.clone())
|
||||
);
|
||||
assert_eq!(peers_state.highest_not_connected_peer(0).map(|p| p.into_peer_id()), Some(id2));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn disconnect_no_slot_doesnt_panic() {
|
||||
let mut peers_state = PeersState::new(iter::once(SetConfig { in_peers: 1, out_peers: 1 }));
|
||||
let id = PeerId::random();
|
||||
peers_state.add_no_slot_node(0, id.clone());
|
||||
peers_state.add_no_slot_node(0, id);
|
||||
let peer = peers_state
|
||||
.peer(0, &id)
|
||||
.into_unknown()
|
||||
|
||||
Reference in New Issue
Block a user