From 34f6ea95dc2e5adead6eba50347cfa9b98dcd21e Mon Sep 17 00:00:00 2001
From: Sean Bowe <ewillbefull@gmail.com>
Date: Fri, 11 May 2018 06:42:35 -0600
Subject: [PATCH] Adjust tests and benchmarks

---
 src/gtest/test_joinsplit.cpp | 8 ++++----
 src/wallet/rpcwallet.cpp     | 2 +-
 src/zcbenchmarks.cpp         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gtest/test_joinsplit.cpp b/src/gtest/test_joinsplit.cpp
index 0ad480574..ca5cb04da 100644
--- a/src/gtest/test_joinsplit.cpp
+++ b/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,
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index ddceccbeb..934896f2b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/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,
diff --git a/src/zcbenchmarks.cpp b/src/zcbenchmarks.cpp
index 4c60fec40..f65e062e3 100644
--- a/src/zcbenchmarks.cpp
+++ b/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,