Reorganize prediction-market tests

zrml/prediction-markets/src/lib.rs

@@ -87,26 +87,28 @@ mod pallet {
     /// Currently 10 blocks is 2 minutes (assuming block time is 12 seconds).
     pub(crate) const MAX_RECOVERY_TIME_FRAMES: TimeFrame = 10;
 
-    pub(crate) type BalanceOf<T> = <T as zrml_market_commons::Config>::Balance;
     pub(crate) type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
-    pub(crate) type NegativeImbalanceOf<T> =
-        <<T as Config>::Currency as Currency<AccountIdOf<T>>>::NegativeImbalance;
-    pub(crate) type TimeFrame = u64;
+    pub(crate) type AssetOf<T> = Asset<MarketIdOf<T>>;
+    pub(crate) type BalanceOf<T> = <T as zrml_market_commons::Config>::Balance;
+    pub(crate) type CacheSize = ConstU32<64>;
+    pub(crate) type EditReason<T> = BoundedVec<u8, <T as Config>::MaxEditReasonLen>;
+    pub(crate) type InitialItemOf<T> = InitialItem<AccountIdOf<T>, BalanceOf<T>>;
+    pub(crate) type MarketBondsOf<T> = MarketBonds<AccountIdOf<T>, BalanceOf<T>>;
     pub(crate) type MarketIdOf<T> = <T as zrml_market_commons::Config>::MarketId;
-    pub(crate) type MomentOf<T> =
-        <<T as zrml_market_commons::Config>::Timestamp as frame_support::traits::Time>::Moment;
-    pub type MarketOf<T> = Market<
+    pub(crate) type MarketOf<T> = Market<
         AccountIdOf<T>,
         BalanceOf<T>,
         <T as frame_system::Config>::BlockNumber,
         MomentOf<T>,
-        Asset<MarketIdOf<T>>,
+        AssetOf<T>,
     >;
+    pub(crate) type MomentOf<T> =
+        <<T as zrml_market_commons::Config>::Timestamp as frame_support::traits::Time>::Moment;
+    pub(crate) type NegativeImbalanceOf<T> =
+        <<T as Config>::Currency as Currency<AccountIdOf<T>>>::NegativeImbalance;
+    pub(crate) type RejectReason<T> = BoundedVec<u8, <T as Config>::MaxRejectReasonLen>;
     pub(crate) type ReportOf<T> = Report<AccountIdOf<T>, <T as frame_system::Config>::BlockNumber>;
-    pub type CacheSize = ConstU32<64>;
-    pub type EditReason<T> = BoundedVec<u8, <T as Config>::MaxEditReasonLen>;
-    pub type RejectReason<T> = BoundedVec<u8, <T as Config>::MaxRejectReasonLen>;
-    type InitialItemOf<T> = InitialItem<AccountIdOf<T>, BalanceOf<T>>;
+    pub(crate) type TimeFrame = u64;
 
     macro_rules! impl_unreserve_bond {
         ($fn_name:ident, $bond_type:ident) => {
@@ -591,7 +593,7 @@ mod pallet {
         #[transactional]
         pub fn create_market(
             origin: OriginFor<T>,
-            base_asset: Asset<MarketIdOf<T>>,
+            base_asset: AssetOf<T>,
             creator_fee: Perbill,
             oracle: T::AccountId,
             period: MarketPeriod<T::BlockNumber, MomentOf<T>>,
@@ -643,7 +645,7 @@ mod pallet {
         #[transactional]
         pub fn edit_market(
             origin: OriginFor<T>,
-            base_asset: Asset<MarketIdOf<T>>,
+            base_asset: AssetOf<T>,
             market_id: MarketIdOf<T>,
             oracle: T::AccountId,
             period: MarketPeriod<T::BlockNumber, MomentOf<T>>,
@@ -1062,7 +1064,7 @@ mod pallet {
         #[pallet::call_index(17)]
         pub fn create_market_and_deploy_pool(
             origin: OriginFor<T>,
-            base_asset: Asset<MarketIdOf<T>>,
+            base_asset: AssetOf<T>,
             creator_fee: Perbill,
             oracle: T::AccountId,
             period: MarketPeriod<T::BlockNumber, MomentOf<T>>,
@@ -1902,13 +1904,7 @@ mod pallet {
         SoldCompleteSet(MarketIdOf<T>, BalanceOf<T>, AccountIdOf<T>),
         /// An amount of winning outcomes have been redeemed.
         /// \[market_id, currency_id, amount_redeemed, payout, who\]
-        TokensRedeemed(
-            MarketIdOf<T>,
-            Asset<MarketIdOf<T>>,
-            BalanceOf<T>,
-            BalanceOf<T>,
-            AccountIdOf<T>,
-        ),
+        TokensRedeemed(MarketIdOf<T>, AssetOf<T>, BalanceOf<T>, BalanceOf<T>, AccountIdOf<T>),
         /// The global dispute was started. \[market_id\]
         GlobalDisputeStarted(MarketIdOf<T>),
         /// The recovery limit for timestamp based markets was reached due to a prolonged chain stall.
@@ -2090,7 +2086,7 @@ mod pallet {
         #[require_transactional]
         fn do_create_market(
             who: T::AccountId,
-            base_asset: Asset<MarketIdOf<T>>,
+            base_asset: AssetOf<T>,
             creator_fee: Perbill,
             oracle: T::AccountId,
             period: MarketPeriod<T::BlockNumber, MomentOf<T>>,
@@ -2148,10 +2144,7 @@ mod pallet {
             Ok((ids_amount, market_id))
         }
 
-        pub fn outcome_assets(
-            market_id: MarketIdOf<T>,
-            market: &MarketOf<T>,
-        ) -> Vec<Asset<MarketIdOf<T>>> {
+        pub fn outcome_assets(market_id: MarketIdOf<T>, market: &MarketOf<T>) -> Vec<AssetOf<T>> {
             match market.market_type {
                 MarketType::Categorical(categories) => {
                     let mut assets = Vec::new();
@@ -2886,7 +2879,7 @@ mod pallet {
         }
 
         fn construct_market(
-            base_asset: Asset<MarketIdOf<T>>,
+            base_asset: AssetOf<T>,
             creator: T::AccountId,
             creator_fee: Perbill,
             oracle: T::AccountId,
@@ -2899,7 +2892,7 @@ mod pallet {
             scoring_rule: ScoringRule,
             report: Option<ReportOf<T>>,
             resolved_outcome: Option<OutcomeReport>,
-            bonds: MarketBonds<T::AccountId, BalanceOf<T>>,
+            bonds: MarketBondsOf<T>,
         ) -> Result<MarketOf<T>, DispatchError> {
             let valid_base_asset = match base_asset {
                 Asset::Ztg => true,

zrml/prediction-markets/src/mock.rs

@@ -482,7 +482,10 @@ impl ExtBuilder {
         }
         .assimilate_storage(&mut t)
         .unwrap();
-        t.into()
+
+        let mut test_ext: sp_io::TestExternalities = t.into();
+        test_ext.execute_with(|| System::set_block_number(1));
+        test_ext
     }
 }