Skip to content

Commit 0381bc7

Browse files
authored
refactor: replace []byte(fmt.Sprintf) with fmt.Appendf (#5209)
Signed-off-by: findnature <[email protected]>
1 parent 66ab1b9 commit 0381bc7

File tree

24 files changed

+43
-43
lines changed

24 files changed

+43
-43
lines changed

common/policies/policy_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func TestPrincipalUniqueSet(t *testing.T) {
202202
addPrincipal := func(i int) {
203203
principalSet = append(principalSet, &msp.MSPPrincipal{
204204
PrincipalClassification: msp.MSPPrincipal_Classification(i),
205-
Principal: []byte(fmt.Sprintf("%d", i)),
205+
Principal: fmt.Appendf(nil, "%d", i),
206206
})
207207
}
208208

@@ -234,7 +234,7 @@ func TestPrincipalSetContainingOnly(t *testing.T) {
234234
for i := 0; i < 10; i++ {
235235
principalSet = append(principalSet, &msp.MSPPrincipal{
236236
PrincipalClassification: msp.MSPPrincipal_IDENTITY,
237-
Principal: []byte(fmt.Sprintf("%d", j*10+i)),
237+
Principal: fmt.Appendf(nil, "%d", j*10+i),
238238
})
239239
}
240240
principalSets = append(principalSets, principalSet)

core/ledger/kvledger/benchmark/experiments/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func constructJSONValue(keyNumber int, kvSize int) []byte {
9090
}
9191

9292
func constructValuePrefix(keyNumber int) []byte {
93-
return []byte(fmt.Sprintf("%s%09d", "value_", keyNumber))
93+
return fmt.Appendf(nil, "%s%09d", "value_", keyNumber)
9494
}
9595

9696
func verifyValue(keyNumber int, value []byte) bool {

core/ledger/kvledger/kv_ledger_provider_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ func TestMultipleLedgerBasicRW(t *testing.T) {
386386
ledgers[i] = l
387387
txid := util.GenerateUUID()
388388
s, _ := l.NewTxSimulator(txid)
389-
err = s.SetState("ns", "testKey", []byte(fmt.Sprintf("testValue_%d", i)))
389+
err = s.SetState("ns", "testKey", fmt.Appendf(nil, "testValue_%d", i))
390390
s.Done()
391391
require.NoError(t, err)
392392
res, err := s.GetTxSimulationResults()
@@ -414,7 +414,7 @@ func TestMultipleLedgerBasicRW(t *testing.T) {
414414
val, err := q.GetState("ns", "testKey")
415415
q.Done()
416416
require.NoError(t, err)
417-
require.Equal(t, []byte(fmt.Sprintf("testValue_%d", i)), val)
417+
require.Equal(t, fmt.Appendf(nil, "testValue_%d", i), val)
418418
l.Close()
419419
}
420420
}

core/ledger/kvledger/rwset_backward_compatibility_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func testGenerateSampleRWSet(t *testing.T) []byte {
6262
simulator, err := ledger.NewTxSimulator(txid)
6363
require.NoError(t, err)
6464
for i := 0; i < 10011; i++ {
65-
require.NoError(t, simulator.SetState("ns1", fmt.Sprintf("key-%000d", i), []byte(fmt.Sprintf("value-%000d", i))))
65+
require.NoError(t, simulator.SetState("ns1", fmt.Sprintf("key-%000d", i), fmt.Appendf(nil, "value-%000d", i)))
6666
}
6767
simulator.Done()
6868
simRes, err := simulator.GetTxSimulationResults()
@@ -76,7 +76,7 @@ func testGenerateSampleRWSet(t *testing.T) []byte {
7676
require.NoError(t, err)
7777
_, err = simulator.GetState("ns1", fmt.Sprintf("key-%000d", 5))
7878
require.NoError(t, err)
79-
require.NoError(t, simulator.SetState("ns1", fmt.Sprintf("key-%000d", 6), []byte(fmt.Sprintf("value-%000d-new", 6))))
79+
require.NoError(t, simulator.SetState("ns1", fmt.Sprintf("key-%000d", 6), fmt.Appendf(nil, "value-%000d-new", 6)))
8080
itr, err := simulator.GetStateRangeScanIterator("ns1", "", "")
8181
require.NoError(t, err)
8282
numKVs := 0

core/ledger/kvledger/snapshot_mgmt_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ func testutilCommitBlocks(t *testing.T, l ledger.PeerLedger, bg *testutil.BlockG
366366
txid := util.GenerateUUID()
367367
simulator, err := l.NewTxSimulator(txid)
368368
require.NoError(t, err)
369-
require.NoError(t, simulator.SetState("ns1", fmt.Sprintf("key%d", i), []byte(fmt.Sprintf("value%d", i))))
369+
require.NoError(t, simulator.SetState("ns1", fmt.Sprintf("key%d", i), fmt.Appendf(nil, "value%d", i)))
370370
simulator.Done()
371371
require.NoError(t, err)
372372
simRes, err := simulator.GetTxSimulationResults()

core/ledger/kvledger/tests/customtx_processor_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func TestReadWriteCustomTxProcessor(t *testing.T) {
5353
require.NoError(t, err)
5454
require.Equal(t, []byte("value1"), valKey1)
5555
valueCounter++
56-
return s.SetState("ns", "key1", []byte(fmt.Sprintf("value1_%d", valueCounter)))
56+
return s.SetState("ns", "key1", fmt.Appendf(nil, "value1_%d", valueCounter))
5757
}
5858

5959
// block-2 with two post order transactions

core/ledger/kvledger/txmgmt/privacyenabledstate/snapshot_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ func testSnapshot(t *testing.T, env TestEnv) {
5050
Key: fmt.Sprintf("key-%d", i),
5151
},
5252
VersionedValue: &statedb.VersionedValue{
53-
Value: []byte(fmt.Sprintf("value-for-key-%d-for-%s", i, ns)),
53+
Value: fmt.Appendf(nil, "value-for-key-%d-for-%s", i, ns),
5454
Version: version.NewHeight(1, 1),
55-
Metadata: []byte(fmt.Sprintf("metadata-for-key-%d-for-%s", i, ns)),
55+
Metadata: fmt.Appendf(nil, "metadata-for-key-%d-for-%s", i, ns),
5656
},
5757
}
5858
sampleData = append(sampleData, sampleKV)

core/ledger/kvledger/txmgmt/privacyenabledstate/types_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestBatch(t *testing.T) {
3333
for j := 0; j < 5; j++ {
3434
for k := 0; k < 5; k++ {
3535
batch.Put(fmt.Sprintf("ns-%d", i), fmt.Sprintf("collection-%d", j), fmt.Sprintf("key-%d", k),
36-
[]byte(fmt.Sprintf("value-%d-%d-%d", i, j, k)), v)
36+
fmt.Appendf(nil, "value-%d-%d-%d", i, j, k), v)
3737
}
3838
}
3939
}
@@ -43,7 +43,7 @@ func TestBatch(t *testing.T) {
4343
vv := batch.Get(fmt.Sprintf("ns-%d", i), fmt.Sprintf("collection-%d", j), fmt.Sprintf("key-%d", k))
4444
require.NotNil(t, vv)
4545
require.Equal(t,
46-
&statedb.VersionedValue{Value: []byte(fmt.Sprintf("value-%d-%d-%d", i, j, k)), Version: v},
46+
&statedb.VersionedValue{Value: fmt.Appendf(nil, "value-%d-%d-%d", i, j, k), Version: v},
4747
vv)
4848
}
4949
}

core/ledger/kvledger/txmgmt/pvtstatepurgemgmt/expiry_keeper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestExpiryKeeper(t *testing.T) {
8888
func buildPvtdataKeysForTest(startingEntry int, numEntries int) *PvtdataKeys {
8989
pvtdataKeys := newPvtdataKeys()
9090
for i := startingEntry; i <= startingEntry+numEntries; i++ {
91-
pvtdataKeys.add(fmt.Sprintf("ns-%d", i), fmt.Sprintf("coll-%d", i), fmt.Sprintf("key-%d", i), []byte(fmt.Sprintf("key-%d-hash", i)))
91+
pvtdataKeys.add(fmt.Sprintf("ns-%d", i), fmt.Sprintf("coll-%d", i), fmt.Sprintf("key-%d", i), fmt.Appendf(nil, "key-%d-hash", i))
9292
}
9393
return pvtdataKeys
9494
}

core/ledger/kvledger/txmgmt/statedb/commontests/test_common.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ func TestDataExportImport(
10401040
},
10411041
VersionedValue: &statedb.VersionedValue{
10421042
Version: version.NewHeight(1, 1),
1043-
Metadata: []byte(fmt.Sprintf("metadata-for-key-%d-for-%s", i, ns)),
1043+
Metadata: fmt.Appendf(nil, "metadata-for-key-%d-for-%s", i, ns),
10441044
},
10451045
}
10461046
switch {
@@ -1145,7 +1145,7 @@ func CreateTestData(t *testing.T, db statedb.VersionedDB, ns string, numKeys int
11451145
expectedKeys := make([]string, numKeys)
11461146
for i := 0; i < numKeys; i++ {
11471147
expectedKeys[i] = fmt.Sprintf("key%d", i)
1148-
vv := statedb.VersionedValue{Value: []byte(fmt.Sprintf("value%d", i)), Version: version.NewHeight(1, uint64(i+1))}
1148+
vv := statedb.VersionedValue{Value: fmt.Appendf(nil, "value%d", i), Version: version.NewHeight(1, uint64(i+1))}
11491149
batch.Put(ns, expectedKeys[i], vv.Value, vv.Version)
11501150
}
11511151
savePoint := version.NewHeight(1, uint64(numKeys))

0 commit comments

Comments
 (0)