Merge pull request #1165 from input-output-hk/djo/1106/simplify_logs

Simplify logs by removing crypto types from them by default

Author: Alenar

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.3.70"
+version = "0.3.71"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/Cargo.toml

@@ -410,7 +410,7 @@ protocol_message, signers, initiated_at, sealed_at)";
 
         let entity = self.find(filters)?.next().unwrap_or_else(|| {
             panic!(
-                "No entity returned by the persister, certificate_record = {certificate_record:?}"
+                "No entity returned by the persister, certificate_record = {certificate_record:#?}"
             )
         });
 

mithril-aggregator/src/database/provider/certificate.rs

@@ -29,7 +29,7 @@ mod handlers {
         messages::{RegisterSignatureMessage, TryFromMessageAdapter},
     };
 
-    use slog_scope::{debug, warn};
+    use slog_scope::{debug, trace, warn};
     use std::convert::Infallible;
     use std::sync::Arc;
     use warp::http::StatusCode;
@@ -47,6 +47,7 @@ mod handlers {
         ticker_service: Arc<dyn TickerService>,
     ) -> Result<impl warp::Reply, Infallible> {
         debug!("⇄ HTTP SERVER: register_signatures/{:?}", message);
+        trace!("⇄ HTTP SERVER: register_signatures"; "complete_message" => #?message );
 
         let signed_entity_type = match message.signed_entity_type.clone() {
             Some(signed_entity_type) => Ok(signed_entity_type),

mithril-aggregator/src/http_server/routes/signatures_routes.rs

@@ -49,7 +49,7 @@ mod handlers {
     use mithril_common::entities::Epoch;
     use mithril_common::messages::{RegisterSignerMessage, TryFromMessageAdapter};
     use mithril_common::BeaconProvider;
-    use slog_scope::{debug, warn};
+    use slog_scope::{debug, trace, warn};
     use std::convert::Infallible;
     use std::sync::Arc;
     use warp::http::StatusCode;
@@ -66,6 +66,10 @@ mod handlers {
             "⇄ HTTP SERVER: register_signer/{:?}",
             register_signer_message
         );
+        trace!(
+            "⇄ HTTP SERVER: register_signer";
+            "complete_message" => #?register_signer_message
+        );
 
         let registration_epoch = match register_signer_message.epoch {
             Some(epoch) => epoch,

mithril-aggregator/src/http_server/routes/signer_routes.rs

@@ -1,6 +1,7 @@
 use mithril_common::entities::{Certificate, CertificateSignature};
 use mithril_common::messages::{
-    CertificateMessage, CertificateMetadataMessage, SignerWithStakeMessagePart, ToMessageAdapter,
+    CertificateMessage, CertificateMetadataMessagePart, SignerWithStakeMessagePart,
+    ToMessageAdapter,
 };
 
 /// Adapter to convert [Certificate] to [CertificateMessage] instances
@@ -9,7 +10,7 @@ pub struct ToCertificateMessageAdapter;
 impl ToMessageAdapter<Certificate, CertificateMessage> for ToCertificateMessageAdapter {
     /// Method to trigger the conversion
     fn adapt(certificate: Certificate) -> CertificateMessage {
-        let metadata = CertificateMetadataMessage {
+        let metadata = CertificateMetadataMessagePart {
             protocol_version: certificate.metadata.protocol_version,
             protocol_parameters: certificate.metadata.protocol_parameters,
             initiated_at: certificate.metadata.initiated_at,

mithril-aggregator/src/message_adapters/to_certificate_message.rs

@@ -1,6 +1,6 @@
 use mithril_common::{
     entities::{CertificatePending, Signer},
-    messages::{CertificatePendingMessage, SignerMessage, ToMessageAdapter},
+    messages::{CertificatePendingMessage, SignerMessagePart, ToMessageAdapter},
 };
 
 /// Adapter to turn [CertificatePending] instances into [CertificatePendingMessage].
@@ -23,10 +23,10 @@ impl ToMessageAdapter<CertificatePending, CertificatePendingMessage>
 }
 
 impl ToCertificatePendingMessageAdapter {
-    fn adapt_signers(signers: Vec<Signer>) -> Vec<SignerMessage> {
+    fn adapt_signers(signers: Vec<Signer>) -> Vec<SignerMessagePart> {
         signers
             .into_iter()
-            .map(|signer| SignerMessage {
+            .map(|signer| SignerMessagePart {
                 party_id: signer.party_id,
                 verification_key: signer.verification_key.try_into().unwrap(),
                 verification_key_signature: signer

mithril-aggregator/src/message_adapters/to_certificate_pending_message.rs

@@ -17,7 +17,7 @@ use mithril_common::{
     StdResult,
 };
 use slog::Logger;
-use slog_scope::{debug, error, info, warn};
+use slog_scope::{debug, error, info, trace, warn};
 use std::sync::Arc;
 use thiserror::Error;
 use tokio::sync::RwLock;
@@ -206,6 +206,8 @@ impl CertifierService for MithrilCertifierService {
         signature: &SingleSignatures,
     ) -> StdResult<()> {
         debug!("CertifierService::register_single_signature(signed_entity_type: {signed_entity_type:?}, single_signatures: {signature:?}");
+        trace!("CertifierService::register_single_signature"; "complete_single_signatures" => #?signature);
+
         let open_message = self
             .get_open_message_record(signed_entity_type)
             .await?

mithril-aggregator/src/services/certifier.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client"
-version = "0.3.31"
+version = "0.3.32"
 description = "A Mithril Client"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-client/Cargo.toml

@@ -67,7 +67,7 @@ impl CertificateRetriever for CertificateClient {
 #[cfg(test)]
 mod tests {
     use mithril_common::entities::CertificateSignature;
-    use mithril_common::messages::{CertificateMetadataMessage, SignerWithStakeMessagePart};
+    use mithril_common::messages::{CertificateMetadataMessagePart, SignerWithStakeMessagePart};
     use mithril_common::test_utils::fake_data;
 
     use crate::aggregator_client::MockAggregatorHTTPClient;
@@ -97,7 +97,7 @@ mod tests {
                     hash: certificate_hash.clone(),
                     previous_hash: previous_hash.clone(),
                     beacon: certificate.beacon.clone(),
-                    metadata: CertificateMetadataMessage {
+                    metadata: CertificateMetadataMessagePart {
                         protocol_version: certificate.metadata.protocol_version.clone(),
                         protocol_parameters: certificate.metadata.protocol_parameters.clone(),
                         initiated_at: certificate.metadata.initiated_at,