crypto: Fix warnings

Author: altonen

src/crypto/noise.rs

@@ -697,17 +697,6 @@ impl fmt::Debug for NoiseContext {
 }
 
 impl NoiseContext {
-    /// Create new [`NoiseContext`].
-    pub fn new(id_keys: &Keypair) -> Self {
-        let noise = snow::Builder::new(NOISE_PARAMETERS.parse().expect("valid Noise patterns"));
-        let keypair = noise.generate_keypair().unwrap();
-
-        let noise =
-            noise.local_private_key(&keypair.private).build_initiator().expect("to succeed");
-
-        NoiseContext::make_noise_and_payload(noise, keypair, id_keys)
-    }
-
     /// Create new [`NoiseContext`] with prologue.
     pub fn with_prologue(id_keys: &Keypair, prologue: Vec<u8>) -> Self {
         let noise = snow::Builder::new(NOISE_PARAMETERS.parse().expect("valid Noise patterns"));

src/crypto/tls/Cargo.toml

@@ -24,10 +24,6 @@ use super::certificate;
 pub enum UpgradeError {
     #[error("Failed to generate certificate")]
     CertificateGeneration(#[from] certificate::GenError),
-    #[error("Failed to upgrade server connection")]
-    ServerUpgrade(std::io::Error),
-    #[error("Failed to upgrade client connection")]
-    ClientUpgrade(std::io::Error),
     #[error("Failed to parse certificate")]
     BadCertificate(#[from] certificate::ParseError),
 }

src/crypto/tls/upgrade.rs

@@ -281,20 +281,17 @@ impl NotificationProtocol {
             "handle outbound substream",
         );
 
-        if self.pending_outbound.remove(&substream_id).is_none() {
-            tracing::warn!(target: LOG_TARGET, ?peer, ?substream_id, "pending outbound substream doesn't exist");
-            debug_assert!(false);
-        }
-
         // peer must exist since an outbound substream was received from them
         let context = self.peers.get_mut(&peer).expect("peer to exist");
+        let pending_peer = self.pending_outbound.remove(&substream_id);
 
         // the peer can be in two different states when an outbound substream has opened:
         //  - `PeerState::OutboundInitiated` - local node opened an outbound substream
         //  - `PeerState::Negotiating` - TODO
         match std::mem::replace(&mut context.state, PeerState::Poisoned) {
             PeerState::OutboundInitiated { substream } => {
                 debug_assert!(substream == substream_id);
+                debug_assert!(pending_peer == Some(peer));
 
                 self.negotiation.negotiate_outbound(peer, outbound);
                 context.state = PeerState::Validating {