From fd6b4411d5c7aebda4bde918dd4f4ee9b8154862 Mon Sep 17 00:00:00 2001
From: ordian <noreply@reusable.software>
Date: Fri, 1 Sep 2023 18:54:06 +0200
Subject: [PATCH] approval-voting: launch_approval better interface

---
 polkadot/node/core/approval-voting/src/lib.rs | 66 ++++++++++---------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/polkadot/node/core/approval-voting/src/lib.rs b/polkadot/node/core/approval-voting/src/lib.rs
index c59d49341ca88..0087f8e143504 100644
--- a/polkadot/node/core/approval-voting/src/lib.rs
+++ b/polkadot/node/core/approval-voting/src/lib.rs
@@ -45,7 +45,7 @@ use polkadot_node_subsystem_util::{
 	self,
 	database::Database,
 	metrics::{self, prometheus},
-	runtime::{Config as RuntimeInfoConfig, RuntimeInfo},
+	runtime::{Config as RuntimeInfoConfig, ExtendedSessionInfo, RuntimeInfo},
 	TimeoutExt,
 };
 use polkadot_primitives::{
@@ -643,12 +643,12 @@ impl CurrentlyCheckingSet {
 	}
 }
 
-async fn get_session_info<'a, Sender>(
+async fn get_extended_session_info<'a, Sender>(
 	runtime_info: &'a mut RuntimeInfo,
 	sender: &mut Sender,
 	relay_parent: Hash,
 	session_index: SessionIndex,
-) -> Option<&'a SessionInfo>
+) -> Option<&'a ExtendedSessionInfo>
 where
 	Sender: SubsystemSender<RuntimeApiMessage>,
 {
@@ -656,19 +656,33 @@ where
 		.get_session_info_by_index(sender, relay_parent, session_index)
 		.await
 	{
-		Ok(extended_info) => Some(&extended_info.session_info),
+		Ok(extended_info) => Some(&extended_info),
 		Err(_) => {
 			gum::debug!(
 				target: LOG_TARGET,
 				session = session_index,
 				?relay_parent,
-				"Can't obtain SessionInfo"
+				"Can't obtain SessionInfo or ExecutorParams"
 			);
 			None
 		},
 	}
 }
 
+async fn get_session_info<'a, Sender>(
+	runtime_info: &'a mut RuntimeInfo,
+	sender: &mut Sender,
+	relay_parent: Hash,
+	session_index: SessionIndex,
+) -> Option<&'a SessionInfo>
+where
+	Sender: SubsystemSender<RuntimeApiMessage>,
+{
+	get_extended_session_info(runtime_info, sender, relay_parent, session_index)
+		.await
+		.map(|extended_info| &extended_info.session_info)
+}
+
 struct State {
 	keystore: Arc<LocalKeystore>,
 	slot_duration_millis: u64,
@@ -746,6 +760,7 @@ enum Action {
 		relay_block_hash: Hash,
 		candidate_index: CandidateIndex,
 		session: SessionIndex,
+		executor_params: ExecutorParams,
 		candidate: CandidateReceipt,
 		backing_group: GroupIndex,
 	},
@@ -968,6 +983,7 @@ async fn handle_actions<Context>(
 				relay_block_hash,
 				candidate_index,
 				session,
+				executor_params,
 				candidate,
 				backing_group,
 			} => {
@@ -1008,14 +1024,7 @@ async fn handle_actions<Context>(
 					},
 					None => {
 						let ctx = &mut *ctx;
-						let executor_params = match session_info_provider
-							.get_session_info_by_index(ctx.sender(), block_hash, session)
-							.await
-						{
-							Err(_) => None,
-							Ok(extended_session_info) =>
-								Some(extended_session_info.executor_params.clone()),
-						};
+
 						currently_checking_set
 							.insert_relay_block_hash(
 								candidate_hash,
@@ -2337,17 +2346,18 @@ async fn process_wakeup<Context>(
 		_ => return Ok(Vec::new()),
 	};
 
-	let session_info = match get_session_info(
-		session_info_provider,
-		ctx.sender(),
-		block_entry.parent_hash(),
-		block_entry.session(),
-	)
-	.await
-	{
-		Some(i) => i,
-		None => return Ok(Vec::new()),
-	};
+	let ExtendedSessionInfo { ref session_info, ref executor_params, .. } =
+		match get_extended_session_info(
+			session_info_provider,
+			ctx.sender(),
+			block_entry.parent_hash(),
+			block_entry.session(),
+		)
+		.await
+		{
+			Some(i) => i,
+			None => return Ok(Vec::new()),
+		};
 
 	let block_tick = slot_number_to_tick(state.slot_duration_millis, block_entry.slot());
 	let no_show_duration = slot_number_to_tick(
@@ -2434,6 +2444,7 @@ async fn process_wakeup<Context>(
 				relay_block_hash: relay_block,
 				candidate_index: i as _,
 				session: block_entry.session(),
+				executor_params: executor_params.clone(),
 				candidate: candidate_receipt,
 				backing_group,
 			});
@@ -2475,7 +2486,7 @@ async fn launch_approval<Context>(
 	validator_index: ValidatorIndex,
 	block_hash: Hash,
 	backing_group: GroupIndex,
-	executor_params: Option<ExecutorParams>,
+	executor_params: ExecutorParams,
 	span: &jaeger::Span,
 ) -> SubsystemResult<RemoteHandle<ApprovalState>> {
 	let (a_tx, a_rx) = oneshot::channel();
@@ -2546,11 +2557,6 @@ async fn launch_approval<Context>(
 		// Force the move of the timer into the background task.
 		let _timer = timer;
 
-		let executor_params = match executor_params {
-			Some(ep) => ep,
-			None => return ApprovalState::failed(validator_index, candidate_hash),
-		};
-
 		let available_data = match a_rx.await {
 			Err(_) => return ApprovalState::failed(validator_index, candidate_hash),
 			Ok(Ok(a)) => a,