Dont Convert Benchmark Error Too Early (#9743)

* dont convert benchmark error

* fix warning

* fix more warnings

* more fixes

* more fixes

* add missing feature deps

* Update frame/election-provider-multi-phase/src/benchmarking.rs

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* Update frame/election-provider-multi-phase/src/benchmarking.rs

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* use from

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
This commit is contained in:
Shawn Tabrizi
2021-09-10 08:06:24 -04:00
committed by GitHub
parent a36e881783
commit 250f9fc1ae
10 changed files with 34 additions and 13 deletions
+15
View File
@@ -41,6 +41,7 @@ mod pallet_test {
pub trait Config: frame_system::Config {
type LowerBound: Get<u32>;
type UpperBound: Get<u32>;
type MaybeItem: Get<Option<u32>>;
}
#[pallet::storage]
@@ -112,11 +113,13 @@ impl frame_system::Config for Test {
parameter_types! {
pub const LowerBound: u32 = 1;
pub const UpperBound: u32 = 100;
pub const MaybeItem: Option<u32> = None;
}
impl pallet_test::Config for Test {
type LowerBound = LowerBound;
type UpperBound = UpperBound;
type MaybeItem = MaybeItem;
}
fn new_test_ext() -> sp_io::TestExternalities {
@@ -218,6 +221,13 @@ mod benchmarks {
}
))?;
}
skip_benchmark {
let value = T::MaybeItem::get().ok_or(BenchmarkError::Skip)?;
}: {
// This should never be reached.
assert!(value > 100);
}
}
#[test]
@@ -334,6 +344,11 @@ mod benchmarks {
assert_err!(Pallet::<Test>::test_benchmark_bad_verify(), "You forgot to sort!");
assert_ok!(Pallet::<Test>::test_benchmark_no_components());
assert_ok!(Pallet::<Test>::test_benchmark_variable_components());
assert!(matches!(
Pallet::<Test>::test_benchmark_override_benchmark(),
Err(BenchmarkError::Override(_)),
));
assert_eq!(Pallet::<Test>::test_benchmark_skip_benchmark(), Err(BenchmarkError::Skip),);
});
}
}