From db4cff49ca9e46aec9123a36534ccef0c3ece52f Mon Sep 17 00:00:00 2001
From: Andronik <write@reusable.software>
Date: Sun, 30 Jan 2022 18:54:15 +0100
Subject: [PATCH] parainherent: fix session in OnChainVotes

---
 .../parachains/src/paras_inherent/mod.rs      | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/polkadot/runtime/parachains/src/paras_inherent/mod.rs b/polkadot/runtime/parachains/src/paras_inherent/mod.rs
index a029ded51d..92abf8263f 100644
--- a/polkadot/runtime/parachains/src/paras_inherent/mod.rs
+++ b/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 {
-				value.disputes = disputes;
-			} else {
-				*value = Some(ScrapedOnChainVotes::<T::Hash> {
-					backing_validators_per_candidate: Vec::new(),
-					disputes,
-					session,
-				});
-			}
+			let backing_validators_per_candidate = match value.take() {
+				Some(v) => v.backing_validators_per_candidate,
+				None => Vec::new(),
+			};
+			*value = Some(ScrapedOnChainVotes::<T::Hash> {
+				backing_validators_per_candidate,
+				disputes,
+				session,
+			});
 		})
 	}
 
@@ -177,16 +177,15 @@ pub mod pallet {
 		)>,
 	) {
 		crate::paras_inherent::OnChainVotes::<T>::mutate(move |value| {
-			if let Some(ref mut value) = value {
-				value.backing_validators_per_candidate.clear();
-				value.backing_validators_per_candidate.extend(backing_validators_per_candidate);
-			} else {
-				*value = Some(ScrapedOnChainVotes::<T::Hash> {
-					backing_validators_per_candidate,
-					disputes: MultiDisputeStatementSet::default(),
-					session,
-				});
-			}
+			let disputes = match value.take() {
+				Some(v) => v.disputes,
+				None => MultiDisputeStatementSet::default(),
+			};
+			*value = Some(ScrapedOnChainVotes::<T::Hash> {
+				backing_validators_per_candidate,
+				disputes,
+				session,
+			});
 		})
 	}