From 765fe446cf392f721cf9b962b3b7b811c5aa23d1 Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Thu, 14 Nov 2019 10:09:16 +0100 Subject: [PATCH] whisper/whisperv6: fix staticcheck issues (#20288) --- whisper/whisperv6/topic.go | 3 +-- whisper/whisperv6/whisper.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index 4dd8f283c..ee255f785 100644 --- a/whisper/whisperv6/topic.go +++ b/whisper/whisperv6/topic.go @@ -19,7 +19,6 @@ package whisperv6 import ( - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" ) @@ -43,7 +42,7 @@ func BytesToTopic(b []byte) (t TopicType) { // String converts a topic byte array to a string representation. func (t *TopicType) String() string { - return common.ToHex(t[:]) + return hexutil.Encode(t[:]) } // MarshalText returns the hex representation of t. diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index eb713f84e..a7787ca69 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -352,7 +352,7 @@ func (whisper *Whisper) getPeer(peerID []byte) (*Peer, error) { return p, nil } } - return nil, fmt.Errorf("Could not find peer with ID: %x", peerID) + return nil, fmt.Errorf("could not find peer with ID: %x", peerID) } // AllowP2PMessagesFromPeer marks specific peer trusted,