Muxers updated because of changes from Transport::Dial

Author: momoshell

libp2p/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.56.2
+
+- changes to `SelectMuxerUpgrade` and `SelectSecurityUpgrade` due to changes in the `Transport::Dial` future
+  which returns PortUse policy.
+  See [PR ]
+
 ## 0.56.1
 
 - Fix `metrics` delegation to gossipsub protocol.
@@ -8,12 +14,12 @@
 - Remove `async-std` support.
   See [PR 6074](https://github.com/libp2p/rust-libp2p/pull/6074)
 - Remove deprecated `Transport::with_bandwidth_logging`,
-  `SwarmBuilder::with_bandwidth_logging` and `TransportExt`. 
+  `SwarmBuilder::with_bandwidth_logging` and `TransportExt`.
   See [PR 5766](https://github.com/libp2p/rust-libp2p/pull/5766).
 
 - Introduce `libp2p-webrtc-websys` behind `webrtc-websys` feature flag.
   See [PR 5819](https://github.com/libp2p/rust-libp2p/pull/5819).
-  
+
 - Introduce `libp2p-peer-store`.
   See [PR 5724](https://github.com/libp2p/rust-libp2p/pull/5724).
 
@@ -28,7 +34,7 @@
 
 - Remove DNS from the `async-std` swarm builder, as `async-std` support was removed from `libp2p-dns` transport.
   See [PR 5959](https://github.com/libp2p/rust-libp2p/pull/5959)
-  
+
 ## 0.55.0
 
 - Raise MSRV to 1.83.0.
@@ -46,11 +52,11 @@
 - Expose swarm builder phase errors.
   See [PR 5726](https://github.com/libp2p/rust-libp2p/pull/5726).
 
-- Deprecate `ConnectionHandler::{InboundOpenInfo, OutboundOpenInfo}` associated type.  
-  Previously, users could tag pending sub streams with custom data and retrieve the data 
+- Deprecate `ConnectionHandler::{InboundOpenInfo, OutboundOpenInfo}` associated type.
+  Previously, users could tag pending sub streams with custom data and retrieve the data
   after the substream has been negotiated.
-  But substreams themselves are completely interchangeable, users should instead track 
-  additional data inside `ConnectionHandler` after negotiation.   
+  But substreams themselves are completely interchangeable, users should instead track
+  additional data inside `ConnectionHandler` after negotiation.
   See [PR 5242](https://github.com/libp2p/rust-libp2p/pull/5242).
 
 <!-- Update to libp2p-core v0.43.0 -->

libp2p/src/builder/select_muxer.rs

@@ -25,7 +25,7 @@ use std::iter::{Chain, Map};
 use either::Either;
 use futures::future;
 use libp2p_core::{
-    either::EitherFuture,
+    either::EitherUpgradeFuture,
     upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade},
     UpgradeInfo,
 };
@@ -74,12 +74,12 @@ where
 {
     type Output = future::Either<TA, TB>;
     type Error = Either<EA, EB>;
-    type Future = EitherFuture<A::Future, B::Future>;
+    type Future = EitherUpgradeFuture<A::Future, B::Future>;
 
     fn upgrade_inbound(self, sock: C, info: Self::Info) -> Self::Future {
         match info {
-            Either::Left(info) => EitherFuture::First(self.0.upgrade_inbound(sock, info)),
-            Either::Right(info) => EitherFuture::Second(self.1.upgrade_inbound(sock, info)),
+            Either::Left(info) => EitherUpgradeFuture::First(self.0.upgrade_inbound(sock, info)),
+            Either::Right(info) => EitherUpgradeFuture::Second(self.1.upgrade_inbound(sock, info)),
         }
     }
 }
@@ -91,12 +91,12 @@ where
 {
     type Output = future::Either<TA, TB>;
     type Error = Either<EA, EB>;
-    type Future = EitherFuture<A::Future, B::Future>;
+    type Future = EitherUpgradeFuture<A::Future, B::Future>;
 
     fn upgrade_outbound(self, sock: C, info: Self::Info) -> Self::Future {
         match info {
-            Either::Left(info) => EitherFuture::First(self.0.upgrade_outbound(sock, info)),
-            Either::Right(info) => EitherFuture::Second(self.1.upgrade_outbound(sock, info)),
+            Either::Left(info) => EitherUpgradeFuture::First(self.0.upgrade_outbound(sock, info)),
+            Either::Right(info) => EitherUpgradeFuture::Second(self.1.upgrade_outbound(sock, info)),
         }
     }
 }

libp2p/src/builder/select_security.rs

@@ -26,7 +26,7 @@ use std::iter::{Chain, Map};
 use either::Either;
 use futures::{future, future::MapOk, TryFutureExt};
 use libp2p_core::{
-    either::EitherFuture,
+    either::EitherUpgradeFuture,
     upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo},
 };
 use libp2p_identity::PeerId;
@@ -83,14 +83,14 @@ where
     type Output = (PeerId, future::Either<TA, TB>);
     type Error = Either<EA, EB>;
     type Future = MapOk<
-        EitherFuture<A::Future, B::Future>,
+        EitherUpgradeFuture<A::Future, B::Future>,
         fn(future::Either<(PeerId, TA), (PeerId, TB)>) -> (PeerId, future::Either<TA, TB>),
     >;
 
     fn upgrade_inbound(self, sock: C, info: Self::Info) -> Self::Future {
         match info {
-            Either::Left(info) => EitherFuture::First(self.0.upgrade_inbound(sock, info)),
-            Either::Right(info) => EitherFuture::Second(self.1.upgrade_inbound(sock, info)),
+            Either::Left(info) => EitherUpgradeFuture::First(self.0.upgrade_inbound(sock, info)),
+            Either::Right(info) => EitherUpgradeFuture::Second(self.1.upgrade_inbound(sock, info)),
         }
         .map_ok(future::Either::factor_first)
     }
@@ -104,14 +104,14 @@ where
     type Output = (PeerId, future::Either<TA, TB>);
     type Error = Either<EA, EB>;
     type Future = MapOk<
-        EitherFuture<A::Future, B::Future>,
+        EitherUpgradeFuture<A::Future, B::Future>,
         fn(future::Either<(PeerId, TA), (PeerId, TB)>) -> (PeerId, future::Either<TA, TB>),
     >;
 
     fn upgrade_outbound(self, sock: C, info: Self::Info) -> Self::Future {
         match info {
-            Either::Left(info) => EitherFuture::First(self.0.upgrade_outbound(sock, info)),
-            Either::Right(info) => EitherFuture::Second(self.1.upgrade_outbound(sock, info)),
+            Either::Left(info) => EitherUpgradeFuture::First(self.0.upgrade_outbound(sock, info)),
+            Either::Right(info) => EitherUpgradeFuture::Second(self.1.upgrade_outbound(sock, info)),
         }
         .map_ok(future::Either::factor_first)
     }