Adjust tests and benchmarks

src/gtest/test_joinsplit.cpp

@@ -77,11 +77,11 @@ void test_full_api(ZCJoinSplit* js)
         );
     }
 
-    auto sprout_proof = boost::relaxed_get<ZCProof, ZCProof, GrothProof>(&proof);
+    auto sprout_proof = boost::get<ZCProof>(proof);
 
     // Verify the transaction:
     ASSERT_TRUE(js->verify(
-        *sprout_proof,
+        sprout_proof,
         verifier,
         pubKeyHash,
         randomSeed,
@@ -155,11 +155,11 @@ void test_full_api(ZCJoinSplit* js)
         );
     }
 
-    sprout_proof = boost::relaxed_get<ZCProof, ZCProof, GrothProof>(&proof);
+    sprout_proof = boost::get<ZCProof>(proof);
 
     // Verify the transaction:
     ASSERT_TRUE(js->verify(
-        *sprout_proof,
+        sprout_proof,
         verifier,
         pubKeyHash,
         randomSeed,

src/wallet/rpcwallet.cpp

@@ -2640,7 +2640,7 @@ UniValue zc_sample_joinsplit(const UniValue& params, bool fHelp)
 
     uint256 pubKeyHash;
     uint256 anchor = ZCIncrementalMerkleTree().root();
-    JSDescription samplejoinsplit(false,
+    JSDescription samplejoinsplit(true,
                                   *pzcashParams,
                                   pubKeyHash,
                                   anchor,

src/zcbenchmarks.cpp

@@ -116,7 +116,7 @@ double benchmark_create_joinsplit()
 
     struct timeval tv_start;
     timer_start(tv_start);
-    JSDescription jsdesc(false, // TODO: ?
+    JSDescription jsdesc(true,
                          *pzcashParams,
                          pubKeyHash,
                          anchor,