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

approval-voting: populate session cache in advance (#3954)

Browse Source 
* try populating session cache in advance

* remove unused arg

* fmt

* fix compilation

* fix tests

* Revert "fix tests"

This reverts commit e8222b1108e09a39727a38e3b4e4c3061642a213.

* fix tests

* bump dispute window const by 1

* fix tests
This commit is contained in:
Andronik Ordian
2021-09-29 11:53:44 +02:00
committed by GitHub
parent 4549e1a1b0
commit cb89dfc039
5 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/subsystem-util/src/rolling_session_window.rs
+11 -16
View File
@@ -19,7 +19,7 @@
//! This is useful for consensus components which need to stay up-to-date about recent sessions but don't
//! care about the state of particular blocks.
use polkadot_primitives::v1::{Hash, Header, SessionIndex, SessionInfo};
use polkadot_primitives::v1::{Hash, SessionIndex, SessionInfo};
use futures::channel::oneshot;
use polkadot_node_subsystem::{
@@ -131,7 +131,7 @@ impl RollingSessionWindow {
}
/// When inspecting a new import notification, updates the session info cache to match
/// the session of the imported block.
/// the session of the imported block's child.
///
/// this only needs to be called on heads where we are directly notified about import, as sessions do
/// not change often and import notifications are expected to be typically increasing in session number.
@@ -141,7 +141,6 @@ impl RollingSessionWindow {
&mut self,
ctx: &mut (impl SubsystemContext + overseer::SubsystemContext),
block_hash: Hash,
block_header: &Header,
) -> Result<SessionWindowUpdate, SessionsUnavailable> {
if self.window_size == 0 {
return Ok(SessionWindowUpdate::Unchanged)
@@ -150,11 +149,9 @@ impl RollingSessionWindow {
let session_index = {
let (s_tx, s_rx) = oneshot::channel();
// The genesis is guaranteed to be at the beginning of the session and its parent state
// is non-existent. Therefore if we're at the genesis, we request using its state and
// not the parent.
// We're requesting session index of a child to populate the cache in advance.
ctx.send_message(RuntimeApiMessage::Request(
if block_header.number == 0 { block_hash } else { block_header.parent_hash },
block_hash,
RuntimeApiRequest::SessionIndexForChild(s_tx),
))
.await;
@@ -289,9 +286,10 @@ mod tests {
use assert_matches::assert_matches;
use polkadot_node_subsystem::messages::{AllMessages, AvailabilityRecoveryMessage};
use polkadot_node_subsystem_test_helpers::make_subsystem_context;
use polkadot_primitives::v1::Header;
use sp_core::testing::TaskExecutor;
const TEST_WINDOW_SIZE: SessionIndex = 6;
const TEST_WINDOW_SIZE: SessionIndex = 6 + 1;
fn dummy_session_info(index: SessionIndex) -> SessionInfo {
SessionInfo {
@@ -329,9 +327,8 @@ mod tests {
let hash = header.hash();
let test_fut = {
let header = header.clone();
Box::pin(async move {
window.cache_session_info_for_head(&mut ctx, hash, &header).await.unwrap();
window.cache_session_info_for_head(&mut ctx, hash).await.unwrap();
assert_eq!(window.earliest_session, Some(expected_start_session));
assert_eq!(
@@ -348,7 +345,7 @@ mod tests {
h,
RuntimeApiRequest::SessionIndexForChild(s_tx),
)) => {
assert_eq!(h, header.parent_hash);
assert_eq!(h, hash);
let _ = s_tx.send(Ok(session));
}
);
@@ -497,9 +494,8 @@ mod tests {
let hash = header.hash();
let test_fut = {
let header = header.clone();
Box::pin(async move {
let res = window.cache_session_info_for_head(&mut ctx, hash, &header).await;
let res = window.cache_session_info_for_head(&mut ctx, hash).await;
assert!(res.is_err());
})
@@ -512,7 +508,7 @@ mod tests {
h,
RuntimeApiRequest::SessionIndexForChild(s_tx),
)) => {
assert_eq!(h, header.parent_hash);
assert_eq!(h, hash);
let _ = s_tx.send(Ok(session));
}
);
@@ -559,9 +555,8 @@ mod tests {
let hash = header.hash();
let test_fut = {
let header = header.clone();
Box::pin(async move {
window.cache_session_info_for_head(&mut ctx, hash, &header).await.unwrap();
window.cache_session_info_for_head(&mut ctx, hash).await.unwrap();
assert_eq!(window.earliest_session, Some(session));
assert_eq!(window.session_info, vec![dummy_session_info(session)]);