From 029b82b7db0a0e5e4fd605e940aa748c59fdda77 Mon Sep 17 00:00:00 2001 From: Dmitry Sinyavin Date: Tue, 3 Jan 2023 13:50:27 +0100 Subject: [PATCH] Address nits from discussions --- node/core/dispute-coordinator/src/lib.rs | 9 +++------ node/core/pvf-checker/src/lib.rs | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/node/core/dispute-coordinator/src/lib.rs b/node/core/dispute-coordinator/src/lib.rs index 021703bc33bf..e3af334acb8a 100644 --- a/node/core/dispute-coordinator/src/lib.rs +++ b/node/core/dispute-coordinator/src/lib.rs @@ -302,8 +302,7 @@ impl DisputeCoordinatorSubsystem { }, }; - let session_info; - let validators = match rolling_session_window.session_info(session) { + let session_info = match rolling_session_window.session_info(session) { None => { gum::warn!( target: LOG_TARGET, @@ -312,11 +311,9 @@ impl DisputeCoordinatorSubsystem { ); continue }, - Some(info) => { - session_info = info; - info.validators.clone() - }, + Some(info) => info, }; + let validators = session_info.validators.clone(); let voted_indices = votes.voted_indices(); diff --git a/node/core/pvf-checker/src/lib.rs b/node/core/pvf-checker/src/lib.rs index b046f3a8084f..795429eea08d 100644 --- a/node/core/pvf-checker/src/lib.rs +++ b/node/core/pvf-checker/src/lib.rs @@ -304,7 +304,7 @@ async fn handle_leaves_update( .on_leaves_update(Some((activated.hash, pending_pvfs)), &update.deactivated); metrics.on_pvf_observed(outcome.newcomers.len()); metrics.on_pvf_left(outcome.left_num); - if outcome.newcomers.len() > 0 { + if !outcome.newcomers.is_empty() { let session_index = match (&new_session_index, &state.latest_session) { (Some((nsi, _)), _) => *nsi, (None, Some(lsi)) => *lsi, @@ -341,7 +341,7 @@ async fn handle_leaves_update( initiate_precheck( state, sender, - recent_block_hash, + activated.hash, newcomer, executor_params.clone(), metrics,