From de85c051025aa3803f7402e6a04b4ba702800c3c Mon Sep 17 00:00:00 2001 From: Arkadiy Paronyan <arkady.paronyan@gmail.com> Date: Wed, 24 Mar 2021 19:06:44 +0100 Subject: [PATCH] Tweaked logging (#2695) * Tweaked logging * Debug for Statement --- .../node/network/approval-distribution/src/lib.rs | 9 ++------- .../node/network/availability-recovery/src/lib.rs | 2 +- polkadot/node/primitives/src/lib.rs | 11 ++++++++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/polkadot/node/network/approval-distribution/src/lib.rs b/polkadot/node/network/approval-distribution/src/lib.rs index 53fba468e3d..88c086df1e7 100644 --- a/polkadot/node/network/approval-distribution/src/lib.rs +++ b/polkadot/node/network/approval-distribution/src/lib.rs @@ -413,7 +413,6 @@ impl State { tracing::debug!( target: LOG_TARGET, ?source, - ?peer_id, ?block_hash, ?validator_index, "Unexpected assignment", @@ -439,7 +438,6 @@ impl State { tracing::debug!( target: LOG_TARGET, ?source, - ?peer_id, ?fingerprint, "Duplicate assignment", ); @@ -451,9 +449,8 @@ impl State { tracing::debug!( target: LOG_TARGET, ?source, - ?peer_id, ?fingerprint, - "Assignment from unknown peer", + "Assignment from a peer is out of view", ); modify_reputation(ctx, peer_id.clone(), COST_UNEXPECTED_MESSAGE).await; } @@ -466,7 +463,6 @@ impl State { tracing::trace!( target: LOG_TARGET, ?source, - ?peer_id, ?fingerprint, "Known assignment", ); @@ -497,7 +493,6 @@ impl State { tracing::trace!( target: LOG_TARGET, ?source, - ?peer_id, ?fingerprint, ?result, "Checked assignment", @@ -663,7 +658,7 @@ impl State { ?source, ?peer_id, ?fingerprint, - "Approval from unknown peer", + "Approval from a peer is out of view", ); modify_reputation(ctx, peer_id.clone(), COST_UNEXPECTED_MESSAGE).await; } diff --git a/polkadot/node/network/availability-recovery/src/lib.rs b/polkadot/node/network/availability-recovery/src/lib.rs index bb80ffebe9b..21ebe392acd 100644 --- a/polkadot/node/network/availability-recovery/src/lib.rs +++ b/polkadot/node/network/availability-recovery/src/lib.rs @@ -395,7 +395,7 @@ impl RequestChunksPhase { COST_MERKLE_PROOF_INVALID, )).await?; } else { - tracing::debug!( + tracing::trace!( target: LOG_TARGET, validator = ?peer_id, ?validator_index, diff --git a/polkadot/node/primitives/src/lib.rs b/polkadot/node/primitives/src/lib.rs index fa723a27312..b4e016ecadb 100644 --- a/polkadot/node/primitives/src/lib.rs +++ b/polkadot/node/primitives/src/lib.rs @@ -44,7 +44,7 @@ pub mod approval; /// it gives access to the commitments to validators who have not executed the candidate. This /// is necessary to allow a block-producing validator to include candidates from outside of the para /// it is assigned to. -#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode)] +#[derive(Clone, PartialEq, Eq, Encode, Decode)] pub enum Statement { /// A statement that a validator seconds a candidate. #[codec(index = 1)] @@ -54,6 +54,15 @@ pub enum Statement { Valid(CandidateHash), } +impl std::fmt::Debug for Statement { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + Statement::Seconded(seconded) => write!(f, "Seconded: {:?}", seconded.descriptor), + Statement::Valid(hash) => write!(f, "Valid: {:?}", hash), + } + } +} + impl Statement { /// Get the candidate hash referenced by this statement. /// -- GitLab