Skip to content

Commit 040fb74

Browse files
fjlenriquefynn
fjl
authored and
enriquefynn
committed
build: upgrade to golangci-lint 1.24.0 (ethereum#20901)
* accounts/scwallet: remove unnecessary uses of fmt.Sprintf * cmd/puppeth: remove unnecessary uses of fmt.Sprintf * p2p/discv5: remove unnecessary use of fmt.Sprintf * whisper/mailserver: remove unnecessary uses of fmt.Sprintf * core: goimports -w tx_pool_test.go * eth/downloader: goimports -w downloader_test.go * build: upgrade to golangci-lint 1.24.0
1 parent 0126ea5 commit 040fb74

File tree

8 files changed

+42
-34
lines changed

8 files changed

+42
-34
lines changed

‎accounts/scwallet/wallet.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,15 +312,15 @@ func (w *Wallet) Status() (string, error) {
312312
}
313313
switch {
314314
case !w.session.verified && status.PinRetryCount == 0 && status.PukRetryCount == 0:
315-
return fmt.Sprintf("Bricked, waiting for full wipe"), nil
315+
return "Bricked, waiting for full wipe", nil
316316
case !w.session.verified && status.PinRetryCount == 0:
317317
return fmt.Sprintf("Blocked, waiting for PUK (%d attempts left) and new PIN", status.PukRetryCount), nil
318318
case !w.session.verified:
319319
return fmt.Sprintf("Locked, waiting for PIN (%d attempts left)", status.PinRetryCount), nil
320320
case !status.Initialized:
321-
return fmt.Sprintf("Empty, waiting for initialization"), nil
321+
return "Empty, waiting for initialization", nil
322322
default:
323-
return fmt.Sprintf("Online"), nil
323+
return "Online", nil
324324
}
325325
}
326326

‎build/checksums.txt

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22

33
b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34 go1.13.8.src.tar.gz
44

5-
478994633b0f5121a7a8d4f368078093e21014fdc7fb2c0ceeae63668c13c5b6 golangci-lint-1.22.2-freebsd-amd64.tar.gz
6-
fcf80824c21567eb0871055711bf9bdca91cf9a081122e2a45f1d11fed754600 golangci-lint-1.22.2-darwin-amd64.tar.gz
7-
cda85c72fc128b2ea0ae05baea7b91172c63aea34064829f65285f1dd536f1e0 golangci-lint-1.22.2-windows-386.zip
8-
94f04899f620aadc9c1524e5482e415efdbd993fa2b2918c4fec2798f030ac1c golangci-lint-1.22.2-linux-armv7.tar.gz
9-
0e72a87d71edde00b6e37e84a99841833ad55fee83e20d21130a7a622b2860bb golangci-lint-1.22.2-freebsd-386.tar.gz
10-
86def2f31fe8fd7c05674104ed2a4bef3e44b7132b93c6ad2f52f198b3d01801 golangci-lint-1.22.2-linux-s390x.tar.gz
11-
b0df4546d36be94e8107733ba290b98dd9b7e41a42d3fb202e87fc7e4ee800c3 golangci-lint-1.22.2-freebsd-armv6.tar.gz
12-
3d45958dcf6a8d195086d2fced1a21db42a90815dfd156d180efa62dbdda6724 golangci-lint-1.22.2-darwin-386.tar.gz
13-
7ee29f35c74fab017a454237990c74d984ce3855960f2c10509238992bb781f9 golangci-lint-1.22.2-linux-arm64.tar.gz
14-
52086ac52a502b68578e58e35d3964f127c16d7a90b9ffcb399a004d055ded51 golangci-lint-1.22.2-linux-386.tar.gz
15-
c2e4df1fab2ae53762f9baac6041503eeeaa968ce38ea41779f7cb526751c667 golangci-lint-1.22.2-windows-amd64.zip
16-
109d38cdc89f271392f5a138d6782657157f9f496fd4801956efa2d0428e0cbe golangci-lint-1.22.2-linux-amd64.tar.gz
17-
f08aae4868d4828c8f07deb0dcd941a1da695b97e58d15e9f3d1d07dcc7a0c84 golangci-lint-1.22.2-linux-armv6.tar.gz
18-
37af03d9c144d527cb15c46a07e6a22d3f62b5491e34ad6f3bfe6bb0b0b597d4 golangci-lint-1.22.2-linux-ppc64le.tar.gz
19-
251a1081d53944f1d5f86216d752837b23079f90605c9d1cc628da1ffcd2e749 golangci-lint-1.22.2-freebsd-armv7.tar.gz
5+
aeaa5498682246b87d0b77ece283897348ea03d98e816760a074058bfca60b2a golangci-lint-1.24.0-windows-amd64.zip
6+
7e854a70d449fe77b7a91583ec88c8603eb3bf96c45d52797dc4ba3f2f278dbe golangci-lint-1.24.0-darwin-386.tar.gz
7+
835101fae192c3a2e7a51cb19d5ac3e1a40b0e311955e89bc21d61de78635979 golangci-lint-1.24.0-linux-armv6.tar.gz
8+
a041a6e6a61c9ff3dbe58673af13ea00c76bcd462abede0ade645808e97cdd6d golangci-lint-1.24.0-windows-386.zip
9+
7cc73eb9ca02b7a766c72b913f8080401862b10e7bb90c09b085415a81f21609 golangci-lint-1.24.0-freebsd-armv6.tar.gz
10+
537bb2186987b5e68ad4e8829230557f26087c3028eb736dea1662a851bad73d golangci-lint-1.24.0-linux-armv7.tar.gz
11+
8cb1bc1e63d8f0d9b71fcb10b38887e1646a6b8a120ded2e0cd7c3284528f633 golangci-lint-1.24.0-linux-mips64.tar.gz
12+
095d3f8bf7fc431739861574d0b58d411a617df2ed5698ce5ae5ecc66d23d44d golangci-lint-1.24.0-freebsd-armv7.tar.gz
13+
e245df27cec3827aef9e7afbac59e92816978ee3b64f84f7b88562ff4b2ac225 golangci-lint-1.24.0-linux-arm64.tar.gz
14+
35d6d5927e19f0577cf527f0e4441dbb37701d87e8cf729c98a510fce397fbf7 golangci-lint-1.24.0-linux-ppc64le.tar.gz
15+
a1ed66353b8ceb575d78db3051491bce3ac1560e469a9bc87e8554486fec7dfe golangci-lint-1.24.0-freebsd-386.tar.gz
16+
241ca454102e909de04957ff8a5754c757cefa255758b3e1fba8a4533d19d179 golangci-lint-1.24.0-linux-amd64.tar.gz
17+
ff488423db01a0ec8ffbe4e1d65ef1be6a8d5e6d7930cf380ce8aaf714125470 golangci-lint-1.24.0-linux-386.tar.gz
18+
f05af56f15ebbcf77663a8955d1e39009b584ce8ea4c5583669369d80353a113 golangci-lint-1.24.0-darwin-amd64.tar.gz
19+
b0096796c0ffcd6c350a2ec006100e7ef5f0597b43a204349d4f997273fb32a7 golangci-lint-1.24.0-freebsd-amd64.tar.gz
20+
c9c2867380e85628813f1f7d1c3cfc6c6f7931e89bea86f567ff451b8cdb6654 golangci-lint-1.24.0-linux-mips64le.tar.gz
21+
2feb97fa61c934aa3eba9bc104ab5dd8fb946791d58e64060e8857e800eeae0b golangci-lint-1.24.0-linux-s390x.tar.gz

‎build/ci.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ func doLint(cmdline []string) {
356356

357357
// downloadLinter downloads and unpacks golangci-lint.
358358
func downloadLinter(cachedir string) string {
359-
const version = "1.22.2"
359+
const version = "1.24.0"
360360

361361
csdb := build.MustLoadChecksums("build/checksums.txt")
362362
base := fmt.Sprintf("golangci-lint-%s-%s-%s", version, runtime.GOOS, runtime.GOARCH)

‎cmd/puppeth/module_wallet.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@ func checkWallet(client *sshClient, network string) (*walletInfos, error) {
182182
// Run a sanity check to see if the devp2p and RPC ports are reachable
183183
nodePort := infos.portmap[infos.envvars["NODE_PORT"]]
184184
if err = checkPort(client.server, nodePort); err != nil {
185-
log.Warn(fmt.Sprintf("Wallet devp2p port seems unreachable"), "server", client.server, "port", nodePort, "err", err)
185+
log.Warn("Wallet devp2p port seems unreachable", "server", client.server, "port", nodePort, "err", err)
186186
}
187187
rpcPort := infos.portmap["8545/tcp"]
188188
if err = checkPort(client.server, rpcPort); err != nil {
189-
log.Warn(fmt.Sprintf("Wallet RPC port seems unreachable"), "server", client.server, "port", rpcPort, "err", err)
189+
log.Warn("Wallet RPC port seems unreachable", "server", client.server, "port", rpcPort, "err", err)
190190
}
191191
// Assemble and return the useful infos
192192
stats := &walletInfos{

‎core/tx_pool_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -857,8 +857,12 @@ func testTransactionQueueGlobalLimiting(t *testing.T, nolocals bool) {
857857
//
858858
// This logic should not hold for local transactions, unless the local tracking
859859
// mechanism is disabled.
860-
func TestTransactionQueueTimeLimiting(t *testing.T) { testTransactionQueueTimeLimiting(t, false) }
861-
func TestTransactionQueueTimeLimitingNoLocals(t *testing.T) { testTransactionQueueTimeLimiting(t, true) }
860+
func TestTransactionQueueTimeLimiting(t *testing.T) {
861+
testTransactionQueueTimeLimiting(t, false)
862+
}
863+
func TestTransactionQueueTimeLimitingNoLocals(t *testing.T) {
864+
testTransactionQueueTimeLimiting(t, true)
865+
}
862866

863867
func testTransactionQueueTimeLimiting(t *testing.T, nolocals bool) {
864868
// Reduce the eviction interval to a testable amount

‎eth/downloader/downloader_test.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -481,12 +481,14 @@ func assertOwnForkedChain(t *testing.T, tester *downloadTester, common int, leng
481481
// Tests that simple synchronization against a canonical chain works correctly.
482482
// In this test common ancestor lookup should be short circuited and not require
483483
// binary searching.
484-
func TestCanonicalSynchronisation62(t *testing.T) { testCanonicalSynchronisation(t, 62, FullSync) }
485-
func TestCanonicalSynchronisation63Full(t *testing.T) { testCanonicalSynchronisation(t, 63, FullSync) }
486-
func TestCanonicalSynchronisation63Fast(t *testing.T) { testCanonicalSynchronisation(t, 63, FastSync) }
487-
func TestCanonicalSynchronisation64Full(t *testing.T) { testCanonicalSynchronisation(t, 64, FullSync) }
488-
func TestCanonicalSynchronisation64Fast(t *testing.T) { testCanonicalSynchronisation(t, 64, FastSync) }
489-
func TestCanonicalSynchronisation64Light(t *testing.T) { testCanonicalSynchronisation(t, 64, LightSync) }
484+
func TestCanonicalSynchronisation62(t *testing.T) { testCanonicalSynchronisation(t, 62, FullSync) }
485+
func TestCanonicalSynchronisation63Full(t *testing.T) { testCanonicalSynchronisation(t, 63, FullSync) }
486+
func TestCanonicalSynchronisation63Fast(t *testing.T) { testCanonicalSynchronisation(t, 63, FastSync) }
487+
func TestCanonicalSynchronisation64Full(t *testing.T) { testCanonicalSynchronisation(t, 64, FullSync) }
488+
func TestCanonicalSynchronisation64Fast(t *testing.T) { testCanonicalSynchronisation(t, 64, FastSync) }
489+
func TestCanonicalSynchronisation64Light(t *testing.T) {
490+
testCanonicalSynchronisation(t, 64, LightSync)
491+
}
490492

491493
func testCanonicalSynchronisation(t *testing.T, protocol int, mode SyncMode) {
492494
t.Parallel()

‎p2p/discv5/net.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ loop:
641641
}
642642
log.Trace("loop stopped")
643643

644-
log.Debug(fmt.Sprintf("shutting down"))
644+
log.Debug("shutting down")
645645
if net.conn != nil {
646646
net.conn.Close()
647647
}

‎whisper/mailserver/mailserver.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func (s *WMailServer) validateRequest(peerID []byte, request *whisper.Envelope)
169169
f := whisper.Filter{KeySym: s.key}
170170
decrypted := request.Open(&f)
171171
if decrypted == nil {
172-
log.Warn(fmt.Sprintf("Failed to decrypt p2p request"))
172+
log.Warn("Failed to decrypt p2p request")
173173
return false, 0, 0, nil
174174
}
175175

@@ -181,19 +181,19 @@ func (s *WMailServer) validateRequest(peerID []byte, request *whisper.Envelope)
181181
// if you want to check the signature, you can do it here. e.g.:
182182
// if !bytes.Equal(peerID, src) {
183183
if src == nil {
184-
log.Warn(fmt.Sprintf("Wrong signature of p2p request"))
184+
log.Warn("Wrong signature of p2p request")
185185
return false, 0, 0, nil
186186
}
187187

188188
var bloom []byte
189189
payloadSize := len(decrypted.Payload)
190190
if payloadSize < 8 {
191-
log.Warn(fmt.Sprintf("Undersized p2p request"))
191+
log.Warn("Undersized p2p request")
192192
return false, 0, 0, nil
193193
} else if payloadSize == 8 {
194194
bloom = whisper.MakeFullNodeBloom()
195195
} else if payloadSize < 8+whisper.BloomFilterSize {
196-
log.Warn(fmt.Sprintf("Undersized bloom filter in p2p request"))
196+
log.Warn("Undersized bloom filter in p2p request")
197197
return false, 0, 0, nil
198198
} else {
199199
bloom = decrypted.Payload[8 : 8+whisper.BloomFilterSize]

0 commit comments

Comments
 (0)