parainherent: fix session in OnChainVotes

polkadot/runtime/parachains/src/paras_inherent/mod.rs

@@ -156,15 +156,15 @@ pub mod pallet {
 		crate::paras_inherent::OnChainVotes::<T>::mutate(move |value| {
 			let disputes =
 				checked_disputes.into_iter().map(DisputeStatementSet::from).collect::<Vec<_>>();
-			if let Some(ref mut value) = value {
+			let backing_validators_per_candidate = match value.take() {
-				value.disputes = disputes;
+				Some(v) => v.backing_validators_per_candidate,
-			} else {
+				None => Vec::new(),
-				*value = Some(ScrapedOnChainVotes::<T::Hash> {
+			};
-					backing_validators_per_candidate: Vec::new(),
+			*value = Some(ScrapedOnChainVotes::<T::Hash> {
-					disputes,
+				backing_validators_per_candidate,
-					session,
+				disputes,
-				});
+				session,
-			}
+			});
 		})
 	}
 
@@ -177,16 +177,15 @@ pub mod pallet {
 		)>,
 	) {
 		crate::paras_inherent::OnChainVotes::<T>::mutate(move |value| {
-			if let Some(ref mut value) = value {
+			let disputes = match value.take() {
-				value.backing_validators_per_candidate.clear();
+				Some(v) => v.disputes,
-				value.backing_validators_per_candidate.extend(backing_validators_per_candidate);
+				None => MultiDisputeStatementSet::default(),
-			} else {
+			};
-				*value = Some(ScrapedOnChainVotes::<T::Hash> {
+			*value = Some(ScrapedOnChainVotes::<T::Hash> {
-					backing_validators_per_candidate,
+				backing_validators_per_candidate,
-					disputes: MultiDisputeStatementSet::default(),
+				disputes,
-					session,
+				session,
-				});
+			});
-			}
 		})
 	}