From af4801ac475a9bfde4c54c1046c7f5a9d9933156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Tue, 22 Feb 2022 09:54:57 +0000 Subject: [PATCH] Removes migration code (#1071) --- contracts/mixnet/src/contract.rs | 59 ++------------------------------ 1 file changed, 2 insertions(+), 57 deletions(-) diff --git a/contracts/mixnet/src/contract.rs b/contracts/mixnet/src/contract.rs index 21d8254bf0..4a88167749 100644 --- a/contracts/mixnet/src/contract.rs +++ b/contracts/mixnet/src/contract.rs @@ -325,64 +325,9 @@ pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result, env: Env, _msg: MigrateMsg) -> Result { - use cw_storage_plus::Item; - use serde::{Deserialize, Serialize}; - - // needed migration: - /* - 1. removal of rewarding_interval_starting_block field from ContractState - 2. removal of latest_rewarding_interval_nonce field from ContractState - 3. removal of rewarding_in_progress field from ContractState - 4. interval_storage::CURRENT_INTERVAL.save(deps.storage, &Interval::default())?; - 5. interval_storage::CURRENT_REWARDED_SET_HEIGHT.save(deps.storage, &env.block.height)?; - 6. removal of active_set_work_factor fields from ContractStateParams - */ - - #[derive(Serialize, Deserialize)] - pub struct OldContractStateParams { - pub minimum_mixnode_pledge: Uint128, - pub minimum_gateway_pledge: Uint128, - pub mixnode_rewarded_set_size: u32, - pub mixnode_active_set_size: u32, - pub active_set_work_factor: u8, - } - - #[derive(Serialize, Deserialize)] - struct OldContractState { - pub owner: Addr, // only the owner account can update state - pub rewarding_validator_address: Addr, - pub params: OldContractStateParams, - pub rewarding_interval_starting_block: u64, - pub latest_rewarding_interval_nonce: u32, - pub rewarding_in_progress: bool, - } - - let old_contract_state: Item<'_, OldContractState> = Item::new("config"); - - let old_state = old_contract_state.load(deps.storage)?; - - let new_params = mixnet_contract_common::ContractStateParams { - minimum_mixnode_pledge: old_state.params.minimum_mixnode_pledge, - minimum_gateway_pledge: old_state.params.minimum_mixnode_pledge, - mixnode_rewarded_set_size: old_state.params.mixnode_rewarded_set_size, - mixnode_active_set_size: old_state.params.mixnode_active_set_size, - }; - - let new_state = crate::mixnet_contract_settings::models::ContractState { - owner: old_state.owner, - rewarding_validator_address: old_state.rewarding_validator_address, - params: new_params, - }; - let rewarding_interval = - Interval::new(0, DEFAULT_FIRST_INTERVAL_START, REWARDING_INTERVAL_LENGTH); - - mixnet_params_storage::CONTRACT_STATE.save(deps.storage, &new_state)?; - - interval_storage::CURRENT_INTERVAL.save(deps.storage, &rewarding_interval)?; - interval_storage::CURRENT_REWARDED_SET_HEIGHT.save(deps.storage, &env.block.height)?; - +pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result { Ok(Default::default()) }