revert migration changes based on feedback

mars-protocol · Aug 28, 2024 · 6474186 · 6474186
1 parent 74846a4
commit 6474186
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/rewards-collector/neutron/Cargo.toml b/contracts/rewards-collector/neutron/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name          = "mars-rewards-collector-neutron"
-version       = "2.0.2"
+version       = { workspace = true }
 authors       = { workspace = true }
 edition       = { workspace = true }
 license       = { workspace = true }

diff --git a/contracts/rewards-collector/neutron/src/lib.rs b/contracts/rewards-collector/neutron/src/lib.rs
@@ -49,10 +49,12 @@ pub type NeutronCollector<'a> = Collector<'a, NeutronMsg, NeutronIbcMsgFactory>;
 
 #[cfg(not(feature = "library"))]
 pub mod entry {
-    use cosmwasm_std::{entry_point, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult};
+    use cosmwasm_std::{
+        entry_point, Binary, Deps, DepsMut, Empty, Env, MessageInfo, Response, StdResult,
+    };
     use cw2::set_contract_version;
-    use mars_rewards_collector_base::{ContractError, ContractResult};
-    use mars_types::rewards_collector::{ExecuteMsg, InstantiateMsg, NeutronMigrateMsg, QueryMsg};
+    use mars_rewards_collector_base::ContractResult;
+    use mars_types::rewards_collector::{ExecuteMsg, InstantiateMsg, QueryMsg};
     use neutron_sdk::bindings::msg::NeutronMsg;
 
     use crate::{migrations, NeutronCollector};
@@ -90,13 +92,7 @@ pub mod entry {
     }
 
     #[entry_point]
-    pub fn migrate(
-        deps: DepsMut,
-        _env: Env,
-        msg: NeutronMigrateMsg,
-    ) -> Result<Response, ContractError> {
-        match msg {
-            NeutronMigrateMsg::V1_2_0ToV2_0_2 {} => migrations::v2_0_2::migrate(deps),
-        }
+    pub fn migrate(deps: DepsMut, _env: Env, _msg: Empty) -> ContractResult<Response> {
+        migrations::v2_0_2::migrate(deps)
     }
 }
diff --git a/contracts/rewards-collector/osmosis/src/lib.rs b/contracts/rewards-collector/osmosis/src/lib.rs
@@ -7,7 +7,7 @@ pub mod entry {
     };
     use cw2::set_contract_version;
     use mars_rewards_collector_base::{contract::Collector, ContractError, ContractResult};
-    use mars_types::rewards_collector::{ExecuteMsg, InstantiateMsg, OsmosisMigrateMsg, QueryMsg};
+    use mars_types::rewards_collector::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
 
     use crate::migrations;
 
@@ -46,14 +46,10 @@ pub mod entry {
     }
 
     #[entry_point]
-    pub fn migrate(
-        deps: DepsMut,
-        _env: Env,
-        msg: OsmosisMigrateMsg,
-    ) -> Result<Response, ContractError> {
+    pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<Response, ContractError> {
         match msg {
-            OsmosisMigrateMsg::V1_0_0ToV2_0_0 {} => migrations::v2_0_0::migrate(deps),
-            OsmosisMigrateMsg::V2_0_0ToV2_0_1 {} => migrations::v2_0_1::migrate(deps),
+            MigrateMsg::V1_0_0ToV2_0_0 {} => migrations::v2_0_0::migrate(deps),
+            MigrateMsg::V2_0_0ToV2_0_1 {} => migrations::v2_0_1::migrate(deps),
         }
     }
 }
diff --git a/contracts/rewards-collector/osmosis/tests/tests/test_migration_v2.rs b/contracts/rewards-collector/osmosis/tests/tests/test_migration_v2.rs
@@ -6,14 +6,14 @@ use mars_rewards_collector_osmosis::{
     migrations::v2_0_0::v1_state::{self, OwnerSetNoneProposed},
 };
 use mars_testing::mock_dependencies;
-use mars_types::rewards_collector::OsmosisMigrateMsg;
+use mars_types::rewards_collector::MigrateMsg;
 
 #[test]
 fn wrong_contract_name() {
     let mut deps = mock_dependencies(&[]);
     cw2::set_contract_version(deps.as_mut().storage, "contract_xyz", "1.0.0").unwrap();
 
-    let err = migrate(deps.as_mut(), mock_env(), OsmosisMigrateMsg::V1_0_0ToV2_0_0 {}).unwrap_err();
+    let err = migrate(deps.as_mut(), mock_env(), MigrateMsg::V1_0_0ToV2_0_0 {}).unwrap_err();
 
     assert_eq!(
         err,
@@ -34,7 +34,7 @@ fn wrong_contract_version() {
     )
     .unwrap();
 
-    let err = migrate(deps.as_mut(), mock_env(), OsmosisMigrateMsg::V1_0_0ToV2_0_0 {}).unwrap_err();
+    let err = migrate(deps.as_mut(), mock_env(), MigrateMsg::V1_0_0ToV2_0_0 {}).unwrap_err();
 
     assert_eq!(
         err,
@@ -78,7 +78,7 @@ fn successful_migration() {
     };
     v1_state::CONFIG.save(deps.as_mut().storage, &v1_config).unwrap();
 
-    let res = migrate(deps.as_mut(), mock_env(), OsmosisMigrateMsg::V1_0_0ToV2_0_0 {}).unwrap();
+    let res = migrate(deps.as_mut(), mock_env(), MigrateMsg::V1_0_0ToV2_0_0 {}).unwrap();
 
     assert_eq!(res.messages, vec![]);
     assert_eq!(res.events, vec![] as Vec<Event>);
@@ -123,7 +123,7 @@ fn successful_migration_to_v2_1_0() {
     )
     .unwrap();
 
-    let res = migrate(deps.as_mut(), mock_env(), OsmosisMigrateMsg::V2_0_0ToV2_0_1 {}).unwrap();
+    let res = migrate(deps.as_mut(), mock_env(), MigrateMsg::V2_0_0ToV2_0_1 {}).unwrap();
 
     assert_eq!(res.messages, vec![]);
     assert_eq!(res.events, vec![] as Vec<Event>);

diff --git a/packages/types/src/rewards_collector.rs b/packages/types/src/rewards_collector.rs
@@ -205,12 +205,7 @@ pub enum QueryMsg {
 }
 
 #[cw_serde]
-pub enum OsmosisMigrateMsg {
+pub enum MigrateMsg {
     V1_0_0ToV2_0_0 {},
     V2_0_0ToV2_0_1 {},
 }
-
-#[cw_serde]
-pub enum NeutronMigrateMsg {
-    V1_2_0ToV2_0_2 {},
-}