Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Replace RollingSessionWindow in approval-voting with RuntimeInfo #7123

Merged
merged 26 commits into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5eb24c6
Replace `RollingSessionWindow` with `RuntimeInfo` - initial commit
tdimitrov Apr 13, 2023
b0da049
Fix tests in import
tdimitrov Apr 20, 2023
93e6863
Fix the rest of the tests
tdimitrov Apr 20, 2023
a7b74cc
Remove dead code
tdimitrov Apr 20, 2023
0f84b42
Fix todos
tdimitrov Apr 21, 2023
0e486d4
Simplify session caching
tdimitrov Apr 21, 2023
f6a9d98
Comments for `SessionInfoProvider`
tdimitrov Apr 21, 2023
2918b42
Separate `SessionInfoProvider` from `State`
tdimitrov Apr 21, 2023
837f952
`cache_session_info_for_head` becomes freestanding function
tdimitrov Apr 21, 2023
6f609f3
Remove unneeded `mut` usage
tdimitrov Apr 21, 2023
82a0ebc
fn session_info -> fn get_session_info() to avoid name clashes. The f…
tdimitrov Apr 24, 2023
dca7287
Fix SessionInfo retrieval
tdimitrov Apr 24, 2023
360b96d
Code cleanup
tdimitrov Apr 24, 2023
caa2529
Don't wrap `SessionInfoProvider` in an `Option`
tdimitrov Apr 25, 2023
7665ecd
Remove `earliest_session()`
tdimitrov Apr 27, 2023
3f2b85c
Remove pre-caching -> wip
tdimitrov Apr 28, 2023
19e9588
Fix some tests and code cleanup
tdimitrov May 2, 2023
70d136f
Fix all tests
tdimitrov May 2, 2023
6e348c9
Fixes in tests
tdimitrov May 2, 2023
4fa4403
Fix comments, variable names and small style changes
tdimitrov May 2, 2023
dc0542a
Fix a warning
tdimitrov May 2, 2023
233478e
impl From<SessionWindowSize> for NonZeroUsize
tdimitrov May 5, 2023
d27220a
Fix logging for `get_session_info` - remove redundant logs and decrea…
tdimitrov May 6, 2023
407eb27
Merge branch 'master' into tsv-rolling-session-approval-voting
tdimitrov May 6, 2023
2ed7dfd
Code review feedback
tdimitrov May 9, 2023
dcac680
Merge branch 'master' into tsv-rolling-session-approval-voting
tdimitrov May 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions node/core/approval-voting/src/import.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,15 +212,7 @@ async fn imported_block_info<Context>(
let session_info =
match get_session_info(env.runtime_info, ctx.sender(), block_hash, session_index).await {
Some(session_info) => session_info,
None => {
tdimitrov marked this conversation as resolved.
Show resolved Hide resolved
gum::error!(
target: LOG_TARGET,
relay_parent = ?block_hash,
session = session_index,
"Session info unavailable"
);
return Err(ImportedBlockInfoError::SessionInfoUnavailable)
},
None => return Err(ImportedBlockInfoError::SessionInfoUnavailable),
};

let (assignments, slot, relay_vrf_story) = {
Expand Down Expand Up @@ -451,15 +443,7 @@ pub(crate) async fn handle_new_head<Context, B: Backend>(
.await
{
Some(session_info) => session_info,
None => {
gum::error!(
target: LOG_TARGET,
session = session_index,
?head,
"Can't get session info for the new head"
);
return Ok(Vec::new())
eskimor marked this conversation as resolved.
Show resolved Hide resolved
},
None => return Ok(Vec::new()),
};

let (block_tick, no_show_duration) = {
Expand Down
29 changes: 3 additions & 26 deletions node/core/approval-voting/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ where
{
Ok(extended_info) => Some(&extended_info.session_info),
Err(_) => {
gum::error!(
gum::debug!(
target: LOG_TARGET,
session = session_index,
?relay_parent,
Expand Down Expand Up @@ -695,14 +695,7 @@ impl State {
.await
{
Some(s) => s,
None => {
gum::warn!(
target: LOG_TARGET,
"Unknown session info for {}",
block_entry.session()
);
return None
},
None => return None,
};
let block_hash = block_entry.block_hash();

Expand Down Expand Up @@ -2318,16 +2311,7 @@ async fn process_wakeup<Context>(
.await
{
Some(i) => i,
None => {
gum::warn!(
target: LOG_TARGET,
"Missing session info for live block {} in session {}",
relay_block,
block_entry.session(),
);

return Ok(Vec::new())
},
None => return Ok(Vec::new()),
};

let block_tick = slot_number_to_tick(state.slot_duration_millis, block_entry.slot());
Expand Down Expand Up @@ -2701,13 +2685,6 @@ async fn issue_approval<Context>(
{
Some(s) => s,
None => {
gum::warn!(
target: LOG_TARGET,
"Missing session info for live block {} in session {}",
block_hash,
block_entry.session(),
);

metrics.on_approval_error();
return Ok(Vec::new())
},
Expand Down