mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-08 10:31:50 -05:00
Merge bitcoin/bitcoin#25955: test: use sendall
when emptying wallet
28ea4c7039
test: simplify splitment with `sendall` in wallet_basic (brunoerg)923d24583d
test: use `sendall` when emptying wallet (brunoerg) Pull request description: In some tests they have used `sendtoaddress` in order to empty a wallet. With the addition of `sendall`, it makes sense to use it for that. ACKs for top commit: achow101: ACK28ea4c7039
ishaanam: utACK28ea4c7039
w0xlt: ACK28ea4c7039
Tree-SHA512: 903136d7df5c65d3c02310d5a84241c9fd11070f69d932b4e188b8ad45c38ab5bc1bd5a9242b3e52d2576665ead14be0a03971a9ad8c00431fed442eba4ca48f
This commit is contained in:
commit
d16ef40441
4 changed files with 6 additions and 12 deletions
|
@ -635,7 +635,7 @@ class RawTransactionsTest(BitcoinTestFramework):
|
|||
self.log.info("Test fundrawtxn fee with many inputs")
|
||||
|
||||
# Empty node1, send some small coins from node0 to node1.
|
||||
self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), self.nodes[1].getbalance(), "", "", True)
|
||||
self.nodes[1].sendall(recipients=[self.nodes[0].getnewaddress()])
|
||||
self.generate(self.nodes[1], 1)
|
||||
|
||||
for _ in range(20):
|
||||
|
@ -661,7 +661,7 @@ class RawTransactionsTest(BitcoinTestFramework):
|
|||
self.log.info("Test fundrawtxn sign+send with many inputs")
|
||||
|
||||
# Again, empty node1, send some small coins from node0 to node1.
|
||||
self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), self.nodes[1].getbalance(), "", "", True)
|
||||
self.nodes[1].sendall(recipients=[self.nodes[0].getnewaddress()])
|
||||
self.generate(self.nodes[1], 1)
|
||||
|
||||
for _ in range(20):
|
||||
|
|
|
@ -585,15 +585,9 @@ class WalletTest(BitcoinTestFramework):
|
|||
|
||||
# ==Check that wallet prefers to use coins that don't exceed mempool limits =====
|
||||
|
||||
# Get all non-zero utxos together
|
||||
# Get all non-zero utxos together and split into two chains
|
||||
chain_addrs = [self.nodes[0].getnewaddress(), self.nodes[0].getnewaddress()]
|
||||
singletxid = self.nodes[0].sendtoaddress(chain_addrs[0], self.nodes[0].getbalance(), "", "", True)
|
||||
self.generate(self.nodes[0], 1, sync_fun=self.no_op)
|
||||
node0_balance = self.nodes[0].getbalance()
|
||||
# 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(hexstring=signedtx["hex"], maxfeerate=0)
|
||||
self.nodes[0].sendall(recipients=chain_addrs)
|
||||
self.generate(self.nodes[0], 1, sync_fun=self.no_op)
|
||||
|
||||
# Make a long chain of unconfirmed payments without hitting mempool limit
|
||||
|
|
|
@ -624,7 +624,7 @@ def test_no_more_inputs_fails(self, rbf_node, dest_address):
|
|||
# feerate rbf requires confirmed outputs when change output doesn't exist or is insufficient
|
||||
self.generatetoaddress(rbf_node, 1, dest_address)
|
||||
# spend all funds, no change output
|
||||
rbfid = rbf_node.sendtoaddress(rbf_node.getnewaddress(), rbf_node.getbalance(), "", "", True)
|
||||
rbfid = rbf_node.sendall(recipients=[rbf_node.getnewaddress()])['txid']
|
||||
assert_raises_rpc_error(-4, "Unable to create transaction. Insufficient funds", rbf_node.bumpfee, rbfid)
|
||||
self.clear_mempool()
|
||||
|
||||
|
|
|
@ -154,7 +154,7 @@ class WalletGroupTest(BitcoinTestFramework):
|
|||
assert_equal(2, len(tx6["vout"]))
|
||||
|
||||
# Empty out node2's wallet
|
||||
self.nodes[2].sendtoaddress(address=self.nodes[0].getnewaddress(), amount=self.nodes[2].getbalance(), subtractfeefromamount=True)
|
||||
self.nodes[2].sendall(recipients=[self.nodes[0].getnewaddress()])
|
||||
self.sync_all()
|
||||
self.generate(self.nodes[0], 1)
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue