From f79763ca88e4bec7f84d36ce00515c1df59d22ae Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Thu, 24 Oct 2024 12:49:37 +0800 Subject: [PATCH] all: fix staticcheck warning S1039: unnecessary use of fmt.Sprintf --- accounts/abi/bind/bind_test.go | 2 +- cmd/puppeth/module_explorer.go | 2 +- cmd/puppeth/module_wallet.go | 4 ++-- p2p/discv5/net.go | 2 +- p2p/discv5/ntp.go | 2 +- whisper/mailserver/mailserver.go | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index ce6e36bffd..ba56684864 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -821,7 +821,7 @@ func TestBindings(t *testing.T) { } t.Log("Using config", params.TestXDPoSMockChainConfig) // Skip the test if the go-ethereum sources are symlinked (https://github.com/golang/go/issues/14845) - linkTestCode := fmt.Sprintf("package linktest\nfunc CheckSymlinks(){\nfmt.Println(backends.NewSimulatedBackend(nil))\n}") + linkTestCode := "package linktest\nfunc CheckSymlinks(){\nfmt.Println(backends.NewSimulatedBackend(nil))\n}" linkTestDeps, err := imports.Process(os.TempDir(), []byte(linkTestCode), nil) if err != nil { t.Fatalf("failed check for goimports symlink bug: %v", err) diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go index c6ff5c7767..0bed1107ec 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -197,7 +197,7 @@ func checkExplorer(client *sshClient, network string) (*explorerInfos, error) { // Run a sanity check to see if the devp2p is reachable nodePort := infos.portmap[infos.envvars["NODE_PORT"]] if err = checkPort(client.server, nodePort); err != nil { - log.Warn(fmt.Sprintf("Explorer devp2p port seems unreachable"), "server", client.server, "port", nodePort, "err", err) + log.Warn("Explorer devp2p port seems unreachable", "server", client.server, "port", nodePort, "err", err) } // Assemble and return the useful infos stats := &explorerInfos{ diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index 25c630e245..6dcbdfbec5 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -181,11 +181,11 @@ func checkWallet(client *sshClient, network string) (*walletInfos, error) { // Run a sanity check to see if the devp2p and RPC ports are reachable nodePort := infos.portmap[infos.envvars["NODE_PORT"]] if err = checkPort(client.server, nodePort); err != nil { - log.Warn(fmt.Sprintf("Wallet devp2p port seems unreachable"), "server", client.server, "port", nodePort, "err", err) + log.Warn("Wallet devp2p port seems unreachable", "server", client.server, "port", nodePort, "err", err) } rpcPort := infos.portmap["8545/tcp"] if err = checkPort(client.server, rpcPort); err != nil { - log.Warn(fmt.Sprintf("Wallet RPC port seems unreachable"), "server", client.server, "port", rpcPort, "err", err) + log.Warn("Wallet RPC port seems unreachable", "server", client.server, "port", rpcPort, "err", err) } // Assemble and return the useful infos stats := &walletInfos{ diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index 097771553d..9bf529a4f6 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -648,7 +648,7 @@ loop: } log.Trace("loop stopped") - log.Debug(fmt.Sprintf("shutting down")) + log.Debug("shutting down") if net.conn != nil { net.conn.Close() } diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 411b4d0485..a6e279a3cc 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -51,7 +51,7 @@ func checkClockDrift() { } if drift < -driftThreshold || drift > driftThreshold { warning := fmt.Sprintf("System clock seems off by %v, which can prevent network connectivity", drift) - howtofix := fmt.Sprintf("Please enable network time synchronisation in system settings") + howtofix := "Please enable network time synchronisation in system settings" separator := strings.Repeat("-", len(warning)) log.Warn(separator) diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index 4b668330e6..49682454e2 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -159,7 +159,7 @@ func (s *WMailServer) validateRequest(peerID []byte, request *whisper.Envelope) f := whisper.Filter{KeySym: s.key} decrypted := request.Open(&f) if decrypted == nil { - log.Warn(fmt.Sprintf("Failed to decrypt p2p request")) + log.Warn("Failed to decrypt p2p request") return false, 0, 0, nil } @@ -171,19 +171,19 @@ func (s *WMailServer) validateRequest(peerID []byte, request *whisper.Envelope) // if you want to check the signature, you can do it here. e.g.: // if !bytes.Equal(peerID, src) { if src == nil { - log.Warn(fmt.Sprintf("Wrong signature of p2p request")) + log.Warn("Wrong signature of p2p request") return false, 0, 0, nil } var bloom []byte payloadSize := len(decrypted.Payload) if payloadSize < 8 { - log.Warn(fmt.Sprintf("Undersized p2p request")) + log.Warn("Undersized p2p request") return false, 0, 0, nil } else if payloadSize == 8 { bloom = whisper.MakeFullNodeBloom() } else if payloadSize < 8+whisper.BloomFilterSize { - log.Warn(fmt.Sprintf("Undersized bloom filter in p2p request")) + log.Warn("Undersized bloom filter in p2p request") return false, 0, 0, nil } else { bloom = decrypted.Payload[8 : 8+whisper.BloomFilterSize]