diff --git a/zrml/global-disputes/src/lib.rs b/zrml/global-disputes/src/lib.rs index 4ac07e4c0..03b5b0bc2 100644 --- a/zrml/global-disputes/src/lib.rs +++ b/zrml/global-disputes/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2022-2023 Forecasting Technologies LTD. +// Copyright 2022-2024 Forecasting Technologies LTD. // // This file is part of Zeitgeist. // @@ -80,9 +80,6 @@ mod pallet { pub type LockInfoOf = BoundedVec<(MarketIdOf, BalanceOf), ::MaxGlobalDisputeVotes>; - // TODO(#968): to remove after the storage migration - pub type WinnerInfoOf = OldWinnerInfo, OwnerInfoOf>; - /// The current storage version. const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); const LOG_TARGET: &str = "runtime::zrml-global-disputes"; @@ -181,11 +178,6 @@ mod pallet { pub type GlobalDisputesInfo = StorageMap<_, Twox64Concat, MarketIdOf, GlobalDisputeInfoOf, OptionQuery>; - // TODO(#986): to remove after the storage migration - #[pallet::storage] - pub type Winners = - StorageMap<_, Twox64Concat, MarketIdOf, WinnerInfoOf, OptionQuery>; - #[pallet::event] #[pallet::generate_deposit(fn deposit_event)] pub enum Event diff --git a/zrml/global-disputes/src/types.rs b/zrml/global-disputes/src/types.rs index 10c83a49b..de9f4d14c 100644 --- a/zrml/global-disputes/src/types.rs +++ b/zrml/global-disputes/src/types.rs @@ -1,4 +1,4 @@ -// Copyright 2022-2023 Forecasting Technologies LTD. +// Copyright 2022-2024 Forecasting Technologies LTD. // // This file is part of Zeitgeist. // @@ -93,35 +93,6 @@ pub enum GdStatus { Destroyed, } -// TODO(#986): to remove after the storage migration - -/// The information about a voting outcome of a global dispute. -#[derive(Debug, TypeInfo, Decode, Encode, MaxEncodedLen, Clone, PartialEq, Eq)] -pub struct OldOutcomeInfo { - /// The current sum of all locks on this outcome. - pub outcome_sum: Balance, - /// The vector of owners of the outcome. - pub owners: OwnerInfo, -} - -/// The information about the current highest winning outcome. -#[derive(TypeInfo, Decode, Encode, MaxEncodedLen, Clone, PartialEq, Eq)] -pub struct OldWinnerInfo { - /// The outcome, which is in the lead. - pub outcome: OutcomeReport, - /// The information about the winning outcome. - pub outcome_info: OldOutcomeInfo, - /// Check, if the global dispute is finished. - pub is_finished: bool, -} - -impl OldWinnerInfo { - pub fn new(outcome: OutcomeReport, vote_sum: Balance) -> Self { - let outcome_info = OldOutcomeInfo { outcome_sum: vote_sum, owners: Default::default() }; - OldWinnerInfo { outcome, is_finished: false, outcome_info } - } -} - /// An initial vote outcome item with the outcome owner and the initial vote amount. pub struct InitialItem { /// The outcome which is added as initial global dispute vote possibility.