Revert "Add migration code"

This reverts commit 0aead15.

common/mixnet-contract/src/gateway.rs

@@ -7,8 +7,6 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 
-use crate::current_block_height;
-
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct Gateway {
     pub host: String,
@@ -26,7 +24,6 @@ pub struct GatewayBond {
     pub bond_amount: Coin,
     pub total_delegation: Coin,
     pub owner: Addr,
-    #[serde(default = "current_block_height")]
     pub block_height: u64,
     pub gateway: Gateway,
 }

common/mixnet-contract/src/lib.rs

@@ -16,10 +16,3 @@ pub use gateway::{Gateway, GatewayBond, GatewayOwnershipResponse, PagedGatewayRe
 pub use mixnode::{Layer, MixNode, MixNodeBond, MixOwnershipResponse, PagedMixnodeResponse};
 pub use msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
 pub use types::{IdentityKey, IdentityKeyRef, LayerDistribution, SphinxKey, StateParams};
-
-use std::sync::atomic::{AtomicU64, Ordering};
-pub static CURRENT_BLOCK_HEIGHT: AtomicU64 = AtomicU64::new(0);
-
-pub fn current_block_height() -> u64 {
-    CURRENT_BLOCK_HEIGHT.load(Ordering::Relaxed)
-}

common/mixnet-contract/src/mixnode.rs

@@ -8,8 +8,6 @@ use serde::{Deserialize, Serialize};
 use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::fmt::Display;
 
-use crate::current_block_height;
-
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNode {
     pub host: String,
@@ -37,7 +35,6 @@ pub struct MixNodeBond {
     pub total_delegation: Coin,
     pub owner: Addr,
     pub layer: Layer,
-    #[serde(default = "current_block_height")]
     pub block_height: u64,
     pub mix_node: MixNode,
 }

contracts/mixnet/src/contract.rs

@@ -205,33 +205,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<QueryResponse, Cont
 }
 
 #[entry_point]
-pub fn migrate(deps: DepsMut, env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
-    use crate::storage::{gateways, gateways_read, mixnodes, mixnodes_read};
-    use cosmwasm_std::{Order, StdResult};
-    use mixnet_contract::CURRENT_BLOCK_HEIGHT;
-    use mixnet_contract::{GatewayBond, MixNodeBond};
-    use std::sync::atomic::Ordering;
-
-    CURRENT_BLOCK_HEIGHT.store(env.block.height, Ordering::Relaxed);
-
-    let bonds = mixnodes_read(deps.storage)
-        .range(None, None, Order::Ascending)
-        .map(|res| res.map(|item| item.1))
-        .collect::<StdResult<Vec<MixNodeBond>>>()?;
-
-    for bond in bonds {
-        mixnodes(deps.storage).save(bond.identity().as_bytes(), &bond)?;
-    }
-
-    let bonds = gateways_read(deps.storage)
-        .range(None, None, Order::Ascending)
-        .map(|res| res.map(|item| item.1))
-        .collect::<StdResult<Vec<GatewayBond>>>()?;
-
-    for bond in bonds {
-        gateways(deps.storage).save(bond.identity().as_bytes(), &bond)?;
-    }
-
+pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
     Ok(Default::default())
 }