aboutsummaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-06-06 17:50:50 +0200
committerMarcoFalke <falke.marco@gmail.com>2016-06-07 13:12:57 +0200
commitfa7f4f577cbab2b4bc03b5427704c2ec16680c34 (patch)
tree9ceac88ffe807278f80ca8d3afb3aa4a6de14207 /qa
parentfaf82e8fc819b2f1f8b60983ac72cb111c47e8ba (diff)
[rpc] fundrawtransaction feeRate: Use BTC/kB
Also introduce UniValueType UniValueType is a wrapper for UniValue::VType which allows setting a typeAny flag. This flag indicates the type does not matter. (Used by RPCTypeCheckObj)
Diffstat (limited to 'qa')
-rwxr-xr-xqa/rpc-tests/fundrawtransaction.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index 3040752dcb..998f822afe 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -681,9 +681,9 @@ class RawTransactionsTest(BitcoinTestFramework):
inputs = []
outputs = {self.nodes[2].getnewaddress() : 1}
rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
- result = self.nodes[3].fundrawtransaction(rawtx) # 1000 sat via settxfee
- result2 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2000})
- result3 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 10000})
+ result = self.nodes[3].fundrawtransaction(rawtx) # uses min_relay_tx_fee (set by settxfee)
+ result2 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2*min_relay_tx_fee})
+ result3 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 10*min_relay_tx_fee})
assert_equal(result['fee']*2, result2['fee'])
assert_equal(result['fee']*10, result3['fee'])