(fix/noise): make error more verbose

Author: vlad9486

p2p/src/network/noise/p2p_network_noise_reducer.rs

@@ -5,7 +5,7 @@ use openmina_core::{bug_condition, fuzzed_maybe, Substate};
 use crate::connection::incoming::{P2pConnectionIncomingAction, P2pConnectionIncomingState};
 use crate::{
     Data, P2pNetworkConnectionError, P2pNetworkPnetAction, P2pNetworkSchedulerAction,
-    P2pNetworkSchedulerState, P2pNetworkSelectAction, P2pState, SelectKind,
+    P2pNetworkSchedulerState, P2pNetworkSelectAction, P2pState, PeerId, SelectKind,
 };
 
 use self::p2p_network_noise_state::ResponderConsumeOutput;
@@ -155,9 +155,13 @@ impl P2pNetworkNoiseState {
                                 if noise_state.expected_peer_id.is_some_and(|expected_per_id| {
                                     expected_per_id != remote_peer_id
                                 }) {
-                                    *state = P2pNetworkNoiseStateInner::Error(dbg!(
-                                        NoiseError::RemotePeerIdMismatch
-                                    ));
+                                    let lhs = noise_state
+                                        .expected_peer_id
+                                        .map_or("none".to_string(), PeerId::to_libp2p_string);
+                                    let rhs = remote_peer_id.to_libp2p_string();
+                                    *state = P2pNetworkNoiseStateInner::Error(
+                                        NoiseError::RemotePeerIdMismatch(format!("{lhs} != {rhs}")),
+                                    );
                                 } else {
                                     *state = P2pNetworkNoiseStateInner::Done {
                                         incoming: true,
@@ -357,8 +361,12 @@ impl P2pNetworkNoiseState {
                                 if noise_state.expected_peer_id.is_some_and(|expected_per_id| {
                                     expected_per_id != remote_peer_id
                                 }) {
+                                    let lhs = noise_state
+                                        .expected_peer_id
+                                        .map_or("none".to_string(), PeerId::to_libp2p_string);
+                                    let rhs = remote_peer_id.to_libp2p_string();
                                     *state = P2pNetworkNoiseStateInner::Error(
-                                        NoiseError::RemotePeerIdMismatch,
+                                        NoiseError::RemotePeerIdMismatch(format!("{lhs} != {rhs}")),
                                     );
                                 } else {
                                     *state = P2pNetworkNoiseStateInner::Done {

p2p/src/network/noise/p2p_network_noise_state.rs

@@ -74,7 +74,7 @@ impl P2pNetworkNoiseState {
 
     pub fn as_error(&self) -> Option<NoiseError> {
         match &self.inner {
-            Some(P2pNetworkNoiseStateInner::Error(error)) => Some(*error),
+            Some(P2pNetworkNoiseStateInner::Error(error)) => Some(error.clone()),
             _ => None,
         }
     }
@@ -224,7 +224,7 @@ impl NoiseState {
     }
 }
 
-#[derive(Debug, Error, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Error, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub enum NoiseError {
     #[error("chunk too short")]
     ChunkTooShort,
@@ -238,8 +238,8 @@ pub enum NoiseError {
     InvalidSignature,
     #[error("remote and local public keys are same")]
     SelfConnection,
-    #[error("remote peer id doesn't match expected peer id")]
-    RemotePeerIdMismatch,
+    #[error("remote peer id doesn't match expected peer id: {0}")]
+    RemotePeerIdMismatch(String),
     #[error("failed to encrypt data")]
     Encryption,
 }