RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor option parsing in fill transaction.

Browse Source
This commit is contained in:
Christopher Jeffrey 2014-09-29 16:47:44 -07:00
parent e65b7e8da3
commit 898c89a5b2
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bitcoindjs.cc
View File

@ -1238,12 +1238,13 @@ bool SelectCoins(CWallet& wallet, int64_t nTargetValue,
NAN_METHOD(FillTransaction) { NAN_METHOD(FillTransaction) {
NanScope(); NanScope();
if (args.Length() < 1 || !args[0]->IsObject()) { if (args.Length() < 2 || !args[0]->IsObject() || !args[1]->IsObject()) {
return NanThrowError( return NanThrowError(
"Usage: bitcoindjs.fillTransaction(tx)"); "Usage: bitcoindjs.fillTransaction(tx, options)");
} }
Local<Object> js_tx = Local<Object>::Cast(args[0]); Local<Object> js_tx = Local<Object>::Cast(args[0]);
Local<Object> options = Local<Object>::Cast(args[1]);
String::Utf8Value tx_hex_(js_tx->Get(NanNew<String>("hex"))->ToString()); String::Utf8Value tx_hex_(js_tx->Get(NanNew<String>("hex"))->ToString());
std::string tx_hex = std::string(*tx_hex_); std::string tx_hex = std::string(*tx_hex_);
@ -1253,16 +1254,12 @@ NAN_METHOD(FillTransaction) {
CDataStream ssData(ParseHex(tx_hex), SER_NETWORK, PROTOCOL_VERSION); CDataStream ssData(ParseHex(tx_hex), SER_NETWORK, PROTOCOL_VERSION);
ssData >> tx; ssData >> tx;
// Parse options // Destination output
int d_output = 0; int d_output = 0;
if (args.Length() > 1 && args[1]->IsObject()) { if (options->Get(NanNew<String>("output"))->IsNumber()) {
Local<Object> options = Local<Object>::Cast(args[1]); d_output = options->Get(NanNew<String>("output"))->IntegerValue();
// Destination output if (d_output < 0 || d_output >= tx.vout.size()) {
if (options->Get(NanNew<String>("output"))->IsNumber()) { return NanThrowError("Destination output does not exist");
d_output = options->Get(NanNew<String>("output"))->IntegerValue();
if (d_output < 0 || d_output >= tx.vout.size()) {
return NanThrowError("Destination output does not exist");
}
} }
} }