Fix ScoringRule checks with match (#664)

* Convert ScoringRule checks from if let to match Co-authored-by: Malte Kliemann <mail@maltekliemann.com> * Apply review suggestion
zeitgeistpm · Jun 29, 2022 · b70a5c4 · b70a5c4
1 parent 7e1cf3d
commit b70a5c4
Show file tree

Hide file tree

Showing 3 changed files with 222 additions and 192 deletions.
diff --git a/zrml/prediction-markets/src/lib.rs b/zrml/prediction-markets/src/lib.rs
@@ -289,12 +289,15 @@ mod pallet {
             T::MarketCommons::mutate_market(&market_id, |m| {
                 ensure!(m.status == MarketStatus::Proposed, Error::<T>::MarketIsNotProposed);
 
-                if m.scoring_rule == ScoringRule::CPMM {
-                    m.status = MarketStatus::Active;
-                } else {
-                    m.status = MarketStatus::CollectingSubsidy;
-                    status = MarketStatus::CollectingSubsidy;
-                    extra_weight = Self::start_subsidy(m, market_id)?;
+                match m.scoring_rule {
+                    ScoringRule::CPMM => {
+                        m.status = MarketStatus::Active;
+                    }
+                    ScoringRule::RikiddoSigmoidFeeMarketEma => {
+                        m.status = MarketStatus::CollectingSubsidy;
+                        status = MarketStatus::CollectingSubsidy;
+                        extra_weight = Self::start_subsidy(m, market_id)?;
+                    }
                 }
 
                 CurrencyOf::<T>::unreserve_named(&RESERVE_ID, &m.creator, T::AdvisoryBond::get());
@@ -500,10 +503,9 @@ mod pallet {
                     let required_bond = T::ValidityBond::get() + T::OracleBond::get();
                     CurrencyOf::<T>::reserve_named(&RESERVE_ID, &sender, required_bond)?;
 
-                    if scoring_rule == ScoringRule::CPMM {
-                        MarketStatus::Active
-                    } else {
-                        MarketStatus::CollectingSubsidy
+                    match scoring_rule {
+                        ScoringRule::CPMM => MarketStatus::Active,
+                        ScoringRule::RikiddoSigmoidFeeMarketEma => MarketStatus::CollectingSubsidy,
                     }
                 }
                 MarketCreation::Advised => {