Fix some benchmarks

Signed-off-by: adir <adir@il.ibm.com>

Author: aaadir

token/core/zkatdlog/nogh/v1/issue/issuer_test.go

@@ -67,10 +67,11 @@ func BenchmarkIssuer(b *testing.B) {
 
 			i := 0
 			for b.Loop() {
-				issuer := issue2.NewIssuer("ABC", &mock.SigningIdentity{}, env.IssuerEnvs[i].pp)
+				e := env.IssuerEnvs[i%len(env.IssuerEnvs)]
+				issuer := issue2.NewIssuer("ABC", &mock.SigningIdentity{}, e.pp)
 				action, _, err := issuer.GenerateZKIssue(
-					env.IssuerEnvs[i].outputValues,
-					env.IssuerEnvs[i].outputOwners,
+					e.outputValues,
+					e.outputOwners,
 				)
 				require.NoError(b, err)
 				_, err = action.Serialize()
@@ -100,16 +101,17 @@ func BenchmarkProofVerificationIssuer(b *testing.B) {
 
 			i := 0
 			for b.Loop() {
+				e := env.IssuerEnvs[i%len(env.IssuerEnvs)]
 				// deserialize action
 				action := &issue2.Action{}
-				require.NoError(b, action.Deserialize(env.IssuerEnvs[i].actionRaw))
+				require.NoError(b, action.Deserialize(e.actionRaw))
 
 				// verify
 				coms := make([]*math.G1, len(action.Outputs))
 				for i := range len(action.Outputs) {
 					coms[i] = action.Outputs[i].Data
 				}
-				require.NoError(b, issue2.NewVerifier(coms, env.IssuerEnvs[i].pp).Verify(action.GetProof()))
+				require.NoError(b, issue2.NewVerifier(coms, e.pp).Verify(action.GetProof()))
 				i++
 			}
 		})

token/core/zkatdlog/nogh/v1/transfer/transfer_test.go

@@ -81,11 +81,12 @@ func BenchmarkTransferProofGeneration(b *testing.B) {
 
 			i := 0
 			for b.Loop() {
+				e := env.ProverEnvs[i%len(env.ProverEnvs)]
 				prover, err := transfer.NewProver(
-					env.ProverEnvs[i].a,
-					env.ProverEnvs[i].b,
-					env.ProverEnvs[i].c,
-					env.ProverEnvs[i].d,
+					e.a,
+					e.b,
+					e.c,
+					e.d,
 					env.pp,
 				)
 				require.NoError(b, err)

token/core/zkatdlog/nogh/v1/transfer_test.go

@@ -73,23 +73,26 @@ func BenchmarkTransferServiceTransfer(b *testing.B) {
 	outputs, err := benchmark2.NumOutputs(1, 2, 3)
 	require.NoError(b, err)
 	testCases := benchmark2.GenerateCases(bits, curves, inputs, outputs, []int{1})
+	configurations, err := benchmark.NewSetupConfigurations("./testdata", bits, curves)
+	require.NoError(b, err)
 
 	for _, tc := range testCases {
 		b.Run(tc.Name, func(b *testing.B) {
-			env, err := newBenchmarkTransferEnv(b.N, tc.BenchmarkCase, nil)
+			env, err := newBenchmarkTransferEnv(b.N, tc.BenchmarkCase, configurations)
 			require.NoError(b, err)
 
 			// Optional: Reset timer if you had expensive setup code above
 			b.ResetTimer()
 
 			i := 0
 			for b.Loop() {
-				action, _, err := env.Envs[i].ts.Transfer(
+				e := env.Envs[i%len(env.Envs)]
+				action, _, err := e.ts.Transfer(
 					b.Context(),
 					"an_anchor",
 					nil,
-					env.Envs[i].ids,
-					env.Envs[i].outputs,
+					e.ids,
+					e.outputs,
 					nil,
 				)
 				require.NoError(b, err)