all: replaces `[]byte(fmt.Sprintf(...))` by `fmt.Appendf(nil, ...)`

This commit is contained in:
islishude 2025-03-01 23:22:01 +08:00
parent 31c972febf
commit 10c2a7efd6
10 changed files with 46 additions and 46 deletions

View File

@ -54,8 +54,8 @@ func (iter *testIterator) Next() (byte, []byte, []byte, bool) {
if iter.index == 42 { if iter.index == 42 {
iter.index += 1 iter.index += 1
} }
return OpBatchAdd, []byte(fmt.Sprintf("key-%04d", iter.index)), return OpBatchAdd, fmt.Appendf(nil, "key-%04d", iter.index),
[]byte(fmt.Sprintf("value %d", iter.index)), true fmt.Appendf(nil, "value %d", iter.index), true
} }
func (iter *testIterator) Release() {} func (iter *testIterator) Release() {}
@ -72,7 +72,7 @@ func testExport(t *testing.T, f string) {
} }
// verify // verify
for i := 0; i < 1000; i++ { for i := 0; i < 1000; i++ {
v, err := db.Get([]byte(fmt.Sprintf("key-%04d", i))) v, err := db.Get(fmt.Appendf(nil, "key-%04d", i))
if (i < 5 || i == 42) && err == nil { if (i < 5 || i == 42) && err == nil {
t.Fatalf("expected no element at idx %d, got '%v'", i, string(v)) t.Fatalf("expected no element at idx %d, got '%v'", i, string(v))
} }
@ -85,7 +85,7 @@ func testExport(t *testing.T, f string) {
} }
} }
} }
v, err := db.Get([]byte(fmt.Sprintf("key-%04d", 1000))) v, err := db.Get(fmt.Appendf(nil, "key-%04d", 1000))
if err == nil { if err == nil {
t.Fatalf("expected no element at idx %d, got '%v'", 1000, string(v)) t.Fatalf("expected no element at idx %d, got '%v'", 1000, string(v))
} }
@ -120,7 +120,7 @@ func (iter *deletionIterator) Next() (byte, []byte, []byte, bool) {
if iter.index == 42 { if iter.index == 42 {
iter.index += 1 iter.index += 1
} }
return OpBatchDel, []byte(fmt.Sprintf("key-%04d", iter.index)), nil, true return OpBatchDel, fmt.Appendf(nil, "key-%04d", iter.index), nil, true
} }
func (iter *deletionIterator) Release() {} func (iter *deletionIterator) Release() {}
@ -132,14 +132,14 @@ func testDeletion(t *testing.T, f string) {
} }
db := rawdb.NewMemoryDatabase() db := rawdb.NewMemoryDatabase()
for i := 0; i < 1000; i++ { for i := 0; i < 1000; i++ {
db.Put([]byte(fmt.Sprintf("key-%04d", i)), []byte(fmt.Sprintf("value %d", i))) db.Put(fmt.Appendf(nil, "key-%04d", i), fmt.Appendf(nil, "value %d", i))
} }
err = ImportLDBData(db, f, 5, make(chan struct{})) err = ImportLDBData(db, f, 5, make(chan struct{}))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
for i := 0; i < 1000; i++ { for i := 0; i < 1000; i++ {
v, err := db.Get([]byte(fmt.Sprintf("key-%04d", i))) v, err := db.Get(fmt.Appendf(nil, "key-%04d", i))
if i < 5 || i == 42 { if i < 5 || i == 42 {
if err != nil { if err != nil {
t.Fatalf("expected element at idx %d, got '%v'", i, err) t.Fatalf("expected element at idx %d, got '%v'", i, err)

View File

@ -72,7 +72,7 @@ func (i *HexOrDecimal256) MarshalText() ([]byte, error) {
if i == nil { if i == nil {
return []byte("0x0"), nil return []byte("0x0"), nil
} }
return []byte(fmt.Sprintf("%#x", (*big.Int)(i))), nil return fmt.Appendf(nil, "%#x", (*big.Int)(i)), nil
} }
// Decimal256 unmarshals big.Int as a decimal string. When unmarshalling, // Decimal256 unmarshals big.Int as a decimal string. When unmarshalling,

View File

@ -48,7 +48,7 @@ func (i *HexOrDecimal64) UnmarshalText(input []byte) error {
// MarshalText implements encoding.TextMarshaler. // MarshalText implements encoding.TextMarshaler.
func (i HexOrDecimal64) MarshalText() ([]byte, error) { func (i HexOrDecimal64) MarshalText() ([]byte, error) {
return []byte(fmt.Sprintf("%#x", uint64(i))), nil return fmt.Appendf(nil, "%#x", uint64(i)), nil
} }
// ParseUint64 parses s as an integer in decimal or hexadecimal syntax. // ParseUint64 parses s as an integer in decimal or hexadecimal syntax.

View File

@ -655,7 +655,7 @@ func testGenerateWithManyExtraAccounts(t *testing.T, scheme string) {
for i := 0; i < 1000; i++ { for i := 0; i < 1000; i++ {
acc := &types.StateAccount{Balance: uint256.NewInt(uint64(i)), Root: types.EmptyRootHash, CodeHash: types.EmptyCodeHash.Bytes()} acc := &types.StateAccount{Balance: uint256.NewInt(uint64(i)), Root: types.EmptyRootHash, CodeHash: types.EmptyCodeHash.Bytes()}
val, _ := rlp.EncodeToBytes(acc) val, _ := rlp.EncodeToBytes(acc)
key := hashData([]byte(fmt.Sprintf("acc-%d", i))) key := hashData(fmt.Appendf(nil, "acc-%d", i))
rawdb.WriteAccountSnapshot(helper.diskdb, key, val) rawdb.WriteAccountSnapshot(helper.diskdb, key, val)
} }
} }

View File

@ -329,27 +329,27 @@ func TestAccountIteratorTraversalValues(t *testing.T) {
h = make(map[common.Hash][]byte) h = make(map[common.Hash][]byte)
) )
for i := byte(2); i < 0xff; i++ { for i := byte(2); i < 0xff; i++ {
a[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 0, i)) a[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 0, i)
if i > 20 && i%2 == 0 { if i > 20 && i%2 == 0 {
b[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 1, i)) b[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 1, i)
} }
if i%4 == 0 { if i%4 == 0 {
c[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 2, i)) c[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 2, i)
} }
if i%7 == 0 { if i%7 == 0 {
d[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 3, i)) d[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 3, i)
} }
if i%8 == 0 { if i%8 == 0 {
e[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 4, i)) e[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 4, i)
} }
if i > 50 || i < 85 { if i > 50 || i < 85 {
f[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 5, i)) f[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 5, i)
} }
if i%64 == 0 { if i%64 == 0 {
g[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 6, i)) g[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 6, i)
} }
if i%128 == 0 { if i%128 == 0 {
h[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 7, i)) h[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 7, i)
} }
} }
// Assemble a stack of snapshots from the account layers // Assemble a stack of snapshots from the account layers
@ -428,27 +428,27 @@ func TestStorageIteratorTraversalValues(t *testing.T) {
h = make(map[common.Hash][]byte) h = make(map[common.Hash][]byte)
) )
for i := byte(2); i < 0xff; i++ { for i := byte(2); i < 0xff; i++ {
a[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 0, i)) a[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 0, i)
if i > 20 && i%2 == 0 { if i > 20 && i%2 == 0 {
b[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 1, i)) b[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 1, i)
} }
if i%4 == 0 { if i%4 == 0 {
c[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 2, i)) c[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 2, i)
} }
if i%7 == 0 { if i%7 == 0 {
d[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 3, i)) d[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 3, i)
} }
if i%8 == 0 { if i%8 == 0 {
e[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 4, i)) e[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 4, i)
} }
if i > 50 || i < 85 { if i > 50 || i < 85 {
f[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 5, i)) f[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 5, i)
} }
if i%64 == 0 { if i%64 == 0 {
g[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 6, i)) g[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 6, i)
} }
if i%128 == 0 { if i%128 == 0 {
h[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 7, i)) h[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 7, i)
} }
} }
// Assemble a stack of snapshots from the account layers // Assemble a stack of snapshots from the account layers

View File

@ -140,7 +140,7 @@ type ExtIP net.IP
func (n ExtIP) ExternalIP() (net.IP, error) { return net.IP(n), nil } func (n ExtIP) ExternalIP() (net.IP, error) { return net.IP(n), nil }
func (n ExtIP) String() string { return fmt.Sprintf("ExtIP(%v)", net.IP(n)) } func (n ExtIP) String() string { return fmt.Sprintf("ExtIP(%v)", net.IP(n)) }
func (n ExtIP) MarshalText() ([]byte, error) { return []byte(fmt.Sprintf("extip:%v", net.IP(n))), nil } func (n ExtIP) MarshalText() ([]byte, error) { return fmt.Appendf(nil, "extip:%v", net.IP(n)), nil }
// These do nothing. // These do nothing.

View File

@ -71,7 +71,7 @@ func (n *pmp) DeleteMapping(protocol string, extport, intport int) (err error) {
} }
func (n *pmp) MarshalText() ([]byte, error) { func (n *pmp) MarshalText() ([]byte, error) {
return []byte(fmt.Sprintf("natpmp:%v", n.gw)), nil return fmt.Appendf(nil, "natpmp:%v", n.gw), nil
} }
func discoverPMP() Interface { func discoverPMP() Interface {

View File

@ -282,7 +282,7 @@ func TestTypedDataArrayValidate(t *testing.T) {
messageHash, tErr := td.HashStruct(td.PrimaryType, td.Message) messageHash, tErr := td.HashStruct(td.PrimaryType, td.Message)
assert.NoError(t, tErr, "failed to hash message: %v", tErr) assert.NoError(t, tErr, "failed to hash message: %v", tErr)
digest := crypto.Keccak256Hash([]byte(fmt.Sprintf("%s%s%s", "\x19\x01", string(domainSeparator), string(messageHash)))) digest := crypto.Keccak256Hash(fmt.Appendf(nil, "%s%s%s", "\x19\x01", string(domainSeparator), string(messageHash)))
assert.Equal(t, tc.Digest, digest.String(), "digest doesn't not match") assert.Equal(t, tc.Digest, digest.String(), "digest doesn't not match")
assert.NoError(t, td.validate(), "validation failed", tErr) assert.NoError(t, td.validate(), "validation failed", tErr)

View File

@ -369,7 +369,7 @@ func sign(typedData apitypes.TypedData) ([]byte, []byte, error) {
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
rawData := []byte(fmt.Sprintf("\x19\x01%s%s", string(domainSeparator), string(typedDataHash))) rawData := fmt.Appendf(nil, "\x19\x01%s%s", string(domainSeparator), string(typedDataHash))
sighash := crypto.Keccak256(rawData) sighash := crypto.Keccak256(rawData)
return typedDataHash, sighash, nil return typedDataHash, sighash, nil
} }

View File

@ -371,27 +371,27 @@ func TestAccountIteratorTraversalValues(t *testing.T) {
h = make(map[common.Hash][]byte) h = make(map[common.Hash][]byte)
) )
for i := byte(2); i < 0xff; i++ { for i := byte(2); i < 0xff; i++ {
a[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 0, i)) a[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 0, i)
if i > 20 && i%2 == 0 { if i > 20 && i%2 == 0 {
b[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 1, i)) b[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 1, i)
} }
if i%4 == 0 { if i%4 == 0 {
c[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 2, i)) c[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 2, i)
} }
if i%7 == 0 { if i%7 == 0 {
d[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 3, i)) d[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 3, i)
} }
if i%8 == 0 { if i%8 == 0 {
e[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 4, i)) e[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 4, i)
} }
if i > 50 || i < 85 { if i > 50 || i < 85 {
f[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 5, i)) f[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 5, i)
} }
if i%64 == 0 { if i%64 == 0 {
g[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 6, i)) g[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 6, i)
} }
if i%128 == 0 { if i%128 == 0 {
h[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 7, i)) h[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 7, i)
} }
} }
// Assemble a stack of snapshots from the account layers // Assemble a stack of snapshots from the account layers
@ -480,27 +480,27 @@ func TestStorageIteratorTraversalValues(t *testing.T) {
h = make(map[common.Hash][]byte) h = make(map[common.Hash][]byte)
) )
for i := byte(2); i < 0xff; i++ { for i := byte(2); i < 0xff; i++ {
a[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 0, i)) a[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 0, i)
if i > 20 && i%2 == 0 { if i > 20 && i%2 == 0 {
b[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 1, i)) b[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 1, i)
} }
if i%4 == 0 { if i%4 == 0 {
c[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 2, i)) c[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 2, i)
} }
if i%7 == 0 { if i%7 == 0 {
d[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 3, i)) d[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 3, i)
} }
if i%8 == 0 { if i%8 == 0 {
e[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 4, i)) e[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 4, i)
} }
if i > 50 || i < 85 { if i > 50 || i < 85 {
f[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 5, i)) f[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 5, i)
} }
if i%64 == 0 { if i%64 == 0 {
g[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 6, i)) g[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 6, i)
} }
if i%128 == 0 { if i%128 == 0 {
h[common.Hash{i}] = []byte(fmt.Sprintf("layer-%d, key %d", 7, i)) h[common.Hash{i}] = fmt.Appendf(nil, "layer-%d, key %d", 7, i)
} }
} }
// Assemble a stack of snapshots from the account layers // Assemble a stack of snapshots from the account layers