aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Atack <jon@atack.com>2019-09-21 16:03:28 +0200
committerJon Atack <jon@atack.com>2019-09-22 12:27:28 +0200
commit6659810e2f38994813aa9d7644d570ae0152fa2c (patch)
tree71191a878b001163439d34516636d90624219cb2
parent5c1cd78b7e582660a78d9d9dec673967a6b78936 (diff)
test: use named args for sendrawtransaction calls
involving more than one argument.
-rwxr-xr-xtest/functional/feature_segwit.py6
-rwxr-xr-xtest/functional/wallet_basic.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/test/functional/feature_segwit.py b/test/functional/feature_segwit.py
index d2826dd1b7..c69c7f90e8 100755
--- a/test/functional/feature_segwit.py
+++ b/test/functional/feature_segwit.py
@@ -257,7 +257,7 @@ class SegWitTest(BitcoinTestFramework):
tx.vin.append(CTxIn(COutPoint(int(txid2, 16), 0), b""))
tx.vout.append(CTxOut(int(49.95 * COIN), CScript([OP_TRUE, OP_DROP] * 15 + [OP_TRUE]))) # Huge fee
tx.calc_sha256()
- txid3 = self.nodes[0].sendrawtransaction(ToHex(tx), 0)
+ txid3 = self.nodes[0].sendrawtransaction(hexstring=ToHex(tx), maxfeerate=0)
assert tx.wit.is_null()
assert txid3 in self.nodes[0].getrawmempool()
@@ -566,7 +566,7 @@ class SegWitTest(BitcoinTestFramework):
tx.vout.append(CTxOut(10000000, i))
tx.rehash()
signresults = self.nodes[0].signrawtransactionwithwallet(tx.serialize_without_witness().hex())['hex']
- txid = self.nodes[0].sendrawtransaction(signresults, 0)
+ txid = self.nodes[0].sendrawtransaction(hexstring=signresults, maxfeerate=0)
txs_mined[txid] = self.nodes[0].generate(1)[0]
self.sync_blocks()
watchcount = 0
@@ -618,7 +618,7 @@ class SegWitTest(BitcoinTestFramework):
tx.vout.append(CTxOut(0, CScript()))
tx.rehash()
signresults = self.nodes[0].signrawtransactionwithwallet(tx.serialize_without_witness().hex())['hex']
- self.nodes[0].sendrawtransaction(signresults, 0)
+ self.nodes[0].sendrawtransaction(hexstring=signresults, maxfeerate=0)
self.nodes[0].generate(1)
self.sync_blocks()
diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py
index 5b1c672a48..96ea5c9c35 100755
--- a/test/functional/wallet_basic.py
+++ b/test/functional/wallet_basic.py
@@ -169,8 +169,8 @@ class WalletTest(BitcoinTestFramework):
txns_to_send.append(self.nodes[0].signrawtransactionwithwallet(raw_tx))
# Have node 1 (miner) send the transactions
- self.nodes[1].sendrawtransaction(txns_to_send[0]["hex"], 0)
- self.nodes[1].sendrawtransaction(txns_to_send[1]["hex"], 0)
+ self.nodes[1].sendrawtransaction(hexstring=txns_to_send[0]["hex"], maxfeerate=0)
+ self.nodes[1].sendrawtransaction(hexstring=txns_to_send[1]["hex"], maxfeerate=0)
# Have node1 mine a block to confirm transactions:
self.nodes[1].generate(1)
@@ -433,7 +433,7 @@ class WalletTest(BitcoinTestFramework):
# Split into two chains
rawtx = self.nodes[0].createrawtransaction([{"txid": singletxid, "vout": 0}], {chain_addrs[0]: node0_balance / 2 - Decimal('0.01'), chain_addrs[1]: node0_balance / 2 - Decimal('0.01')})
signedtx = self.nodes[0].signrawtransactionwithwallet(rawtx)
- singletxid = self.nodes[0].sendrawtransaction(signedtx["hex"], 0)
+ singletxid = self.nodes[0].sendrawtransaction(hexstring=signedtx["hex"], maxfeerate=0)
self.nodes[0].generate(1)
# Make a long chain of unconfirmed payments without hitting mempool limit