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

Replace magic 2s in rpcwallet and change > to != for arity checks. Replace magic 2's with named constants in test cases.

Browse Source
This commit is contained in:
Nathan Wilcox
2016-01-19 10:09:58 -08:00
committed by Sean Bowe
parent 24f54da4f2
commit 8cb250885c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wallet/rpcwallet.cpp
View File

@@ -16,6 +16,7 @@
#include "utilmoneystr.h"
#include "wallet.h"
#include "walletdb.h"
#include "primitives/transaction.h"
#include <stdint.h>
@@ -2514,7 +2515,7 @@ Value zc_raw_pour(const json_spirit::Array& params, bool fHelp)
vpourin.push_back(PourInput(input_coin, zcaddress, path_index, path));
}
while (vpourin.size() < 2) {
while (vpourin.size() < NUM_POUR_INPUTS) {
vpourin.push_back(PourInput(INCREMENTAL_MERKLE_TREE_DEPTH));
}
@@ -2541,13 +2542,13 @@ Value zc_raw_pour(const json_spirit::Array& params, bool fHelp)
vpourout.push_back(output);
}
while (vpourout.size() < 2) {
while (vpourout.size() < NUM_POUR_OUTPUTS) {
vpourout.push_back(PourOutput(0));
}
// TODO
if (vpourout.size() > 2 || vpourin.size() > 2) {
throw runtime_error("unsupported");
if (vpourout.size() != NUM_POUR_INPUTS || vpourin.size() != NUM_POUR_OUTPUTS) {
throw runtime_error("unsupported pour input/output counts");
}
CScript scriptPubKey;