Skip to content

Commit 4e35983

Browse files
committed
Added printout + benchRegression
Signed-off-by: Effi-S <effi.szt@gmail.com>
1 parent ea23c4b commit 4e35983

3 files changed

Lines changed: 74 additions & 1 deletion

File tree

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package main
8+
9+
import (
10+
fscnode "github.com/hyperledger-labs/fabric-smart-client/node"
11+
12+
13+
)
14+
15+
func main() {
16+
n := fscnode.New()
17+
n.Execute(func() error {
18+
return nil
19+
})
20+
}

token/core/zkatdlog/nogh/v1/validator/bench/transfer_service/transfer_bench_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ func BenchmarkTransferService(b *testing.B) {
8181
f := &TransferServiceViewFactory{}
8282
pool, params := CreateViewsWithProofs(b, "", f, defaultNumViews)
8383

84+
fmt.Println("==========")
85+
fmt.Println("Params size:")
86+
fmt.Println("OutputPath:", len(params[0].OutputPath))
87+
fmt.Println("TokenRequestRaw:", len(params[0].TokenData.TokenRequestRaw))
88+
fmt.Println("TxId:", len(params[0].TokenData.TxID))
89+
fmt.Println("==========")
90+
8491
b.Run(fmt.Sprintf("out-tokens=%din-tokens=%d", params[0].NumOutputs(), params[0].NumInputs()), func(b *testing.B) {
8592
b.ResetTimer()
8693
b.RunParallel(func(pb *testing.PB) {

token/core/zkatdlog/nogh/v1/validator/regression/regression_test.go

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import (
1212
"encoding/json"
1313
"fmt"
1414
"path/filepath"
15+
"sync/atomic"
1516
"testing"
1617

18+
"github.com/hyperledger-labs/fabric-smart-client/integration/benchmark"
1719
"github.com/hyperledger-labs/fabric-token-sdk/token"
1820
"github.com/hyperledger-labs/fabric-token-sdk/token/core"
1921
fabtoken "github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken/v1/driver"
@@ -64,6 +66,50 @@ func TestRegression(t *testing.T) {
6466
}
6567
}
6668

69+
func BenchmarkTranferRegression2in2out(b *testing.B) {
70+
rootDir := "testdata/32-BLS12_381_BBS_GURVY"
71+
subFolder := "transfers_i2_o2"
72+
73+
paramsData, err := testDataFS.ReadFile(filepath.Join(rootDir, "params.txt"))
74+
require.NoError(b, err)
75+
ppRaw, err := base64.StdEncoding.DecodeString(string(paramsData))
76+
require.NoError(b, err)
77+
_, tokenValidator, err := tokenServicesFactory(ppRaw)
78+
require.NoError(b, err)
79+
80+
type testVector struct {
81+
ReqRaw []byte `json:"req_raw"`
82+
TXID string `json:"txid"`
83+
}
84+
vectors := make([]testVector, 64)
85+
for i := range vectors {
86+
jsonData, err := testDataFS.ReadFile(
87+
filepath.Join(rootDir, subFolder, fmt.Sprintf("output.%d.json", i)),
88+
)
89+
require.NoError(b, err)
90+
err = json.Unmarshal(jsonData, &vectors[i])
91+
require.NoError(b, err)
92+
}
93+
94+
var idx atomic.Int64
95+
b.Run("2in2out", func(b *testing.B) {
96+
b.ResetTimer()
97+
b.RunParallel(func(pb *testing.PB) {
98+
for pb.Next() {
99+
v := vectors[idx.Add(1)%int64(len(vectors))]
100+
_, _, err := tokenValidator.UnmarshallAndVerifyWithMetadata(
101+
b.Context(),
102+
&fakeLedger{},
103+
token.RequestAnchor(v.TXID),
104+
v.ReqRaw,
105+
)
106+
require.NoError(b, err)
107+
}
108+
})
109+
benchmark.ReportTPS(b)
110+
})
111+
}
112+
67113
func testRegressionParallel(t *testing.T, rootDir, subFolder string) {
68114
t.Helper()
69115
t.Run(fmt.Sprintf("%s-%s", rootDir, subFolder), func(t *testing.T) {
@@ -72,7 +118,7 @@ func testRegressionParallel(t *testing.T, rootDir, subFolder string) {
72118
})
73119
}
74120

75-
func testRegression(t *testing.T, rootDir, subFolder string) {
121+
func testRegression(t testing.TB, rootDir, subFolder string) {
76122
t.Helper()
77123
t.Logf("regression test for [%s:%s]", rootDir, subFolder)
78124
paramsData, err := testDataFS.ReadFile(filepath.Join(rootDir, "params.txt"))

0 commit comments

Comments
 (0)