pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-01 02:11:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

declone and close the door (#12035)

Browse Source 
* declone and close the door

* cargo fmt

* remove brackets
This commit is contained in:
Squirrel
2022-08-15 20:38:36 +01:00
committed by GitHub
parent 9c2a2495fe
commit a68a80fbae
72 changed files with 344 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/finality-grandpa/src/communication/gossip.rs
+15 -21
View File
@@ -1729,7 +1729,7 @@ mod tests {
assert!(res.unwrap().is_none());
// connect & disconnect.
peers.new_peer(id.clone(), ObservedRole::Authority);
peers.new_peer(id, ObservedRole::Authority);
peers.peer_disconnected(&id);
let res = peers.update_peer_state(&id, update.clone());
@@ -1753,7 +1753,7 @@ mod tests {
let mut peers = Peers::default();
let id = PeerId::random();
peers.new_peer(id.clone(), ObservedRole::Authority);
peers.new_peer(id, ObservedRole::Authority);
let mut check_update = move |update: NeighborPacket<_>| {
let view = peers.update_peer_state(&id, update.clone()).unwrap().unwrap();
@@ -1773,7 +1773,7 @@ mod tests {
let mut peers = Peers::default();
let id = PeerId::random();
peers.new_peer(id.clone(), ObservedRole::Authority);
peers.new_peer(id, ObservedRole::Authority);
peers
.update_peer_state(
@@ -1964,7 +1964,7 @@ mod tests {
// add the peer making the request to the validator,
// otherwise it is discarded
let mut inner = val.inner.write();
inner.peers.new_peer(peer.clone(), ObservedRole::Authority);
inner.peers.new_peer(peer, ObservedRole::Authority);
let res = inner.handle_catch_up_request(
&peer,
@@ -2005,7 +2005,7 @@ mod tests {
// add the peer making the request to the validator,
// otherwise it is discarded
let peer = PeerId::random();
val.inner.write().peers.new_peer(peer.clone(), ObservedRole::Authority);
val.inner.write().peers.new_peer(peer, ObservedRole::Authority);
let send_request = |set_id, round| {
let mut inner = val.inner.write();
@@ -2060,7 +2060,7 @@ mod tests {
// add the peer making the request to the validator,
// otherwise it is discarded.
let peer = PeerId::random();
val.inner.write().peers.new_peer(peer.clone(), ObservedRole::Authority);
val.inner.write().peers.new_peer(peer, ObservedRole::Authority);
let import_neighbor_message = |set_id, round| {
let (_, _, catch_up_request, _) = val.inner.write().import_neighbor_message(
@@ -2130,7 +2130,7 @@ mod tests {
// add the peer making the request to the validator,
// otherwise it is discarded.
let peer = PeerId::random();
val.inner.write().peers.new_peer(peer.clone(), ObservedRole::Authority);
val.inner.write().peers.new_peer(peer, ObservedRole::Authority);
// importing a neighbor message from a peer in the same set in a later
// round should lead to a catch up request but since they're disabled
@@ -2158,11 +2158,8 @@ mod tests {
let peer_authority = PeerId::random();
let peer_full = PeerId::random();
val.inner
.write()
.peers
.new_peer(peer_authority.clone(), ObservedRole::Authority);
val.inner.write().peers.new_peer(peer_full.clone(), ObservedRole::Full);
val.inner.write().peers.new_peer(peer_authority, ObservedRole::Authority);
val.inner.write().peers.new_peer(peer_full, ObservedRole::Full);
let import_neighbor_message = |peer| {
let (_, _, catch_up_request, _) = val.inner.write().import_neighbor_message(
@@ -2211,7 +2208,7 @@ mod tests {
// add the peer making the requests to the validator, otherwise it is
// discarded.
let peer_full = PeerId::random();
val.inner.write().peers.new_peer(peer_full.clone(), ObservedRole::Full);
val.inner.write().peers.new_peer(peer_full, ObservedRole::Full);
let (_, _, catch_up_request, _) = val.inner.write().import_neighbor_message(
&peer_full,
@@ -2271,12 +2268,9 @@ mod tests {
full_nodes.resize_with(30, || PeerId::random());
for i in 0..30 {
val.inner
.write()
.peers
.new_peer(authorities[i].clone(), ObservedRole::Authority);
val.inner.write().peers.new_peer(authorities[i], ObservedRole::Authority);
val.inner.write().peers.new_peer(full_nodes[i].clone(), ObservedRole::Full);
val.inner.write().peers.new_peer(full_nodes[i], ObservedRole::Full);
}
let test = |rounds_elapsed, peers| {
@@ -2355,7 +2349,7 @@ mod tests {
// add a new light client as peer
let light_peer = PeerId::random();
val.inner.write().peers.new_peer(light_peer.clone(), ObservedRole::Light);
val.inner.write().peers.new_peer(light_peer, ObservedRole::Light);
assert!(!val.message_allowed()(
&light_peer,
@@ -2427,7 +2421,7 @@ mod tests {
// add a new peer at set id 1
let peer1 = PeerId::random();
val.inner.write().peers.new_peer(peer1.clone(), ObservedRole::Authority);
val.inner.write().peers.new_peer(peer1, ObservedRole::Authority);
val.inner
.write()
@@ -2440,7 +2434,7 @@ mod tests {
// peer2 will default to set id 0
let peer2 = PeerId::random();
val.inner.write().peers.new_peer(peer2.clone(), ObservedRole::Authority);
val.inner.write().peers.new_peer(peer2, ObservedRole::Authority);
// create a commit for round 1 of set id 1
// targeting a block at height 2
substrate/client/finality-grandpa/src/communication/tests.rs
+11 -13
View File
@@ -177,7 +177,7 @@ impl sc_network_gossip::ValidatorContext<Block> for TestNetwork {
fn send_message(&mut self, who: &PeerId, data: Vec<u8>) {
<Self as NetworkNotification>::write_notification(
self,
who.clone(),
*who,
grandpa_protocol_name::NAME.into(),
data,
);
@@ -280,7 +280,7 @@ pub(crate) fn make_test_network() -> (impl Future<Output = Tester>, TestNetwork)
}
fn make_ids(keys: &[Ed25519Keyring]) -> AuthorityList {
keys.iter().map(|key| key.clone().public().into()).map(|id| (id, 1)).collect()
keys.iter().map(|&key| key.public().into()).map(|id| (id, 1)).collect()
}
struct NoopContext;
@@ -305,8 +305,7 @@ fn good_commit_leads_to_relay() {
let target_hash: Hash = [1; 32].into();
let target_number = 500;
let precommit =
finality_grandpa::Precommit { target_hash: target_hash.clone(), target_number };
let precommit = finality_grandpa::Precommit { target_hash, target_number };
let payload = sp_finality_grandpa::localized_payload(
round,
set_id,
@@ -362,19 +361,19 @@ fn good_commit_leads_to_relay() {
// asking for global communication will cause the test network
// to send us an event asking us for a stream. use it to
// send a message.
let sender_id = id.clone();
let sender_id = id;
let send_message = tester.filter_network_events(move |event| match event {
Event::EventStream(sender) => {
// Add the sending peer and send the commit
let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
remote: sender_id.clone(),
remote: sender_id,
protocol: grandpa_protocol_name::NAME.into(),
negotiated_fallback: None,
role: ObservedRole::Full,
});
let _ = sender.unbounded_send(NetworkEvent::NotificationsReceived {
remote: sender_id.clone(),
remote: sender_id,
messages: vec![(
grandpa_protocol_name::NAME.into(),
commit_to_send.clone().into(),
@@ -384,7 +383,7 @@ fn good_commit_leads_to_relay() {
// Add a random peer which will be the recipient of this message
let receiver_id = PeerId::random();
let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
remote: receiver_id.clone(),
remote: receiver_id,
protocol: grandpa_protocol_name::NAME.into(),
negotiated_fallback: None,
role: ObservedRole::Full,
@@ -456,8 +455,7 @@ fn bad_commit_leads_to_report() {
let target_hash: Hash = [1; 32].into();
let target_number = 500;
let precommit =
finality_grandpa::Precommit { target_hash: target_hash.clone(), target_number };
let precommit = finality_grandpa::Precommit { target_hash, target_number };
let payload = sp_finality_grandpa::localized_payload(
round,
set_id,
@@ -513,17 +511,17 @@ fn bad_commit_leads_to_report() {
// asking for global communication will cause the test network
// to send us an event asking us for a stream. use it to
// send a message.
let sender_id = id.clone();
let sender_id = id;
let send_message = tester.filter_network_events(move |event| match event {
Event::EventStream(sender) => {
let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
remote: sender_id.clone(),
remote: sender_id,
protocol: grandpa_protocol_name::NAME.into(),
negotiated_fallback: None,
role: ObservedRole::Full,
});
let _ = sender.unbounded_send(NetworkEvent::NotificationsReceived {
remote: sender_id.clone(),
remote: sender_id,
messages: vec![(
grandpa_protocol_name::NAME.into(),
commit_to_send.clone().into(),