From a7299aa7f7e6ef239f8845d4e599c163f8440a5c Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Fri, 12 Nov 2021 07:37:01 +1000
Subject: [PATCH] Depend on a multiset git commit that includes a bug fix
 (#3033)

This fixes a bug in MultiSet::remove_all:
https://github.com/jmitchell/multiset/pull/21
---
 Cargo.lock             | 3 +--
 deny.toml              | 3 +++
 zebra-state/Cargo.toml | 5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6aa30d99a..1b88ad1e6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2109,8 +2109,7 @@ dependencies = [
 [[package]]
 name = "multiset"
 version = "0.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce8738c9ddd350996cb8b8b718192851df960803764bcdaa3afb44a63b1ddb5c"
+source = "git+https://github.com/jmitchell/multiset?rev=91ef8550b518f75ae87ae0d8771150f259fd34d5#91ef8550b518f75ae87ae0d8771150f259fd34d5"
 
 [[package]]
 name = "nibble_vec"
diff --git a/deny.toml b/deny.toml
index 27db86f5e..ddeecbcc2 100644
--- a/deny.toml
+++ b/deny.toml
@@ -96,6 +96,9 @@ allow-registry = ["https://github.com/rust-lang/crates.io-index"]
 allow-git = [
     # ticket #2982: librustzcash and orchard git versions
     "https://github.com/str4d/redjubjub",
+
+    # ticket #2523: replace unmaintained multiset
+    "https://github.com/jmitchell/multiset",
 ]
 
 [sources.allow-org]
diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml
index c4ca22812..a9d61d899 100644
--- a/zebra-state/Cargo.toml
+++ b/zebra-state/Cargo.toml
@@ -31,7 +31,10 @@ chrono = "0.4.19"
 rlimit = "0.5.4"
 # TODO: this crate is not maintained anymore. Replace it?
 # https://github.com/ZcashFoundation/zebra/issues/2523
-multiset = "0.0.5"
+#
+# Pinned to a commit which includes bug fix https://github.com/jmitchell/multiset/pull/21
+# The fix should be included in multiset 0.0.6.
+multiset = { git = "https://github.com/jmitchell/multiset", rev = "91ef8550b518f75ae87ae0d8771150f259fd34d5" }
 
 proptest = { version = "0.10.1", optional = true }
 proptest-derive = { version = "0.3", optional = true }