From 0ef120df0e39798f474ace3d20055d72aff45c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?=
 <jedrzej.stuczynski@gmail.com>
Date: Wed, 12 Oct 2022 17:33:54 +0100
Subject: [PATCH] Restored call to remove_malicious_node in mixnet contract
 migration

---
 Cargo.lock                       |  2 +-
 contracts/Cargo.lock             |  4 ++--
 contracts/mixnet/src/contract.rs | 14 +++++++++++---
 nym-wallet/Cargo.lock            |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dbfc5b52ad..83f1625782 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6720,7 +6720,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vesting-contract"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "cosmwasm-std",
  "cw-storage-plus",
diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock
index e0676f0832..5f2beb9d03 100644
--- a/contracts/Cargo.lock
+++ b/contracts/Cargo.lock
@@ -1050,7 +1050,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "mixnet-contract"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "az",
  "bs58",
@@ -1852,7 +1852,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vesting-contract"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "cosmwasm-std",
  "cw-storage-plus",
diff --git a/contracts/mixnet/src/contract.rs b/contracts/mixnet/src/contract.rs
index bf99614939..bf00d401f2 100644
--- a/contracts/mixnet/src/contract.rs
+++ b/contracts/mixnet/src/contract.rs
@@ -492,7 +492,6 @@ fn blacklist_malicious_node(storage: &mut dyn Storage, owner: &Addr) -> Result<(
 }
 
 // Removes nodes we've deemed malicious, returns the pledge to the owners, but does not send any rewards
-#[allow(unused)]
 fn remove_malicious_node(
     storage: &mut dyn Storage,
     api: &dyn Api,
@@ -509,8 +508,17 @@ fn remove_malicious_node(
 }
 
 #[entry_point]
-pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
-    Ok(Response::default())
+pub fn migrate(deps: DepsMut<'_>, env: Env, msg: MigrateMsg) -> Result<Response, ContractError> {
+    let mut response = Response::new();
+    for node in msg.nodes_to_remove().iter() {
+        let mut sub_response = remove_malicious_node(deps.storage, deps.api, &env, node)
+            .unwrap_or_else(|_| panic!("Could not remove node: {:?}", node));
+        response.messages.append(&mut sub_response.messages);
+        response.attributes.append(&mut sub_response.attributes);
+        response.events.append(&mut sub_response.events);
+    }
+
+    Ok(response)
 }
 
 #[cfg(test)]
diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock
index 36307fd9ed..f35d9b5ff0 100644
--- a/nym-wallet/Cargo.lock
+++ b/nym-wallet/Cargo.lock
@@ -5620,7 +5620,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vesting-contract"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "cosmwasm-std",
  "cw-storage-plus",