From 488f1c7742a88dfffbc6d2379f7fbf74f19c3552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bogdan-=C8=98tefan=20Neac=C5=9Fu?= <bogdan@nymtech.net>
Date: Wed, 3 Nov 2021 16:01:13 +0200
Subject: [PATCH] Remove stale migration code (#868)

---
 common/mixnet-contract/src/gateway.rs | 3 ---
 common/mixnet-contract/src/lib.rs     | 7 -------
 common/mixnet-contract/src/mixnode.rs | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/common/mixnet-contract/src/gateway.rs b/common/mixnet-contract/src/gateway.rs
index 6318452ecb..34e29fbcd8 100644
--- a/common/mixnet-contract/src/gateway.rs
+++ b/common/mixnet-contract/src/gateway.rs
@@ -9,8 +9,6 @@ use std::cmp::Ordering;
 use std::fmt::Display;
 use ts_rs::TS;
 
-use crate::current_block_height;
-
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema, TS)]
 pub struct Gateway {
     pub host: String,
@@ -28,7 +26,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,
 }
diff --git a/common/mixnet-contract/src/lib.rs b/common/mixnet-contract/src/lib.rs
index 23295df1a2..f835b87ad0 100644
--- a/common/mixnet-contract/src/lib.rs
+++ b/common/mixnet-contract/src/lib.rs
@@ -17,10 +17,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)
-}
diff --git a/common/mixnet-contract/src/mixnode.rs b/common/mixnet-contract/src/mixnode.rs
index 53610ab36e..25cce43c11 100644
--- a/common/mixnet-contract/src/mixnode.rs
+++ b/common/mixnet-contract/src/mixnode.rs
@@ -10,8 +10,6 @@ use std::cmp::Ordering;
 use std::fmt::Display;
 use ts_rs::TS;
 
-use crate::current_block_height;
-
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema, TS)]
 pub struct MixNode {
     pub host: String,
@@ -41,7 +39,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,
 }