mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-18 03:41:02 +00:00
Fix clippy warnings (#7625)
* Fix clippy check Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Autofix clippy Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix trivial Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * fmt Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * suppress warnings Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Quiet clippy 😌 Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Oliver Tale-Yazdi
committed by
GitHub
GitHub
parent
a0f83eb992
commit
d501d92176
@@ -65,7 +65,7 @@ fn prewarmed_state(
|
||||
known_message: BitfieldGossipMessage,
|
||||
peers: Vec<PeerId>,
|
||||
) -> ProtocolState {
|
||||
let relay_parent = known_message.relay_parent.clone();
|
||||
let relay_parent = known_message.relay_parent;
|
||||
let mut topologies = SessionBoundGridTopologyStorage::default();
|
||||
topologies.update_topology(0_u32, SessionGridTopology::new(Vec::new(), Vec::new()), None);
|
||||
topologies.get_current_topology_mut().local_grid_neighbors_mut().peers_x =
|
||||
@@ -73,7 +73,7 @@ fn prewarmed_state(
|
||||
|
||||
ProtocolState {
|
||||
per_relay_parent: hashmap! {
|
||||
relay_parent.clone() =>
|
||||
relay_parent =>
|
||||
PerRelayParentData {
|
||||
signing_context,
|
||||
validator_set: vec![validator.clone()],
|
||||
@@ -99,7 +99,7 @@ fn state_with_view(
|
||||
) -> (ProtocolState, SigningContext, KeystorePtr, ValidatorId) {
|
||||
let mut state = ProtocolState { reputation, ..Default::default() };
|
||||
|
||||
let signing_context = SigningContext { session_index: 1, parent_hash: relay_parent.clone() };
|
||||
let signing_context = SigningContext { session_index: 1, parent_hash: relay_parent };
|
||||
|
||||
let keystore: KeystorePtr = Arc::new(MemoryKeystore::new());
|
||||
let validator = Keystore::sr25519_generate_new(&*keystore, ValidatorId::ID, None)
|
||||
@@ -109,10 +109,10 @@ fn state_with_view(
|
||||
.iter()
|
||||
.map(|relay_parent| {
|
||||
(
|
||||
relay_parent.clone(),
|
||||
*relay_parent,
|
||||
PerRelayParentData {
|
||||
signing_context: signing_context.clone(),
|
||||
validator_set: vec![validator.clone().into()],
|
||||
validator_set: vec![validator.into()],
|
||||
one_per_validator: hashmap! {},
|
||||
message_received_from_peer: hashmap! {},
|
||||
message_sent_to_peer: hashmap! {},
|
||||
@@ -140,7 +140,7 @@ fn receive_invalid_signature() {
|
||||
let peer_b = PeerId::random();
|
||||
assert_ne!(peer_a, peer_b);
|
||||
|
||||
let signing_context = SigningContext { session_index: 1, parent_hash: hash_a.clone() };
|
||||
let signing_context = SigningContext { session_index: 1, parent_hash: hash_a };
|
||||
|
||||
// another validator not part of the validatorset
|
||||
let keystore: KeystorePtr = Arc::new(MemoryKeystore::new());
|
||||
@@ -184,28 +184,20 @@ fn receive_invalid_signature() {
|
||||
.flatten()
|
||||
.expect("should be signed");
|
||||
|
||||
let invalid_msg = BitfieldGossipMessage {
|
||||
relay_parent: hash_a.clone(),
|
||||
signed_availability: invalid_signed.clone(),
|
||||
};
|
||||
let invalid_msg =
|
||||
BitfieldGossipMessage { relay_parent: hash_a, signed_availability: invalid_signed.clone() };
|
||||
let invalid_msg_2 = BitfieldGossipMessage {
|
||||
relay_parent: hash_a.clone(),
|
||||
relay_parent: hash_a,
|
||||
signed_availability: invalid_signed_2.clone(),
|
||||
};
|
||||
let valid_msg = BitfieldGossipMessage {
|
||||
relay_parent: hash_a.clone(),
|
||||
signed_availability: valid_signed.clone(),
|
||||
};
|
||||
let valid_msg =
|
||||
BitfieldGossipMessage { relay_parent: hash_a, signed_availability: valid_signed.clone() };
|
||||
|
||||
let pool = sp_core::testing::TaskExecutor::new();
|
||||
let (mut ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
|
||||
|
||||
let mut state = prewarmed_state(
|
||||
validator_0.into(),
|
||||
signing_context.clone(),
|
||||
valid_msg,
|
||||
vec![peer_b.clone()],
|
||||
);
|
||||
let mut state =
|
||||
prewarmed_state(validator_0.into(), signing_context.clone(), valid_msg, vec![peer_b]);
|
||||
state
|
||||
.per_relay_parent
|
||||
.get_mut(&hash_a)
|
||||
@@ -219,7 +211,7 @@ fn receive_invalid_signature() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b.clone(), invalid_msg.into_network_message()),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b, invalid_msg.into_network_message()),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -230,7 +222,7 @@ fn receive_invalid_signature() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b.clone(), invalid_msg_2.into_network_message()),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b, invalid_msg_2.into_network_message()),
|
||||
&mut rng,
|
||||
));
|
||||
// reputation change due to invalid signature
|
||||
@@ -261,13 +253,10 @@ fn receive_invalid_validator_index() {
|
||||
assert_ne!(peer_a, peer_b);
|
||||
|
||||
// validator 0 key pair
|
||||
let (mut state, signing_context, keystore, validator) = state_with_view(
|
||||
our_view![hash_a, hash_b],
|
||||
hash_a.clone(),
|
||||
ReputationAggregator::new(|_| true),
|
||||
);
|
||||
let (mut state, signing_context, keystore, validator) =
|
||||
state_with_view(our_view![hash_a, hash_b], hash_a, ReputationAggregator::new(|_| true));
|
||||
|
||||
state.peer_views.insert(peer_b.clone(), view![hash_a]);
|
||||
state.peer_views.insert(peer_b, view![hash_a]);
|
||||
|
||||
let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]);
|
||||
let signed = Signed::<AvailabilityBitfield>::sign(
|
||||
@@ -281,8 +270,7 @@ fn receive_invalid_validator_index() {
|
||||
.flatten()
|
||||
.expect("should be signed");
|
||||
|
||||
let msg =
|
||||
BitfieldGossipMessage { relay_parent: hash_a.clone(), signed_availability: signed.clone() };
|
||||
let msg = BitfieldGossipMessage { relay_parent: hash_a, signed_availability: signed.clone() };
|
||||
|
||||
let pool = sp_core::testing::TaskExecutor::new();
|
||||
let (mut ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
|
||||
@@ -293,7 +281,7 @@ fn receive_invalid_validator_index() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.into_network_message()),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b, msg.into_network_message()),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -325,11 +313,8 @@ fn receive_duplicate_messages() {
|
||||
assert_ne!(peer_a, peer_b);
|
||||
|
||||
// validator 0 key pair
|
||||
let (mut state, signing_context, keystore, validator) = state_with_view(
|
||||
our_view![hash_a, hash_b],
|
||||
hash_a.clone(),
|
||||
ReputationAggregator::new(|_| true),
|
||||
);
|
||||
let (mut state, signing_context, keystore, validator) =
|
||||
state_with_view(our_view![hash_a, hash_b], hash_a, ReputationAggregator::new(|_| true));
|
||||
|
||||
// create a signed message by validator 0
|
||||
let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]);
|
||||
@@ -345,7 +330,7 @@ fn receive_duplicate_messages() {
|
||||
.expect("should be signed");
|
||||
|
||||
let msg = BitfieldGossipMessage {
|
||||
relay_parent: hash_a.clone(),
|
||||
relay_parent: hash_a,
|
||||
signed_availability: signed_bitfield.clone(),
|
||||
};
|
||||
|
||||
@@ -359,7 +344,7 @@ fn receive_duplicate_messages() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.clone().into_network_message(),),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b, msg.clone().into_network_message(),),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -392,7 +377,7 @@ fn receive_duplicate_messages() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peer_a.clone(), msg.clone().into_network_message(),),
|
||||
NetworkBridgeEvent::PeerMessage(peer_a, msg.clone().into_network_message(),),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -411,7 +396,7 @@ fn receive_duplicate_messages() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.clone().into_network_message(),),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b, msg.clone().into_network_message(),),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -442,11 +427,8 @@ fn delay_reputation_change() {
|
||||
let peer = PeerId::random();
|
||||
|
||||
// validator 0 key pair
|
||||
let (mut state, signing_context, keystore, validator) = state_with_view(
|
||||
our_view![hash_a, hash_b],
|
||||
hash_a.clone(),
|
||||
ReputationAggregator::new(|_| false),
|
||||
);
|
||||
let (mut state, signing_context, keystore, validator) =
|
||||
state_with_view(our_view![hash_a, hash_b], hash_a, ReputationAggregator::new(|_| false));
|
||||
|
||||
// create a signed message by validator 0
|
||||
let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]);
|
||||
@@ -462,7 +444,7 @@ fn delay_reputation_change() {
|
||||
.expect("should be signed");
|
||||
|
||||
let msg = BitfieldGossipMessage {
|
||||
relay_parent: hash_a.clone(),
|
||||
relay_parent: hash_a,
|
||||
signed_availability: signed_bitfield.clone(),
|
||||
};
|
||||
|
||||
@@ -481,10 +463,7 @@ fn delay_reputation_change() {
|
||||
handle
|
||||
.send(FromOrchestra::Communication {
|
||||
msg: BitfieldDistributionMessage::NetworkBridgeUpdate(
|
||||
NetworkBridgeEvent::PeerMessage(
|
||||
peer.clone(),
|
||||
msg.clone().into_network_message(),
|
||||
),
|
||||
NetworkBridgeEvent::PeerMessage(peer, msg.clone().into_network_message()),
|
||||
),
|
||||
})
|
||||
.await;
|
||||
@@ -507,10 +486,7 @@ fn delay_reputation_change() {
|
||||
handle
|
||||
.send(FromOrchestra::Communication {
|
||||
msg: BitfieldDistributionMessage::NetworkBridgeUpdate(
|
||||
NetworkBridgeEvent::PeerMessage(
|
||||
peer.clone(),
|
||||
msg.clone().into_network_message(),
|
||||
),
|
||||
NetworkBridgeEvent::PeerMessage(peer, msg.clone().into_network_message()),
|
||||
),
|
||||
})
|
||||
.await;
|
||||
@@ -555,7 +531,7 @@ fn do_not_relay_message_twice() {
|
||||
|
||||
// validator 0 key pair
|
||||
let (mut state, signing_context, keystore, validator) =
|
||||
state_with_view(our_view![hash], hash.clone(), ReputationAggregator::new(|_| true));
|
||||
state_with_view(our_view![hash], hash, ReputationAggregator::new(|_| true));
|
||||
|
||||
// create a signed message by validator 0
|
||||
let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]);
|
||||
@@ -570,13 +546,11 @@ fn do_not_relay_message_twice() {
|
||||
.flatten()
|
||||
.expect("should be signed");
|
||||
|
||||
state.peer_views.insert(peer_b.clone(), view![hash]);
|
||||
state.peer_views.insert(peer_a.clone(), view![hash]);
|
||||
state.peer_views.insert(peer_b, view![hash]);
|
||||
state.peer_views.insert(peer_a, view![hash]);
|
||||
|
||||
let msg = BitfieldGossipMessage {
|
||||
relay_parent: hash.clone(),
|
||||
signed_availability: signed_bitfield.clone(),
|
||||
};
|
||||
let msg =
|
||||
BitfieldGossipMessage { relay_parent: hash, signed_availability: signed_bitfield.clone() };
|
||||
|
||||
let pool = sp_core::testing::TaskExecutor::new();
|
||||
let (mut ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
|
||||
@@ -584,7 +558,7 @@ fn do_not_relay_message_twice() {
|
||||
|
||||
executor::block_on(async move {
|
||||
let mut gossip_peers = GridNeighbors::empty();
|
||||
gossip_peers.peers_x = HashSet::from_iter(vec![peer_a.clone(), peer_b.clone()].into_iter());
|
||||
gossip_peers.peers_x = HashSet::from_iter(vec![peer_a, peer_b].into_iter());
|
||||
|
||||
relay_message(
|
||||
&mut ctx,
|
||||
@@ -665,11 +639,8 @@ fn changing_view() {
|
||||
assert_ne!(peer_a, peer_b);
|
||||
|
||||
// validator 0 key pair
|
||||
let (mut state, signing_context, keystore, validator) = state_with_view(
|
||||
our_view![hash_a, hash_b],
|
||||
hash_a.clone(),
|
||||
ReputationAggregator::new(|_| true),
|
||||
);
|
||||
let (mut state, signing_context, keystore, validator) =
|
||||
state_with_view(our_view![hash_a, hash_b], hash_a, ReputationAggregator::new(|_| true));
|
||||
|
||||
// create a signed message by validator 0
|
||||
let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]);
|
||||
@@ -685,7 +656,7 @@ fn changing_view() {
|
||||
.expect("should be signed");
|
||||
|
||||
let msg = BitfieldGossipMessage {
|
||||
relay_parent: hash_a.clone(),
|
||||
relay_parent: hash_a,
|
||||
signed_availability: signed_bitfield.clone(),
|
||||
};
|
||||
|
||||
@@ -699,7 +670,7 @@ fn changing_view() {
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerConnected(
|
||||
peer_b.clone(),
|
||||
peer_b,
|
||||
ObservedRole::Full,
|
||||
ValidationVersion::V1.into(),
|
||||
None
|
||||
@@ -712,7 +683,7 @@ fn changing_view() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerViewChange(peer_b.clone(), view![hash_a, hash_b]),
|
||||
NetworkBridgeEvent::PeerViewChange(peer_b, view![hash_a, hash_b]),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -723,7 +694,7 @@ fn changing_view() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.clone().into_network_message(),),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b, msg.clone().into_network_message(),),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -754,7 +725,7 @@ fn changing_view() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerViewChange(peer_b.clone(), view![]),
|
||||
NetworkBridgeEvent::PeerViewChange(peer_b, view![]),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -767,7 +738,7 @@ fn changing_view() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.clone().into_network_message(),),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b, msg.clone().into_network_message(),),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -786,7 +757,7 @@ fn changing_view() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerDisconnected(peer_b.clone()),
|
||||
NetworkBridgeEvent::PeerDisconnected(peer_b),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -799,7 +770,7 @@ fn changing_view() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peer_a.clone(), msg.clone().into_network_message(),),
|
||||
NetworkBridgeEvent::PeerMessage(peer_a, msg.clone().into_network_message(),),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -846,13 +817,11 @@ fn do_not_send_message_back_to_origin() {
|
||||
.flatten()
|
||||
.expect("should be signed");
|
||||
|
||||
state.peer_views.insert(peer_b.clone(), view![hash]);
|
||||
state.peer_views.insert(peer_a.clone(), view![hash]);
|
||||
state.peer_views.insert(peer_b, view![hash]);
|
||||
state.peer_views.insert(peer_a, view![hash]);
|
||||
|
||||
let msg = BitfieldGossipMessage {
|
||||
relay_parent: hash.clone(),
|
||||
signed_availability: signed_bitfield.clone(),
|
||||
};
|
||||
let msg =
|
||||
BitfieldGossipMessage { relay_parent: hash, signed_availability: signed_bitfield.clone() };
|
||||
|
||||
let pool = sp_core::testing::TaskExecutor::new();
|
||||
let (mut ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
|
||||
@@ -864,7 +833,7 @@ fn do_not_send_message_back_to_origin() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.clone().into_network_message(),),
|
||||
NetworkBridgeEvent::PeerMessage(peer_b, msg.clone().into_network_message(),),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -930,13 +899,13 @@ fn topology_test() {
|
||||
let peers_x: Vec<_> = [0, 2, 3, 4, 5, 6]
|
||||
.iter()
|
||||
.cloned()
|
||||
.map(|i| topology_peer_info[i].peer_ids[0].clone())
|
||||
.map(|i| topology_peer_info[i].peer_ids[0])
|
||||
.collect();
|
||||
|
||||
let peers_y: Vec<_> = [8, 15, 22, 29, 36, 43]
|
||||
.iter()
|
||||
.cloned()
|
||||
.map(|i| topology_peer_info[i].peer_ids[0].clone())
|
||||
.map(|i| topology_peer_info[i].peer_ids[0])
|
||||
.collect();
|
||||
|
||||
{
|
||||
@@ -963,13 +932,11 @@ fn topology_test() {
|
||||
.expect("should be signed");
|
||||
|
||||
peers_x.iter().chain(peers_y.iter()).for_each(|peer| {
|
||||
state.peer_views.insert(peer.clone(), view![hash]);
|
||||
state.peer_views.insert(*peer, view![hash]);
|
||||
});
|
||||
|
||||
let msg = BitfieldGossipMessage {
|
||||
relay_parent: hash.clone(),
|
||||
signed_availability: signed_bitfield.clone(),
|
||||
};
|
||||
let msg =
|
||||
BitfieldGossipMessage { relay_parent: hash, signed_availability: signed_bitfield.clone() };
|
||||
|
||||
let pool = sp_core::testing::TaskExecutor::new();
|
||||
let (mut ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
|
||||
@@ -981,7 +948,7 @@ fn topology_test() {
|
||||
&mut ctx,
|
||||
&mut state,
|
||||
&Default::default(),
|
||||
NetworkBridgeEvent::PeerMessage(peers_x[0].clone(), msg.clone().into_network_message(),),
|
||||
NetworkBridgeEvent::PeerMessage(peers_x[0], msg.clone().into_network_message(),),
|
||||
&mut rng,
|
||||
));
|
||||
|
||||
@@ -1064,22 +1031,22 @@ fn need_message_works() {
|
||||
.insert(signed_by.clone());
|
||||
};
|
||||
|
||||
assert!(true == pretend_send(&mut state, peer_a, &validator_set[0]));
|
||||
assert!(true == pretend_send(&mut state, peer_b, &validator_set[1]));
|
||||
assert!(pretend_send(&mut state, peer_a, &validator_set[0]));
|
||||
assert!(pretend_send(&mut state, peer_b, &validator_set[1]));
|
||||
// sending the same thing must not be allowed
|
||||
assert!(false == pretend_send(&mut state, peer_a, &validator_set[0]));
|
||||
assert!(!pretend_send(&mut state, peer_a, &validator_set[0]));
|
||||
|
||||
// receive by Alice
|
||||
pretend_receive(&mut state, peer_a, &validator_set[0]);
|
||||
// must be marked as not needed by Alice, so attempt to send to Alice must be false
|
||||
assert!(false == pretend_send(&mut state, peer_a, &validator_set[0]));
|
||||
assert!(!pretend_send(&mut state, peer_a, &validator_set[0]));
|
||||
// but ok for Bob
|
||||
assert!(false == pretend_send(&mut state, peer_b, &validator_set[1]));
|
||||
assert!(!pretend_send(&mut state, peer_b, &validator_set[1]));
|
||||
|
||||
// receive by Bob
|
||||
pretend_receive(&mut state, peer_a, &validator_set[0]);
|
||||
// not ok for Alice
|
||||
assert!(false == pretend_send(&mut state, peer_a, &validator_set[0]));
|
||||
assert!(!pretend_send(&mut state, peer_a, &validator_set[0]));
|
||||
// also not ok for Bob
|
||||
assert!(false == pretend_send(&mut state, peer_b, &validator_set[1]));
|
||||
assert!(!pretend_send(&mut state, peer_b, &validator_set[1]));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user