fix conflict

Author: open-junius

pallets/subtensor/src/coinbase/subnet_emissions.rs

@@ -214,7 +214,14 @@ impl<T: Config> Pallet<T> {
         offset_flows
     }
 
+    // Combines ema price method and tao flow method linearly over FlowHalfLife blocks
+    pub(crate) fn get_shares(subnets_to_emit_to: &[NetUid]) -> BTreeMap<NetUid, U64F64> {
+        Self::get_shares_flow(subnets_to_emit_to)
+        // Self::get_shares_price_ema(subnets_to_emit_to)
+    }
+
     // DEPRECATED: Implementation of shares that uses EMA prices will be gradually deprecated
+    #[allow(dead_code)]
     fn get_shares_price_ema(subnets_to_emit_to: &[NetUid]) -> BTreeMap<NetUid, U64F64> {
         // Get sum of alpha moving prices
         let total_moving_prices = subnets_to_emit_to
@@ -241,10 +248,4 @@ impl<T: Config> Pallet<T> {
             })
             .collect::<BTreeMap<NetUid, U64F64>>()
     }
-
-    // Combines ema price method and tao flow method linearly over FlowHalfLife blocks
-    pub(crate) fn get_shares(subnets_to_emit_to: &[NetUid]) -> BTreeMap<NetUid, U64F64> {
-        // Self::get_shares_flow(subnets_to_emit_to)
-        Self::get_shares_price_ema(subnets_to_emit_to)
-    }
 }

runtime/src/lib.rs

@@ -220,7 +220,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     //   `spec_version`, and `authoring_version` are the same between Wasm and native.
     // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
     //   the compatible custom types.
-    spec_version: 337,
+    spec_version: 339,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,