Remove non-Groth16 Sprout proofs from joinsplit gtests

src/gtest/test_joinsplit.cpp

@@ -22,10 +22,9 @@ using namespace libzcash;
 
 extern ZCJoinSplit* params;
 
-typedef std::array<JSDescription, 2> SproutProofs;
-// Make both the PHGR and Groth proof for a Sprout statement,
-// and store the results in JSDescription objects.
-SproutProofs makeSproutProofs(
+// Make the Groth proof for a Sprout statement,
+// and store the result in a JSDescription object.
+JSDescription makeSproutProof(
         ZCJoinSplit& js,
         const std::array<JSInput, 2>& inputs,
         const std::array<JSOutput, 2>& outputs,
@@ -34,25 +33,17 @@ SproutProofs makeSproutProofs(
         uint64_t vpub_new,
         const uint256& rt
 ){
-    //Making the PHGR proof
-    JSDescription phgr(false, js, joinSplitPubKey, rt, inputs, outputs, vpub_old, vpub_new);
-    //Making the Groth proof
-    JSDescription groth(true, js, joinSplitPubKey, rt, inputs, outputs, vpub_old, vpub_new);
-
-    return {phgr, groth};
-
+    return JSDescription(true, js, joinSplitPubKey, rt, inputs, outputs, vpub_old, vpub_new);
 }
 
-bool verifySproutProofs(
+bool verifySproutProof(
         ZCJoinSplit& js,
-        const SproutProofs& jsdescs,
+        const JSDescription& jsdesc,
         const uint256& joinSplitPubKey
 )
 {
     auto verifier = libzcash::ProofVerifier::Strict();
-    bool phgrPassed = jsdescs[0].Verify(js, verifier, joinSplitPubKey);
-    bool grothPassed = jsdescs[1].Verify(js, verifier, joinSplitPubKey);
-    return phgrPassed && grothPassed;
+    return jsdesc.Verify(js, verifier, joinSplitPubKey);
 }
 
 
@@ -73,7 +64,7 @@ void test_full_api(ZCJoinSplit* js)
     uint64_t vpub_new = 0;
     uint256 joinSplitPubKey = random_uint256();
     uint256 rt = tree.root();
-    SproutProofs jsdescs;
+    JSDescription jsdesc;
 
     {
         std::array<JSInput, 2> inputs = {
@@ -89,7 +80,7 @@ void test_full_api(ZCJoinSplit* js)
         std::array<SproutNote, 2> output_notes;
 
         // Perform the proofs
-        jsdescs = makeSproutProofs(
+        jsdesc = makeSproutProof(
             *js,
             inputs,
             outputs,
@@ -101,13 +92,11 @@ void test_full_api(ZCJoinSplit* js)
     }
 
     // Verify both PHGR and Groth Proof:
-    ASSERT_TRUE(verifySproutProofs(*js, jsdescs, joinSplitPubKey));
+    ASSERT_TRUE(verifySproutProof(*js, jsdesc, joinSplitPubKey));
 
-    // Run tests using both phgr and groth as basis for field values
-    for (auto jsdesc : jsdescs)
     {
         SproutMerkleTree tree;
-        SproutProofs jsdescs2;
+        JSDescription jsdesc2;
         // Recipient should decrypt
         // Now the recipient should spend the money again
         auto h_sig = js->h_sig(jsdesc.randomSeed, jsdesc.nullifiers, joinSplitPubKey);
@@ -153,7 +142,7 @@ void test_full_api(ZCJoinSplit* js)
 
 
             // Perform the proofs
-            jsdescs2 = makeSproutProofs(
+            jsdesc2 = makeSproutProof(
                 *js,
                 inputs,
                 outputs,
@@ -166,8 +155,8 @@ void test_full_api(ZCJoinSplit* js)
         }
 
 
-        // Verify both PHGR and Groth Proof:
-        ASSERT_TRUE(verifySproutProofs(*js, jsdescs2, joinSplitPubKey2));
+        // Verify Groth Proof:
+        ASSERT_TRUE(verifySproutProof(*js, jsdesc2, joinSplitPubKey2));
     }
 }
 
@@ -191,27 +180,8 @@ void invokeAPI(
 
     std::array<SproutNote, 2> output_notes;
 
-    // PHGR
-    SproutProof proof = js->prove(
-        false,
-        inputs,
-        outputs,
-        output_notes,
-        ciphertexts,
-        ephemeralKey,
-        joinSplitPubKey,
-        randomSeed,
-        macs,
-        nullifiers,
-        commitments,
-        vpub_old,
-        vpub_new,
-        rt,
-        false
-    );
-
     // Groth
-    proof = js->prove(
+    SproutProof proof = js->prove(
         true,
         inputs,
         outputs,