From 017b9d4292796c9d4fdb3258694d8a113d90e39f Mon Sep 17 00:00:00 2001
From: Jake Hartnell <jake.hartnell@gmail.com>
Date: Tue, 3 Oct 2023 11:13:58 -0700
Subject: [PATCH] Use tagged cw-multi-test release

---
 Cargo.lock                                    | 48 +++++++++++--------
 Cargo.toml                                    |  6 +--
 .../voting/dao-voting-token-staked/Cargo.toml |  3 +-
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff8b2b2f2..7b89de8a8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -858,19 +858,20 @@ dependencies = [
 
 [[package]]
 name = "cw-multi-test"
-version = "0.16.5"
-source = "git+https://github.com/CosmWasm/cw-multi-test.git?rev=d38db7752b9f054c395d6108453f8b321e4cab02#d38db7752b9f054c395d6108453f8b321e4cab02"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d818f5323c80ed4890db7f89d65eda3f0261fe21878e628c27ea2d8de4b7ba4"
 dependencies = [
  "anyhow",
  "cosmwasm-std",
  "cw-storage-plus 1.1.0",
  "cw-utils 1.0.1",
  "derivative",
- "itertools",
- "k256 0.11.6",
- "prost 0.9.0",
+ "itertools 0.11.0",
+ "prost 0.12.1",
  "schemars",
  "serde",
+ "sha2 0.10.7",
  "thiserror",
 ]
 
@@ -2948,6 +2949,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -3214,7 +3224,7 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f47f0b2f22adb341bb59e5a3a1b464dde033181954bd055b9ae86d6511ba465b"
 dependencies = [
- "itertools",
+ "itertools 0.10.5",
  "proc-macro2",
  "prost-types",
  "quote",
@@ -3425,32 +3435,32 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.9.0"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
 dependencies = [
  "bytes",
- "prost-derive 0.9.0",
+ "prost-derive 0.11.9",
 ]
 
 [[package]]
 name = "prost"
-version = "0.11.9"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
 dependencies = [
  "bytes",
- "prost-derive 0.11.9",
+ "prost-derive 0.12.1",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.9.0"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -3458,15 +3468,15 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.11.9"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.10.5",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.34",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index c2f03267e..d9456cd60 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,7 @@ cosmwasm-schema = { version = "1.2" }
 cosmwasm-std = { version = "1.2", features = ["ibc3"] }
 cosmwasm-storage = { version = "1.2" }
 cw-controllers = "1.1"
-cw-multi-test = "0.16"
+cw-multi-test = "0.17"
 cw-storage-plus = { version = "1.1" }
 cw-utils = "1.0"
 cw2 = "1.1"
@@ -126,7 +126,3 @@ cw20-staked-balance-voting-v1 = { package = "cw20-staked-balance-voting", versio
 cw4-voting-v1 = { package = "cw4-voting", version = "0.1.0" }
 voting-v1 = { package = "dao-voting", version = "0.1.0" }
 stake-cw20-v03 = { package = "stake-cw20", version = "0.2.6" }
-
-# TODO remove when new release is tagged upstream
-[patch.crates-io]
-cw-multi-test = { git = "https://github.com/CosmWasm/cw-multi-test.git", rev = "d38db7752b9f054c395d6108453f8b321e4cab02" }
diff --git a/contracts/voting/dao-voting-token-staked/Cargo.toml b/contracts/voting/dao-voting-token-staked/Cargo.toml
index 083129510..5a66b2eb3 100644
--- a/contracts/voting/dao-voting-token-staked/Cargo.toml
+++ b/contracts/voting/dao-voting-token-staked/Cargo.toml
@@ -41,8 +41,7 @@ cw-tokenfactory-issuer = { workspace = true, features = ["library"] }
 
 [dev-dependencies]
 anyhow = { workspace = true }
-# TODO use upstream when new release is tagged
-cw-multi-test = { git = "https://github.com/CosmWasm/cw-multi-test.git", rev = "d38db7752b9f054c395d6108453f8b321e4cab02" }
+cw-multi-test = { workspace = true }
 cw-tokenfactory-issuer = { workspace = true }
 dao-proposal-single = { workspace = true }
 dao-proposal-hook-counter = { workspace = true }