pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-24 19:25:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move runtime to with_transaction in order to Rollback state changes (#4067)

Browse Source 
* Move runtime to with_transaction in order to Rollback state changes

* add assert_storage_noop to tests
This commit is contained in:
Lldenaurois
2021-10-12 22:09:48 +02:00
committed by GitHub
parent 1af17eed39
commit d59ef49195
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/parachains/src/disputes.rs
+28 -25
View File
@@ -22,7 +22,7 @@ use crate::{
session_info, session_info,
}; };
use bitvec::{bitvec, order::Lsb0 as BitOrderLsb0}; use bitvec::{bitvec, order::Lsb0 as BitOrderLsb0};
use frame_support::{ensure, traits::Get, weights::Weight}; use frame_support::{ensure, storage::TransactionOutcome, traits::Get, weights::Weight};
use frame_system::pallet_prelude::*; use frame_system::pallet_prelude::*;
use parity_scale_codec::{Decode, Encode}; use parity_scale_codec::{Decode, Encode};
use primitives::v1::{ use primitives::v1::{
@@ -739,26 +739,29 @@ impl<T: Config> Pallet<T> {
} }
fn filter_multi_dispute_data(statement_sets: &mut MultiDisputeStatementSet) { fn filter_multi_dispute_data(statement_sets: &mut MultiDisputeStatementSet) {
let config = <configuration::Pallet<T>>::config(); frame_support::storage::with_transaction(|| {
let config = <configuration::Pallet<T>>::config();
let old_statement_sets = sp_std::mem::take(statement_sets); let old_statement_sets = sp_std::mem::take(statement_sets);
// Deduplicate. // Deduplicate.
let dedup_iter = { let dedup_iter = {
let mut targets = BTreeSet::new(); let mut targets = BTreeSet::new();
old_statement_sets.into_iter().filter(move |set| { old_statement_sets.into_iter().filter(move |set| {
let target = (set.candidate_hash, set.session); let target = (set.candidate_hash, set.session);
targets.insert(target) targets.insert(target)
}) })
}; };
*statement_sets = dedup_iter *statement_sets = dedup_iter
.filter_map(|set| { .filter_map(|set| {
let filter = Self::filter_dispute_data(&config, &set); let filter = Self::filter_dispute_data(&config, &set);
filter.filter_statement_set(set) filter.filter_statement_set(set)
}) })
.collect(); .collect();
TransactionOutcome::Rollback(())
})
} }
// Given a statement set, this produces a filter to be applied to the statement set. // Given a statement set, this produces a filter to be applied to the statement set.
@@ -1210,7 +1213,7 @@ mod tests {
REWARD_VALIDATORS, REWARD_VALIDATORS,
}; };
use frame_support::{ use frame_support::{
assert_err, assert_noop, assert_ok, assert_err, assert_noop, assert_ok, assert_storage_noop,
traits::{OnFinalize, OnInitialize}, traits::{OnFinalize, OnInitialize},
}; };
use frame_system::InitKind; use frame_system::InitKind;
@@ -2836,7 +2839,7 @@ mod tests {
], ],
}]; }];
Pallet::<Test>::filter_multi_dispute_data(&mut statements); assert_storage_noop!(Pallet::<Test>::filter_multi_dispute_data(&mut statements));
assert_eq!( assert_eq!(
statements, statements,
@@ -2918,7 +2921,7 @@ mod tests {
], ],
}]; }];
Pallet::<Test>::filter_multi_dispute_data(&mut statements); assert_storage_noop!(Pallet::<Test>::filter_multi_dispute_data(&mut statements));
assert!(statements.is_empty()); assert!(statements.is_empty());
}) })
@@ -3059,7 +3062,7 @@ mod tests {
]; ];
let old_statements = statements.clone(); let old_statements = statements.clone();
Pallet::<Test>::filter_multi_dispute_data(&mut statements); assert_storage_noop!(Pallet::<Test>::filter_multi_dispute_data(&mut statements));
assert_eq!(statements, old_statements); assert_eq!(statements, old_statements);
}) })
@@ -3096,7 +3099,7 @@ mod tests {
)], )],
}]; }];
Pallet::<Test>::filter_multi_dispute_data(&mut statements); assert_storage_noop!(Pallet::<Test>::filter_multi_dispute_data(&mut statements));
assert!(statements.is_empty()); assert!(statements.is_empty());
}) })
@@ -3188,7 +3191,7 @@ mod tests {
}, },
]; ];
Pallet::<Test>::filter_multi_dispute_data(&mut statements); assert_storage_noop!(Pallet::<Test>::filter_multi_dispute_data(&mut statements));
assert_eq!( assert_eq!(
statements, statements,
@@ -3278,7 +3281,7 @@ mod tests {
}, },
]; ];
Pallet::<Test>::filter_multi_dispute_data(&mut statements); assert_storage_noop!(Pallet::<Test>::filter_multi_dispute_data(&mut statements));
assert_eq!( assert_eq!(
statements, statements,
@@ -3333,7 +3336,7 @@ mod tests {
)], )],
}]; }];
Pallet::<Test>::filter_multi_dispute_data(&mut statements); assert_storage_noop!(Pallet::<Test>::filter_multi_dispute_data(&mut statements));
assert!(statements.is_empty()); assert!(statements.is_empty());
}) })