fix: make client and server config ad-hoc in secure_outbound method

Introduce the `with_remote_peer_id` constructor in `Config`.

transports/tls/src/upgrade.rs

@@ -65,6 +65,17 @@ impl Config {
             client: crate::make_client_config(identity, None)?,
         })
     }
+
+    pub(crate) fn with_remote_peer_id(
+        remote_peer_id: Option<PeerId>,
+    ) -> Result<Self, certificate::GenError> {
+        let identity = libp2p_identity::Keypair::generate_ed25519();
+
+        Ok(Self {
+            server: crate::make_server_config(&identity)?,
+            client: crate::make_client_config(&identity, remote_peer_id)?,
+        })
+    }
 }
 
 impl UpgradeInfo for Config {
@@ -117,9 +128,9 @@ where
                 .await
                 .map_err(UpgradeError::ServerUpgrade)?;
 
-            let expected = extract_single_certificate(stream.get_ref().1)?.peer_id();
+            let peer_id = extract_single_certificate(stream.get_ref().1)?.peer_id();
 
-            Ok((expected, stream.into()))
+            Ok((peer_id, stream.into()))
         }
         .boxed()
     }
@@ -153,15 +164,9 @@ where
 
             let peer_id = extract_single_certificate(stream.get_ref().1)?.peer_id();
 
-            match remote_peer_id {
-                Some(remote_peer_id) if remote_peer_id != peer_id => {
-                    Err(UpgradeError::PeerIdMismatch {
-                        peer_id,
-                        remote_peer_id,
-                    })
-                }
-                _ => Ok((peer_id, stream.into())),
-            }
+            Self::with_remote_peer_id(remote_peer_id)?;
+
+            Ok((peer_id, stream.into()))
         }
         .boxed()
     }