From d5e182cf0a3fbf06bcf1c6fe7926cf273e0adcf0 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Wed, 25 Oct 2023 12:03:11 +1100
Subject: [PATCH] deps: use released version of `futures-bounded` (#2500)

---
 rust/Cargo.lock                | 17 ++++-------------
 rust/Cargo.toml                |  1 +
 rust/connlib/tunnel/Cargo.toml |  2 +-
 rust/gateway/Cargo.toml        |  2 +-
 rust/gateway/src/eventloop.rs  |  2 +-
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index ccc2ec671..43a16e70e 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -1144,7 +1144,7 @@ dependencies = [
  "firezone-cli-utils",
  "firezone-tunnel",
  "futures",
- "futures-bounded 0.1.0",
+ "futures-bounded",
  "phoenix-channel",
  "secrecy",
  "serde",
@@ -1223,7 +1223,7 @@ dependencies = [
  "connlib-shared",
  "domain",
  "futures",
- "futures-bounded 0.2.0",
+ "futures-bounded",
  "futures-util",
  "hickory-resolver",
  "ip_network",
@@ -1287,20 +1287,11 @@ dependencies = [
  "futures-util",
 ]
 
-[[package]]
-name = "futures-bounded"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b07bbbe7d7e78809544c6f718d875627addc73a7c3582447abc052cd3dc67e0"
-dependencies = [
- "futures-timer",
- "futures-util",
-]
-
 [[package]]
 name = "futures-bounded"
 version = "0.2.0"
-source = "git+https://github.com/libp2p/rust-libp2p?branch=feat/stream-map#07ff4c28f6d7d878641fe9bf464b27f84191dc77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05bc732cbef458f0184de1c3aa7ae07c9dbbf419611b5b93ee5b0c9aacdc2e3d"
 dependencies = [
  "futures-timer",
  "futures-util",
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 8c3236d2d..877f2da08 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -24,6 +24,7 @@ tracing-subscriber = { version = "0.3.17", features = ["parking_lot"] }
 secrecy = "0.8"
 hickory-resolver = { version = "0.24", features = ["tokio-runtime"] }
 webrtc = "0.9"
+futures-bounded = "0.2.0"
 
 connlib-client-android = { path = "connlib/clients/android"}
 connlib-client-apple = { path = "connlib/clients/apple"}
diff --git a/rust/connlib/tunnel/Cargo.toml b/rust/connlib/tunnel/Cargo.toml
index bd91295c5..9de94773d 100644
--- a/rust/connlib/tunnel/Cargo.toml
+++ b/rust/connlib/tunnel/Cargo.toml
@@ -25,7 +25,7 @@ domain = "0.9"
 boringtun = { workspace = true }
 chrono = { workspace = true }
 pnet_packet = { version = "0.34" }
-futures-bounded = { git = "https://github.com/libp2p/rust-libp2p", branch = "feat/stream-map" }
+futures-bounded = { workspace = true }
 hickory-resolver = { workspace = true }
 
 # TODO: research replacing for https://github.com/algesten/str0m
diff --git a/rust/gateway/Cargo.toml b/rust/gateway/Cargo.toml
index dd1be97bb..8680fd828 100644
--- a/rust/gateway/Cargo.toml
+++ b/rust/gateway/Cargo.toml
@@ -16,7 +16,7 @@ clap = "4.4.5"
 connlib-shared = { workspace = true }
 firezone-tunnel = { workspace = true }
 futures = "0.3.28"
-futures-bounded = "0.1.0"
+futures-bounded = { workspace = true }
 firezone-cli-utils = { workspace = true }
 phoenix-channel = { workspace = true }
 secrecy = { workspace = true }
diff --git a/rust/gateway/src/eventloop.rs b/rust/gateway/src/eventloop.rs
index 30f33e2fd..d0c3ef6b3 100644
--- a/rust/gateway/src/eventloop.rs
+++ b/rust/gateway/src/eventloop.rs
@@ -125,7 +125,7 @@ impl Eventloop {
                         Err(futures_bounded::PushError::BeyondCapacity(_)) => {
                             tracing::warn!("Too many connections requests, dropping existing one");
                         }
-                        Err(futures_bounded::PushError::ReplacedFuture(_)) => {
+                        Err(futures_bounded::PushError::Replaced(_)) => {
                             debug_assert!(false, "Received a 2nd connection requested with the same reference from the same client");
                         }
                         Ok(()) => {}