zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove some lingering C++-isms in `zc_benchmark` command and construct JSON results directly.

This commit is contained in:
Nathan Wilcox 2017-05-18 23:46:34 +00:00
parent 9382bac709
commit 4191647b13
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wallet/rpcwallet.cpp
View File

@ -16,6 +16,7 @@
#include "utilmoneystr.h"
#include "wallet.h"
#include "walletdb.h"
#include "zcbenchmarks.h"
#include <stdint.h>
@ -2378,24 +2379,22 @@ Value zc_benchmark(const Array& params, bool fHelp)
throw JSONRPCError(RPC_TYPE_ERROR, "Invalid samplecount");
}
std::vector<double> sample_times;
Array results;
LOCK(cs_main);
for (int i = 0; i < samplecount; i++) {
double measuredtime;
if (benchmarktype == "sleep") {
sample_times.push_back(benchmark_sleep());
measuredtime = benchmark_sleep() ;
} else if (benchmarktype == "validatelargetx") {
sample_times.push_back(benchmark_large_tx());
measuredtime = benchmark_large_tx();
} else {
throw JSONRPCError(RPC_TYPE_ERROR, "Invalid benchmarktype");
}
}
Array results(UniValue::VARR);
for (auto time : sample_times) {
Object result;
result.push_back(Pair("runningtime", time));
result.push_back(Pair("runningtime", measuredtime));
results.push_back(result);
}