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

refactor View to include finalized_number (#2128)

Browse Source 
* refactor View to include finalized_number

* guide: update the NetworkBridge on BlockFinalized

* av-store: fix the tests

* actually fix tests

* grumbles

* ignore macro doctest

* use Hash::repeat_bytes more consistently

* broadcast empty leaves updates as well

* fix issuing view updates on empty leaves updates
This commit is contained in:
Andronik Ordian
2020-12-17 18:50:58 +01:00
committed by GitHub
parent 1aa2554000
commit 3f5156e866
24 changed files with 249 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/network/pov-distribution/src/lib.rs
+4 -4
View File
@@ -197,7 +197,7 @@ async fn handle_signal(
Ok(false)
}
OverseerSignal::BlockFinalized(_) => Ok(false),
OverseerSignal::BlockFinalized(..) => Ok(false),
}
}
@@ -499,7 +499,7 @@ async fn handle_awaiting(
relay_parent: Hash,
pov_hashes: Vec<Hash>,
) {
if !state.our_view.0.contains(&relay_parent) {
if !state.our_view.contains(&relay_parent) {
report_peer(ctx, peer, COST_AWAITED_NOT_IN_VIEW).await;
return;
}
@@ -635,10 +635,10 @@ async fn handle_network_update(
NetworkBridgeEvent::PeerViewChange(peer_id, view) => {
if let Some(peer_state) = state.peer_state.get_mut(&peer_id) {
// prune anything not in the new view.
peer_state.awaited.retain(|relay_parent, _| view.0.contains(&relay_parent));
peer_state.awaited.retain(|relay_parent, _| view.contains(&relay_parent));
// introduce things from the new view.
for relay_parent in view.0.iter() {
for relay_parent in view.heads.iter() {
if let Entry::Vacant(entry) = peer_state.awaited.entry(*relay_parent) {
entry.insert(HashSet::new());
polkadot/node/network/pov-distribution/src/tests.rs
+16 -15
View File
@@ -16,6 +16,7 @@ use polkadot_primitives::v1::{
use polkadot_subsystem::messages::{RuntimeApiMessage, RuntimeApiRequest};
use polkadot_node_subsystem_test_helpers as test_helpers;
use polkadot_node_subsystem_util::TimeoutExt;
use polkadot_node_network_protocol::view;
fn make_pov(data: Vec<u8>) -> PoV {
PoV { block_data: BlockData(data) }
@@ -358,7 +359,7 @@ fn ask_validators_for_povs() {
PoVDistributionMessage::NetworkBridgeUpdateV1(
NetworkBridgeEvent::PeerViewChange(
test_state.validator_peer_id[i].clone(),
View(vec![current]),
view![current],
)
)
).await;
@@ -405,7 +406,7 @@ fn ask_validators_for_povs() {
PoVDistributionMessage::NetworkBridgeUpdateV1(
NetworkBridgeEvent::PeerViewChange(
test_state.validator_peer_id[2].clone(),
View(vec![next_leaf]),
view![next_leaf],
)
)
).await;
@@ -582,7 +583,7 @@ fn distributes_to_those_awaiting_and_completes_local() {
s
},
our_view: View(vec![hash_a, hash_b]),
our_view: view![hash_a, hash_b],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -665,7 +666,7 @@ fn we_inform_peers_with_same_view_we_are_awaiting() {
s
},
our_view: View(vec![hash_a]),
our_view: view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -839,7 +840,7 @@ fn peer_view_change_leads_to_us_informing() {
s
},
our_view: View(vec![hash_a]),
our_view: view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -851,7 +852,7 @@ fn peer_view_change_leads_to_us_informing() {
handle_network_update(
&mut state,
&mut ctx,
NetworkBridgeEvent::PeerViewChange(peer_a.clone(), View(vec![hash_a, hash_b])),
NetworkBridgeEvent::PeerViewChange(peer_a.clone(), view![hash_a, hash_b]),
).await;
assert_matches!(
@@ -912,7 +913,7 @@ fn peer_complete_fetch_and_is_rewarded() {
s
},
our_view: View(vec![hash_a]),
our_view: view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1002,7 +1003,7 @@ fn peer_punished_for_sending_bad_pov() {
s
},
our_view: View(vec![hash_a]),
our_view: view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1067,7 +1068,7 @@ fn peer_punished_for_sending_unexpected_pov() {
s
},
our_view: View(vec![hash_a]),
our_view: view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1130,7 +1131,7 @@ fn peer_punished_for_sending_pov_out_of_our_view() {
s
},
our_view: View(vec![hash_a]),
our_view: view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1190,7 +1191,7 @@ fn peer_reported_for_awaiting_too_much() {
s
},
our_view: View(vec![hash_a]),
our_view: view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1277,7 +1278,7 @@ fn peer_reported_for_awaiting_outside_their_view() {
s
},
our_view: View(vec![hash_a, hash_b]),
our_view: view![hash_a, hash_b],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1341,7 +1342,7 @@ fn peer_reported_for_awaiting_outside_our_view() {
s
},
our_view: View(vec![hash_a]),
our_view: view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1420,7 +1421,7 @@ fn peer_complete_fetch_leads_to_us_completing_others() {
s
},
our_view: View(vec![hash_a]),
our_view: view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1504,7 +1505,7 @@ fn peer_completing_request_no_longer_awaiting() {
s
},
our_view: View(vec![hash_a]),
our_view: view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};