Skip to content

Commit faf82e8

Browse files
author
MarcoFalke
committed
[rpc] fundrawtransaction: Fix help text and interface
1 parent 52c3f34 commit faf82e8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

qa/rpc-tests/fundrawtransaction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ def run_test(self):
681681
inputs = []
682682
outputs = {self.nodes[2].getnewaddress() : 1}
683683
rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
684-
result = self.nodes[3].fundrawtransaction(rawtx, )
684+
result = self.nodes[3].fundrawtransaction(rawtx) # 1000 sat via settxfee
685685
result2 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2000})
686686
result3 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 10000})
687687
assert_equal(result['fee']*2, result2['fee'])

src/wallet/rpcwallet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2369,13 +2369,13 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
23692369
" \"changePosition\" (numeric, optional, default random) The index of the change output\n"
23702370
" \"includeWatching\" (boolean, optional, default false) Also select inputs which are watch only\n"
23712371
" \"lockUnspents\" (boolean, optional, default false) Lock selected unspent outputs\n"
2372-
" \"feeRate\" (numeric, optional, default 0=estimate) Set a specific feerate (fee per KB)\n"
2372+
" \"feeRate\" (numeric, optional, default not set: makes wallet determine the fee) Set a specific feerate (satoshis per KB)\n"
23732373
" }\n"
23742374
" for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n"
23752375
"\nResult:\n"
23762376
"{\n"
23772377
" \"hex\": \"value\", (string) The resulting raw transaction (hex-encoded string)\n"
2378-
" \"fee\": n, (numeric) Fee the resulting transaction pays\n"
2378+
" \"fee\": n, (numeric) Fee in " + CURRENCY_UNIT + " the resulting transaction pays\n"
23792379
" \"changepos\": n (numeric) The position of the added change output, or -1\n"
23802380
"}\n"
23812381
"\"hex\" \n"

0 commit comments

Comments
 (0)