Skip to content

Commit 4ff5093

Browse files
islishudeislishude
authored
all: use fmt.Appendf instead of fmt.Sprintf where possible (#31301)
1 parent 21d36f7 commit 4ff5093

File tree

10 files changed

+46
-46
lines changed

10 files changed

+46
-46
lines changed

‎cmd/utils/export_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ func (iter *testIterator) Next() (byte, []byte, []byte, bool) {
5454
if iter.index == 42 {
5555
iter.index += 1
5656
}
57-
return OpBatchAdd, []byte(fmt.Sprintf("key-%04d", iter.index)),
58-
[]byte(fmt.Sprintf("value %d", iter.index)), true
57+
return OpBatchAdd, fmt.Appendf(nil, "key-%04d", iter.index),
58+
fmt.Appendf(nil, "value %d", iter.index), true
5959
}
6060

6161
func (iter *testIterator) Release() {}
@@ -72,7 +72,7 @@ func testExport(t *testing.T, f string) {
7272
}
7373
// verify
7474
for i := 0; i < 1000; i++ {
75-
v, err := db.Get([]byte(fmt.Sprintf("key-%04d", i)))
75+
v, err := db.Get(fmt.Appendf(nil, "key-%04d", i))
7676
if (i < 5 || i == 42) && err == nil {
7777
t.Fatalf("expected no element at idx %d, got '%v'", i, string(v))
7878
}
@@ -85,7 +85,7 @@ func testExport(t *testing.T, f string) {
8585
}
8686
}
8787
}
88-
v, err := db.Get([]byte(fmt.Sprintf("key-%04d", 1000)))
88+
v, err := db.Get(fmt.Appendf(nil, "key-%04d", 1000))
8989
if err == nil {
9090
t.Fatalf("expected no element at idx %d, got '%v'", 1000, string(v))
9191
}
@@ -120,7 +120,7 @@ func (iter *deletionIterator) Next() (byte, []byte, []byte, bool) {
120120
if iter.index == 42 {
121121
iter.index += 1
122122
}
123-
return OpBatchDel, []byte(fmt.Sprintf("key-%04d", iter.index)), nil, true
123+
return OpBatchDel, fmt.Appendf(nil, "key-%04d", iter.index), nil, true
124124
}
125125

126126
func (iter *deletionIterator) Release() {}
@@ -132,14 +132,14 @@ func testDeletion(t *testing.T, f string) {
132132
}
133133
db := rawdb.NewMemoryDatabase()
134134
for i := 0; i < 1000; i++ {
135-
db.Put([]byte(fmt.Sprintf("key-%04d", i)), []byte(fmt.Sprintf("value %d", i)))
135+
db.Put(fmt.Appendf(nil, "key-%04d", i), fmt.Appendf(nil, "value %d", i))
136136
}
137137
err = ImportLDBData(db, f, 5, make(chan struct{}))
138138
if err != nil {
139139
t.Fatal(err)
140140
}
141141
for i := 0; i < 1000; i++ {
142-
v, err := db.Get([]byte(fmt.Sprintf("key-%04d", i)))
142+
v, err := db.Get(fmt.Appendf(nil, "key-%04d", i))
143143
if i < 5 || i == 42 {
144144
if err != nil {
145145
t.Fatalf("expected element at idx %d, got '%v'", i, err)

‎common/math/big.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (i *HexOrDecimal256) MarshalText() ([]byte, error) {
7272
if i == nil {
7373
return []byte("0x0"), nil
7474
}
75-
return []byte(fmt.Sprintf("%#x", (*big.Int)(i))), nil
75+
return fmt.Appendf(nil, "%#x", (*big.Int)(i)), nil
7676
}
7777

7878
// Decimal256 unmarshals big.Int as a decimal string. When unmarshalling,

‎common/math/integer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (i *HexOrDecimal64) UnmarshalText(input []byte) error {
4848

4949
// MarshalText implements encoding.TextMarshaler.
5050
func (i HexOrDecimal64) MarshalText() ([]byte, error) {
51-
return []byte(fmt.Sprintf("%#x", uint64(i))), nil
51+
return fmt.Appendf(nil, "%#x", uint64(i)), nil
5252
}
5353

5454
// ParseUint64 parses s as an integer in decimal or hexadecimal syntax.

‎core/state/snapshot/generate_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ func testGenerateWithManyExtraAccounts(t *testing.T, scheme string) {
655655
for i := 0; i < 1000; i++ {
656656
acc := &types.StateAccount{Balance: uint256.NewInt(uint64(i)), Root: types.EmptyRootHash, CodeHash: types.EmptyCodeHash.Bytes()}
657657
val, _ := rlp.EncodeToBytes(acc)
658-
key := hashData([]byte(fmt.Sprintf("acc-%d", i)))
658+
key := hashData(fmt.Appendf(nil, "acc-%d", i))
659659
rawdb.WriteAccountSnapshot(helper.diskdb, key, val)
660660
}
661661
}

‎core/state/snapshot/iterator_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -329,27 +329,27 @@ func TestAccountIteratorTraversalValues(t *testing.T) {
329329
h = make(map[common.Hash][]byte)
330330
)
331331
for i := byte(2); i < 0xff; i++ {
332-
a[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 0, i))
332+
a[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 0, i)
333333
if i > 20 && i%2 == 0 {
334-
b[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 1, i))
334+
b[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 1, i)
335335
}
336336
if i%4 == 0 {
337-
c[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 2, i))
337+
c[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 2, i)
338338
}
339339
if i%7 == 0 {
340-
d[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 3, i))
340+
d[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 3, i)
341341
}
342342
if i%8 == 0 {
343-
e[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 4, i))
343+
e[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 4, i)
344344
}
345345
if i > 50 || i < 85 {
346-
f[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 5, i))
346+
f[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 5, i)
347347
}
348348
if i%64 == 0 {
349-
g[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 6, i))
349+
g[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 6, i)
350350
}
351351
if i%128 == 0 {
352-
h[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 7, i))
352+
h[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 7, i)
353353
}
354354
}
355355
// Assemble a stack of snapshots from the account layers
@@ -428,27 +428,27 @@ func TestStorageIteratorTraversalValues(t *testing.T) {
428428
h = make(map[common.Hash][]byte)
429429
)
430430
for i := byte(2); i < 0xff; i++ {
431-
a[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 0, i))
431+
a[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 0, i)
432432
if i > 20 && i%2 == 0 {
433-
b[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 1, i))
433+
b[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 1, i)
434434
}
435435
if i%4 == 0 {
436-
c[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 2, i))
436+
c[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 2, i)
437437
}
438438
if i%7 == 0 {
439-
d[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 3, i))
439+
d[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 3, i)
440440
}
441441
if i%8 == 0 {
442-
e[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 4, i))
442+
e[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 4, i)
443443
}
444444
if i > 50 || i < 85 {
445-
f[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 5, i))
445+
f[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 5, i)
446446
}
447447
if i%64 == 0 {
448-
g[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 6, i))
448+
g[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 6, i)
449449
}
450450
if i%128 == 0 {
451-
h[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 7, i))
451+
h[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 7, i)
452452
}
453453
}
454454
// Assemble a stack of snapshots from the account layers

‎p2p/nat/nat.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ type ExtIP net.IP
140140

141141
func (n ExtIP) ExternalIP() (net.IP, error) { return net.IP(n), nil }
142142
func (n ExtIP) String() string { return fmt.Sprintf("ExtIP(%v)", net.IP(n)) }
143-
func (n ExtIP) MarshalText() ([]byte, error) { return []byte(fmt.Sprintf("extip:%v", net.IP(n))), nil }
143+
func (n ExtIP) MarshalText() ([]byte, error) { return fmt.Appendf(nil, "extip:%v", net.IP(n)), nil }
144144

145145
// These do nothing.
146146

‎p2p/nat/natpmp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (n *pmp) DeleteMapping(protocol string, extport, intport int) (err error) {
7171
}
7272

7373
func (n *pmp) MarshalText() ([]byte, error) {
74-
return []byte(fmt.Sprintf("natpmp:%v", n.gw)), nil
74+
return fmt.Appendf(nil, "natpmp:%v", n.gw), nil
7575
}
7676

7777
func discoverPMP() Interface {

‎signer/core/apitypes/signed_data_internal_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ func TestTypedDataArrayValidate(t *testing.T) {
282282
messageHash, tErr := td.HashStruct(td.PrimaryType, td.Message)
283283
assert.NoError(t, tErr, "failed to hash message: %v", tErr)
284284

285-
digest := crypto.Keccak256Hash([]byte(fmt.Sprintf("%s%s%s", "\x19\x01", string(domainSeparator), string(messageHash))))
285+
digest := crypto.Keccak256Hash(fmt.Appendf(nil, "%s%s%s", "\x19\x01", string(domainSeparator), string(messageHash)))
286286
assert.Equal(t, tc.Digest, digest.String(), "digest doesn't not match")
287287

288288
assert.NoError(t, td.validate(), "validation failed", tErr)

‎signer/core/signed_data_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ func sign(typedData apitypes.TypedData) ([]byte, []byte, error) {
369369
if err != nil {
370370
return nil, nil, err
371371
}
372-
rawData := []byte(fmt.Sprintf("\x19\x01%s%s", string(domainSeparator), string(typedDataHash)))
372+
rawData := fmt.Appendf(nil, "\x19\x01%s%s", string(domainSeparator), string(typedDataHash))
373373
sighash := crypto.Keccak256(rawData)
374374
return typedDataHash, sighash, nil
375375
}

‎triedb/pathdb/iterator_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -371,27 +371,27 @@ func TestAccountIteratorTraversalValues(t *testing.T) {
371371
h = make(map[common.Hash][]byte)
372372
)
373373
for i := byte(2); i < 0xff; i++ {
374-
a[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 0, i))
374+
a[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 0, i)
375375
if i > 20 && i%2 == 0 {
376-
b[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 1, i))
376+
b[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 1, i)
377377
}
378378
if i%4 == 0 {
379-
c[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 2, i))
379+
c[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 2, i)
380380
}
381381
if i%7 == 0 {
382-
d[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 3, i))
382+
d[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 3, i)
383383
}
384384
if i%8 == 0 {
385-
e[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 4, i))
385+
e[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 4, i)
386386
}
387387
if i > 50 || i < 85 {
388-
f[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 5, i))
388+
f[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 5, i)
389389
}
390390
if i%64 == 0 {
391-
g[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 6, i))
391+
g[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 6, i)
392392
}
393393
if i%128 == 0 {
394-
h[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 7, i))
394+
h[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 7, i)
395395
}
396396
}
397397
// Assemble a stack of snapshots from the account layers
@@ -480,27 +480,27 @@ func TestStorageIteratorTraversalValues(t *testing.T) {
480480
h = make(map[common.Hash][]byte)
481481
)
482482
for i := byte(2); i < 0xff; i++ {
483-
a[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 0, i))
483+
a[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 0, i)
484484
if i > 20 && i%2 == 0 {
485-
b[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 1, i))
485+
b[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 1, i)
486486
}
487487
if i%4 == 0 {
488-
c[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 2, i))
488+
c[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 2, i)
489489
}
490490
if i%7 == 0 {
491-
d[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 3, i))
491+
d[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 3, i)
492492
}
493493
if i%8 == 0 {
494-
e[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 4, i))
494+
e[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 4, i)
495495
}
496496
if i > 50 || i < 85 {
497-
f[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 5, i))
497+
f[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 5, i)
498498
}
499499
if i%64 == 0 {
500-
g[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 6, i))
500+
g[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 6, i)
501501
}
502502
if i%128 == 0 {
503-
h[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 7, i))
503+
h[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 7, i)
504504
}
505505
}
506506
// Assemble a stack of snapshots from the account layers

0 commit comments

Comments
 (0)