From c503fbc2a0758ce8793db27d548f8d340f6bf7c4 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Sat, 27 Mar 2021 16:17:35 +0100
Subject: [PATCH] duplicate logging fix (#2729)
* duplicate logging fix
* remove duplicate peer IDs
---
.../network/approval-distribution/src/lib.rs | 26 ++++++++-----------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/polkadot/node/network/approval-distribution/src/lib.rs b/polkadot/node/network/approval-distribution/src/lib.rs
index 88c086df1e7..ab691083a53 100644
--- a/polkadot/node/network/approval-distribution/src/lib.rs
+++ b/polkadot/node/network/approval-distribution/src/lib.rs
@@ -412,7 +412,7 @@ impl State {
if let Some(peer_id) = source.peer_id() {
tracing::debug!(
target: LOG_TARGET,
- ?source,
+ ?peer_id,
?block_hash,
?validator_index,
"Unexpected assignment",
@@ -437,7 +437,7 @@ impl State {
if knowledge.get().known_messages.contains(&fingerprint) {
tracing::debug!(
target: LOG_TARGET,
- ?source,
+ ?peer_id,
?fingerprint,
"Duplicate assignment",
);
@@ -448,7 +448,7 @@ impl State {
hash_map::Entry::Vacant(_) => {
tracing::debug!(
target: LOG_TARGET,
- ?source,
+ ?peer_id,
?fingerprint,
"Assignment from a peer is out of view",
);
@@ -462,7 +462,7 @@ impl State {
if let Some(peer_knowledge) = entry.known_by.get_mut(&peer_id) {
tracing::trace!(
target: LOG_TARGET,
- ?source,
+ ?peer_id,
?fingerprint,
"Known assignment",
);
@@ -628,7 +628,6 @@ impl State {
if !entry.knowledge.known_messages.contains(&assignment_fingerprint) {
tracing::debug!(
target: LOG_TARGET,
- ?source,
?peer_id,
?fingerprint,
"Unknown approval assignment",
@@ -640,14 +639,14 @@ impl State {
// check if our knowledge of the peer already contains this approval
match entry.known_by.entry(peer_id.clone()) {
hash_map::Entry::Occupied(knowledge) => {
- tracing::debug!(
- target: LOG_TARGET,
- ?source,
- ?peer_id,
- ?fingerprint,
- "Duplicate approval",
- );
if knowledge.get().known_messages.contains(&fingerprint) {
+ tracing::debug!(
+ target: LOG_TARGET,
+ ?peer_id,
+ ?fingerprint,
+ "Duplicate approval",
+ );
+
modify_reputation(ctx, peer_id, COST_DUPLICATE_MESSAGE).await;
return;
}
@@ -655,7 +654,6 @@ impl State {
hash_map::Entry::Vacant(_) => {
tracing::debug!(
target: LOG_TARGET,
- ?source,
?peer_id,
?fingerprint,
"Approval from a peer is out of view",
@@ -668,7 +666,6 @@ impl State {
if entry.knowledge.known_messages.contains(&fingerprint) {
tracing::trace!(
target: LOG_TARGET,
- ?source,
?peer_id,
?fingerprint,
"Known approval",
@@ -700,7 +697,6 @@ impl State {
tracing::trace!(
target: LOG_TARGET,
- ?source,
?peer_id,
?fingerprint,
?result,
--
GitLab