Run benchmark tests in separate environments (#871)

* Run benchmark tests in separate environments

* Fix formatting

* Fix superfluous import

Author: maltekliemann

zrml/authorized/src/benchmarks.rs

@@ -24,7 +24,7 @@
 #[cfg(test)]
 use crate::Pallet as Authorized;
 use crate::{market_mock, Call, Config, Pallet};
-use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
+use frame_benchmarking::benchmarks;
 use frame_support::{dispatch::UnfilteredDispatchable, traits::EnsureOrigin};
 use zeitgeist_primitives::types::OutcomeReport;
 use zrml_market_commons::MarketCommonsPalletApi;
@@ -36,10 +36,10 @@ benchmarks! {
         T::MarketCommons::push_market(market).unwrap();
         let call = Call::<T>::authorize_market_outcome { market_id: 0_u32.into(), outcome: OutcomeReport::Scalar(1) };
     }: { call.dispatch_bypass_filter(origin)? }
-}
 
-impl_benchmark_test_suite!(
-    Authorized,
-    crate::mock::ExtBuilder::default().build(),
-    crate::mock::Runtime
-);
+    impl_benchmark_test_suite!(
+        Authorized,
+        crate::mock::ExtBuilder::default().build(),
+        crate::mock::Runtime,
+    );
+}

zrml/court/src/benchmarks.rs

@@ -24,7 +24,7 @@
 #[cfg(test)]
 use crate::Pallet as Court;
 use crate::{BalanceOf, Call, Config, CurrencyOf, Pallet};
-use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_benchmarking::{benchmarks, whitelisted_caller};
 use frame_support::{dispatch::UnfilteredDispatchable, traits::Currency};
 use frame_system::RawOrigin;
 use sp_runtime::traits::Bounded;
@@ -64,6 +64,10 @@ benchmarks! {
         let outcome = OutcomeReport::Scalar(u128::MAX);
         deposit_and_join_court::<T>(&caller);
     }: _(RawOrigin::Signed(caller), market_id, outcome)
-}
 
-impl_benchmark_test_suite!(Court, crate::mock::ExtBuilder::default().build(), crate::mock::Runtime);
+    impl_benchmark_test_suite!(
+        Court,
+        crate::mock::ExtBuilder::default().build(),
+        crate::mock::Runtime,
+    );
+}

zrml/global-disputes/src/benchmarks.rs

@@ -28,7 +28,7 @@ use crate::{
     global_disputes_pallet_api::GlobalDisputesPalletApi, types::*, BalanceOf, Call, Config,
     Pallet as GlobalDisputes, *,
 };
-use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_benchmarking::{account, benchmarks, whitelisted_caller};
 use frame_support::{
     sp_runtime::traits::StaticLookup,
     traits::{Currency, Get},
@@ -379,10 +379,10 @@ benchmarks! {
         assert!(<Outcomes<T>>::iter_prefix(market_id).next().is_none());
         assert_last_event::<T>(Event::OutcomesFullyCleaned::<T> { market_id }.into());
     }
-}
 
-impl_benchmark_test_suite!(
-    GlobalDisputes,
-    crate::mock::ExtBuilder::default().build(),
-    crate::mock::Runtime
-);
+    impl_benchmark_test_suite!(
+        GlobalDisputes,
+        crate::mock::ExtBuilder::default().build(),
+        crate::mock::Runtime,
+    );
+}

zrml/liquidity-mining/src/benchmarks.rs

@@ -24,18 +24,18 @@
 use crate::pallet::{BalanceOf, Call, Config, Pallet};
 #[cfg(test)]
 use crate::Pallet as LiquidityMining;
-use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
+use frame_benchmarking::benchmarks;
 use frame_system::RawOrigin;
 use sp_runtime::traits::Bounded;
 
 benchmarks! {
     set_per_block_distribution {
         let balance = BalanceOf::<T>::max_value();
     }: set_per_block_distribution(RawOrigin::Root, balance)
-}
 
-impl_benchmark_test_suite!(
-    LiquidityMining,
-    crate::mock::ExtBuilder::default().build(),
-    crate::mock::Runtime
-);
+    impl_benchmark_test_suite!(
+        LiquidityMining,
+        crate::mock::ExtBuilder::default().build(),
+        crate::mock::Runtime,
+    );
+}

zrml/orderbook-v1/src/benchmarks.rs

@@ -25,7 +25,7 @@
 use super::*;
 #[cfg(test)]
 use crate::Pallet as OrderBook;
-use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_benchmarking::{account, benchmarks, whitelisted_caller};
 use frame_support::{dispatch::UnfilteredDispatchable, traits::Currency};
 use frame_system::RawOrigin;
 use orml_traits::MultiCurrency;
@@ -101,10 +101,10 @@ benchmarks! {
     make_order_bid {
         let (caller, asset, amt, prc) = order_common_parameters::<T>(None)?;
     }: make_order(RawOrigin::Signed(caller), asset, OrderSide::Bid, amt, prc)
-}
 
-impl_benchmark_test_suite!(
-    OrderBook,
-    crate::mock::ExtBuilder::default().build(),
-    crate::mock::Runtime
-);
+    impl_benchmark_test_suite!(
+        OrderBook,
+        crate::mock::ExtBuilder::default().build(),
+        crate::mock::Runtime,
+    );
+}

zrml/prediction-markets/src/benchmarks.rs

@@ -26,7 +26,7 @@ use super::*;
 #[cfg(test)]
 use crate::Pallet as PredictionMarket;
 use alloc::vec::Vec;
-use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, vec, whitelisted_caller};
+use frame_benchmarking::{account, benchmarks, vec, whitelisted_caller};
 use frame_support::{
     dispatch::UnfilteredDispatchable,
     traits::{EnsureOrigin, Get},
@@ -1227,10 +1227,10 @@ benchmarks! {
     }: {
         let _ = <Pallet<T>>::process_subsidy_collecting_markets(current_block, current_time);
     }
-}
 
-impl_benchmark_test_suite!(
-    PredictionMarket,
-    crate::mock::ExtBuilder::default().build(),
-    crate::mock::Runtime
-);
+    impl_benchmark_test_suite!(
+        PredictionMarket,
+        crate::mock::ExtBuilder::default().build(),
+        crate::mock::Runtime,
+    );
+}

zrml/styx/src/benchmarks.rs

@@ -26,7 +26,7 @@ use super::*;
 use crate::Config;
 #[cfg(test)]
 use crate::Pallet as Styx;
-use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_benchmarking::{benchmarks, whitelisted_caller};
 use frame_support::{
     dispatch::UnfilteredDispatchable,
     traits::{Currency, EnsureOrigin},
@@ -50,6 +50,10 @@ benchmarks! {
         T::Currency::deposit_creating(&caller, balance);
         let call = Call::<T>::set_burn_amount { amount };
     }: { call.dispatch_bypass_filter(origin)? }
-}
 
-impl_benchmark_test_suite!(Styx, crate::mock::ExtBuilder::default().build(), crate::mock::Runtime);
+    impl_benchmark_test_suite!(
+        Styx,
+        crate::mock::ExtBuilder::default().build(),
+        crate::mock::Runtime,
+    );
+}

zrml/swaps/src/benchmarks.rs

@@ -29,9 +29,7 @@ use super::*;
 #[cfg(test)]
 use crate::Pallet as Swaps;
 use crate::{fixed::bmul, pallet::ARBITRAGE_MAX_ITERATIONS, Config, Event, MarketIdOf};
-use frame_benchmarking::{
-    account, benchmarks, impl_benchmark_test_suite, vec, whitelisted_caller, Vec,
-};
+use frame_benchmarking::{account, benchmarks, vec, whitelisted_caller, Vec};
 use frame_support::{dispatch::UnfilteredDispatchable, traits::Get, weights::Weight};
 use frame_system::RawOrigin;
 use orml_traits::MultiCurrency;
@@ -904,6 +902,10 @@ benchmarks! {
             pool_id,
         ).into());
     }
-}
 
-impl_benchmark_test_suite!(Swaps, crate::mock::ExtBuilder::default().build(), crate::mock::Runtime);
+    impl_benchmark_test_suite!(
+        Swaps,
+        crate::mock::ExtBuilder::default().build(),
+        crate::mock::Runtime,
+    );
+}