From ee80e7faaf2e8b325b5873e72a6a70bf38f88c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?=
 <jedrzej.stuczynski@gmail.com>
Date: Fri, 25 Nov 2022 16:17:12 +0000
Subject: [PATCH] Using Display implementation of MessageRecoveryError when
 logging (#1803)

* Using Display implementation of MessageRecoveryError when logging

* Updated changelog
---
 CHANGELOG.md                                      |  5 +++++
 clients/client-core/src/client/received_buffer.rs | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dd7ea3316..31972380ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,12 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 -clients: ability to use multi-reply SURBs to send arbitrarily long messages fully anonymously whilst requesting additional reply blocks whenever they're about to run out ([#1796])
 
+### Changed
+
+- clients: improve message logging when received message fails to get reconstructed ([#1803])
+
 [#1796]: https://github.com/nymtech/nym/pull/1796
+[#1803]: https://github.com/nymtech/nym/pull/1803
 
 ## Unreleased
 
diff --git a/clients/client-core/src/client/received_buffer.rs b/clients/client-core/src/client/received_buffer.rs
index 36b5bbc3c5..3ba8977380 100644
--- a/clients/client-core/src/client/received_buffer.rs
+++ b/clients/client-core/src/client/received_buffer.rs
@@ -53,8 +53,8 @@ impl ReceivedMessagesBufferInner {
         }
 
         let fragment = match self.message_receiver.recover_fragment(fragment_data) {
-            Err(e) => {
-                warn!("failed to recover fragment from raw data: {:?}. The whole underlying message might be corrupted and unrecoverable!", e);
+            Err(err) => {
+                warn!("failed to recover fragment from raw data: {err}. The whole underlying message might be corrupted and unrecoverable!");
                 return None;
             }
             Ok(frag) => frag,
@@ -116,8 +116,8 @@ impl ReceivedMessagesBufferInner {
             self.local_encryption_keypair.private_key(),
             &mut raw_fragment,
         ) {
-            Err(e) => {
-                warn!("failed to recover fragment data: {:?}. The whole underlying message might be corrupted and unrecoverable!", e);
+            Err(err) => {
+                warn!("failed to recover fragment data: {err}. The whole underlying message might be corrupted and unrecoverable!");
                 return None;
             }
             Ok(frag_data) => frag_data,
@@ -302,7 +302,7 @@ impl ReceivedMessagesBuffer {
         if let Some(sender) = &inner_guard.message_sender {
             trace!("Sending reconstructed messages to announced sender");
             if let Err(err) = sender.unbounded_send(reconstructed_messages) {
-                warn!("The reconstructed message receiver went offline without explicit notification (relevant error: - {:?})", err);
+                warn!("The reconstructed message receiver went offline without explicit notification (relevant error: - {err})");
                 inner_guard.message_sender = None;
                 inner_guard.messages.extend(err.into_inner());
             }