diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-06-08 14:07:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-06-08 14:14:54 +0200 |
| commit | 75ec320a0d5393c31cccc4cf5a62f3f6b43c8672 (patch) | |
| tree | a7d0b098f9d8f667c7530afc7520c5b7977abddd /qa | |
| parent | a7c41f2de03c315394c0560f369544e24a3e5586 (diff) | |
| parent | fa7f4f577cbab2b4bc03b5427704c2ec16680c34 (diff) | |
| download | bitcoin-75ec320a0d5393c31cccc4cf5a62f3f6b43c8672.tar.xz | |
Merge #8153: [rpc] fundrawtransaction feeRate: Use BTC/kB
fa7f4f5 [rpc] fundrawtransaction feeRate: Use BTC/kB (MarcoFalke)
faf82e8 [rpc] fundrawtransaction: Fix help text and interface (MarcoFalke)
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/rpc-tests/fundrawtransaction.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py index 5c11d3ab18..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, ) - 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']) |