FIX: b1342f7 use constraint_tracker in unit tests that print constraint numbers

Author: dtebbs

libsnark/gadgetlib1/tests/test_r1cs_gg_ppzksnark_verifier_gadget.cpp

@@ -26,9 +26,7 @@ static constraints_tracker constraints;
 
 /// This test generates a valid proof and checks that this valid proof
 /// is succesfully verified by the groth16 verifier gadget
-template<typename ppT_A, typename ppT_B>
-void test_verifier(
-    const std::string &annotation_A, const std::string &annotation_B)
+template<typename ppT_A, typename ppT_B> void test_verifier()
 {
     using FieldT_A = libff::Fr<ppT_A>;
     using FieldT_B = libff::Fr<ppT_B>;
@@ -106,13 +104,10 @@ void test_verifier(
     PRINT_CONSTRAINT_PROFILING();
 
     constraints.add_measurement<ppT_B>(
-        "r1cs_gg_ppzksnark_verifier - " + annotation_B + " - " + annotation_A,
-        pb.num_constraints());
+        "r1cs_gg_ppzksnark_verifier - " + ppT_A::name, pb.num_constraints());
 }
 
-template<typename ppT_A, typename ppT_B>
-void test_hardcoded_verifier(
-    const std::string &annotation_A, const std::string &annotation_B)
+template<typename ppT_A, typename ppT_B> void test_hardcoded_verifier()
 {
     using FieldT_A = libff::Fr<ppT_A>;
     using FieldT_B = libff::Fr<ppT_B>;
@@ -192,27 +187,24 @@ void test_hardcoded_verifier(
     PRINT_CONSTRAINT_PROFILING();
 
     constraints.add_measurement<ppT_B>(
-        "r1cs_gg_ppzksnark_verifier - hardcoded - " + annotation_B + " - " +
-            annotation_A,
+        "r1cs_gg_ppzksnark_verifier - hardcoded - " + ppt_A::name,
         pb.num_constraints());
 }
 
 TEST(Groth16VerifierGadgetTests, MntGroth16VerifierGadget)
 {
-    test_verifier<libff::mnt4_pp, libff::mnt6_pp>("mnt4", "mnt6");
-    test_verifier<libff::mnt6_pp, libff::mnt4_pp>("mnt6", "mnt4");
+    test_verifier<libff::mnt4_pp, libff::mnt6_pp>();
+    test_verifier<libff::mnt6_pp, libff::mnt4_pp>();
 
-    test_hardcoded_verifier<libff::mnt4_pp, libff::mnt6_pp>("mnt4", "mnt6");
-    test_hardcoded_verifier<libff::mnt6_pp, libff::mnt4_pp>("mnt6", "mnt4");
+    test_hardcoded_verifier<libff::mnt4_pp, libff::mnt6_pp>();
+    test_hardcoded_verifier<libff::mnt6_pp, libff::mnt4_pp>();
 }
 
 TEST(Groth16VerifierGadgetTests, BlsGroth16VerifierGadget)
 {
-    test_verifier<libff::bls12_377_pp, libff::bw6_761_pp>(
-        "bls12-377", "bw6-761");
+    test_verifier<libff::bls12_377_pp, libff::bw6_761_pp>();
 
-    test_hardcoded_verifier<libff::bls12_377_pp, libff::bw6_761_pp>(
-        "bls12-377", "bw6-761");
+    test_hardcoded_verifier<libff::bls12_377_pp, libff::bw6_761_pp>();
 }
 
 } // namespace