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

Improve error checking on funds argument to faucetfund

Browse Source
This commit is contained in:
Jonathan "Duke" Leto
2018-08-09 22:54:23 +02:00
parent de3a68db84
commit 700c1fcfc3
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qa/rpc-tests/test_framework/test_framework.py
View File

@@ -151,7 +151,7 @@ class BitcoinTestFramework(object):
sys.exit(1) sys.exit(1)
# Test framework for doing p2p comparison testing, which sets up some bitcoind # Test framework for doing p2p comparison testing, which sets up some komodod
# binaries: # binaries:
# 1 binary: test binary # 1 binary: test binary
# 2 binaries: 1 test binary, 1 ref binary # 2 binaries: 1 test binary, 1 ref binary

20
src/wallet/rpcwallet.cpp
View File

@@ -5146,12 +5146,20 @@ UniValue faucetfund(const UniValue& params, bool fHelp)
const CKeyStore& keystore = *pwalletMain; const CKeyStore& keystore = *pwalletMain;
LOCK2(cs_main, pwalletMain->cs_wallet); LOCK2(cs_main, pwalletMain->cs_wallet);
funds = atof(params[0].get_str().c_str()) * COIN; funds = atof(params[0].get_str().c_str()) * COIN;
hex = FaucetFund(0,funds); if (funds > 0) {
if ( hex.size() > 0 ) hex = FaucetFund(0,funds);
{ if ( hex.size() > 0 )
result.push_back(Pair("result", "success")); {
result.push_back(Pair("hex", hex)); result.push_back(Pair("result", "success"));
} else result.push_back(Pair("error", "couldnt create faucet funding transaction")); result.push_back(Pair("hex", hex));
} else {
result.push_back(Pair("result", "error"));
result.push_back(Pair("error", "couldnt create faucet funding transaction"));
}
} else {
result.push_back(Pair("result", "error"));
result.push_back(Pair("error", "funding amount must be positive"));
}
return(result); return(result);
} }