DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Rename samplepour to samplejoinsplit

Browse Source
This commit is contained in:
Sean Bowe
2016-07-11 11:33:14 -06:00
parent 2fbbde597c
commit 35f82c35fe
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/rpcwallet.cpp
View File

@@ -2393,12 +2393,12 @@ Value zc_benchmark(const json_spirit::Array& params, bool fHelp)
pzcashParams->loadProvingKey(); pzcashParams->loadProvingKey();
} }
CPourTx* samplepour = NULL; CPourTx* samplejoinsplit = NULL;
if (benchmarktype == "verifyjoinsplit") { if (benchmarktype == "verifyjoinsplit") {
uint256 pubKeyHash; uint256 pubKeyHash;
uint256 anchor = ZCIncrementalMerkleTree().root(); uint256 anchor = ZCIncrementalMerkleTree().root();
samplepour = new CPourTx(*pzcashParams, samplejoinsplit = new CPourTx(*pzcashParams,
pubKeyHash, pubKeyHash,
anchor, anchor,
{JSInput(), JSInput()}, {JSInput(), JSInput()},
@@ -2415,7 +2415,7 @@ Value zc_benchmark(const json_spirit::Array& params, bool fHelp)
} else if (benchmarktype == "createjoinsplit") { } else if (benchmarktype == "createjoinsplit") {
sample_times.push_back(benchmark_create_joinsplit()); sample_times.push_back(benchmark_create_joinsplit());
} else if (benchmarktype == "verifyjoinsplit") { } else if (benchmarktype == "verifyjoinsplit") {
sample_times.push_back(benchmark_verify_joinsplit(*samplepour)); sample_times.push_back(benchmark_verify_joinsplit(*samplejoinsplit));
} else if (benchmarktype == "solveequihash") { } else if (benchmarktype == "solveequihash") {
sample_times.push_back(benchmark_solve_equihash()); sample_times.push_back(benchmark_solve_equihash());
} else if (benchmarktype == "verifyequihash") { } else if (benchmarktype == "verifyequihash") {
@@ -2423,12 +2423,12 @@ Value zc_benchmark(const json_spirit::Array& params, bool fHelp)
} else if (benchmarktype == "validatelargetx") { } else if (benchmarktype == "validatelargetx") {
sample_times.push_back(benchmark_large_tx()); sample_times.push_back(benchmark_large_tx());
} else { } else {
delete samplepour; delete samplejoinsplit;
throw JSONRPCError(RPC_TYPE_ERROR, "Invalid benchmarktype"); throw JSONRPCError(RPC_TYPE_ERROR, "Invalid benchmarktype");
} }
} }
delete samplepour; delete samplejoinsplit;
Array results; Array results;
for (int i = 0; i < samplecount; i++) { for (int i = 0; i < samplecount; i++) {