From d4483eff31a6db322153013cecad4db78eea8d17 Mon Sep 17 00:00:00 2001
From: Timofey <5527315+epanchee@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:05:38 +0400
Subject: [PATCH] fix(assembly): remove direct migration to vxASTRO (#114)

* fix(assembly): remove direct migration to vxASTRO

* revert astroport-governance crate bump
---
 Cargo.lock                          |  9 ------
 contracts/assembly/src/migration.rs | 43 ++++++-----------------------
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 41f619b..5a20d89 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1035,15 +1035,6 @@ dependencies = [
  "cosmwasm-std",
 ]
 
-[[package]]
-name = "ibc-escrow-tester"
-version = "0.1.0"
-dependencies = [
- "astroport-governance 4.2.0",
- "cosmwasm-schema",
- "cosmwasm-std",
-]
-
 [[package]]
 name = "integer-sqrt"
 version = "0.1.5"
diff --git a/contracts/assembly/src/migration.rs b/contracts/assembly/src/migration.rs
index 4106cdd..84fa88f 100644
--- a/contracts/assembly/src/migration.rs
+++ b/contracts/assembly/src/migration.rs
@@ -1,23 +1,17 @@
 #![cfg(not(tarpaulin_include))]
 
 use cosmwasm_schema::cw_serde;
-#[cfg(not(feature = "library"))]
-use cosmwasm_std::entry_point;
-use cosmwasm_std::{Addr, CosmosMsg, DepsMut, Env, Order, Response, StdResult, Uint128, Uint64};
+use cosmwasm_std::{
+    Addr, CosmosMsg, DepsMut, Empty, Env, Order, Response, StdResult, Uint128, Uint64,
+};
 use cw2::{get_contract_version, set_contract_version};
 use cw_storage_plus::Map;
 
-use astroport_governance::assembly::{Config, Proposal, ProposalStatus};
-use astroport_governance::voting_escrow;
+use astroport_governance::assembly::{Proposal, ProposalStatus};
 
 use crate::contract::{CONTRACT_NAME, CONTRACT_VERSION};
 use crate::error::ContractError;
-use crate::state::{CONFIG, PROPOSALS};
-
-#[cw_serde]
-pub struct MigrateMsg {
-    pub vxastro_contract: String,
-}
+use crate::state::PROPOSALS;
 
 #[cw_serde]
 pub struct OldProposal {
@@ -44,34 +38,13 @@ pub struct OldProposal {
 
 const OLD_PROPOSALS: Map<u64, OldProposal> = Map::new("proposals");
 
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<Response, ContractError> {
+#[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
+pub fn migrate(deps: DepsMut, _env: Env, _msg: Empty) -> Result<Response, ContractError> {
     let contract_version = get_contract_version(deps.storage)?;
 
     match contract_version.contract.as_ref() {
         CONTRACT_NAME => match contract_version.version.as_ref() {
-            "2.0.0" => {
-                // vxastro and emissions_controller are optional fields,
-                // thus old config can be deserialized to new config
-                let config = CONFIG.load(deps.storage)?;
-
-                let emissions_controller = deps
-                    .querier
-                    .query_wasm_smart::<voting_escrow::Config>(
-                        &msg.vxastro_contract,
-                        &voting_escrow::QueryMsg::Config {},
-                    )?
-                    .emissions_controller;
-
-                CONFIG.save(
-                    deps.storage,
-                    &Config {
-                        vxastro_contract: Some(Addr::unchecked(msg.vxastro_contract)),
-                        emissions_controller: Some(emissions_controller),
-                        ..config
-                    },
-                )?;
-
+            "2.0.1" => {
                 let proposals = OLD_PROPOSALS
                     .range(deps.storage, None, None, Order::Ascending)
                     .collect::<StdResult<Vec<_>>>()?;