From cb011fdcb2b52e7acc4b569d471f9d05cdd5b87a Mon Sep 17 00:00:00 2001 From: Will Date: Tue, 21 Apr 2020 15:48:28 +0200 Subject: [PATCH 1/2] Fix error message when providing an incorrect peer-id --- client/network/src/service.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/network/src/service.rs b/client/network/src/service.rs index d29cb94ee8a36..0201ff5fd2e48 100644 --- a/client/network/src/service.rs +++ b/client/network/src/service.rs @@ -1148,7 +1148,7 @@ impl Future for NetworkWorker { if this.boot_node_ids.contains(&peer_id) { if let PendingConnectionError::InvalidPeerId = error { error!( - "💔 Invalid peer ID from bootnode, expected `{}` at address `{}`.", + "💔 Invalid peer ID from bootnode, unexpected `{}` at address `{}`.", peer_id, address, ); From a18d984bfb3202ea6a858463bfb2a9547e010654 Mon Sep 17 00:00:00 2001 From: Will Date: Tue, 21 Apr 2020 16:49:45 +0200 Subject: [PATCH 2/2] Fix error message to cover all cases --- client/network/src/service.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/network/src/service.rs b/client/network/src/service.rs index 0201ff5fd2e48..0b7a1f11c5b39 100644 --- a/client/network/src/service.rs +++ b/client/network/src/service.rs @@ -1148,9 +1148,9 @@ impl Future for NetworkWorker { if this.boot_node_ids.contains(&peer_id) { if let PendingConnectionError::InvalidPeerId = error { error!( - "💔 Invalid peer ID from bootnode, unexpected `{}` at address `{}`.", - peer_id, + "💔 The bootnode you want to connect to at `{}` provided a different peer ID than the one you expect: `{}`.", address, + peer_id, ); } }