highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-13 02:37:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: Remove from_node from create_self_transfer* MiniWallet helpers

Browse Source 
The from_node argument is no longer used as of commit
a55606c3bd
This commit is contained in:
MacroFake
2022-06-21 11:25:54 +02:00
parent b178807265
commit fa8421bc5b
8 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/functional/test_framework/util.py
View File

@ -527,9 +527,8 @@ def create_lots_of_big_transactions(mini_wallet, node, fee, tx_batch_size, txout
use_internal_utxos = utxos is None
for _ in range(tx_batch_size):
tx = mini_wallet.create_self_transfer(
from_node=node,
utxo_to_spend=None if use_internal_utxos else utxos.pop(),
fee_rate=0,
utxo_to_spend=None if use_internal_utxos else utxos.pop(),
fee_rate=0,
)["tx"]
tx.vout[0].nValue -= fee_sats
tx.vout.extend(txouts)

27
test/functional/test_framework/wallet.py
View File

@ -180,10 +180,10 @@ class MiniWallet:
self._utxos = []
return utxos
def send_self_transfer(self, **kwargs):
def send_self_transfer(self, *, from_node, **kwargs):
"""Create and send a tx with the specified fee_rate. Fee may be exact or at most one satoshi higher than needed."""
tx = self.create_self_transfer(**kwargs)
self.sendrawtransaction(from_node=kwargs['from_node'], tx_hex=tx['hex'])
self.sendrawtransaction(from_node=from_node, tx_hex=tx['hex'])
return tx
def send_to(self, *, from_node, scriptPubKey, amount, fee=1000):
@ -198,14 +198,14 @@ class MiniWallet:
Returns a tuple (txid, n) referring to the created external utxo outpoint.
"""
tx = self.create_self_transfer(from_node=from_node, fee_rate=0)["tx"]
tx = self.create_self_transfer(fee_rate=0)["tx"]
assert_greater_than_or_equal(tx.vout[0].nValue, amount + fee)
tx.vout[0].nValue -= (amount + fee) # change output -> MiniWallet
tx.vout.append(CTxOut(amount, scriptPubKey)) # arbitrary output -> to be returned
txid = self.sendrawtransaction(from_node=from_node, tx_hex=tx.serialize().hex())
return txid, 1
def send_self_transfer_multi(self, **kwargs):
def send_self_transfer_multi(self, *, from_node, **kwargs):
"""
Create and send a transaction that spends the given UTXOs and creates a
certain number of outputs with equal amounts.
@ -217,16 +217,18 @@ class MiniWallet:
- list of newly created UTXOs, ordered by vout index
"""
tx = self.create_self_transfer_multi(**kwargs)
txid = self.sendrawtransaction(from_node=kwargs['from_node'], tx_hex=tx.serialize().hex())
txid = self.sendrawtransaction(from_node=from_node, tx_hex=tx.serialize().hex())
return {'new_utxos': [self.get_utxo(txid=txid, vout=vout) for vout in range(len(tx.vout))],
'txid': txid, 'hex': tx.serialize().hex(), 'tx': tx}
def create_self_transfer_multi(
self, *, from_node,
utxos_to_spend: Optional[List[dict]] = None,
num_outputs=1,
sequence=0,
fee_per_output=1000):
self,
*,
utxos_to_spend: Optional[List[dict]] = None,
num_outputs=1,
sequence=0,
fee_per_output=1000,
):
"""
Create and return a transaction that spends the given UTXOs and creates a
certain number of outputs with equal amounts.
@ -234,7 +236,7 @@ class MiniWallet:
utxos_to_spend = utxos_to_spend or [self.get_utxo()]
# create simple tx template (1 input, 1 output)
tx = self.create_self_transfer(
fee_rate=0, from_node=from_node,
fee_rate=0,
utxo_to_spend=utxos_to_spend[0], sequence=sequence)["tx"]
# duplicate inputs, witnesses and outputs
@ -253,9 +255,8 @@ class MiniWallet:
o.nValue = outputs_value_total // num_outputs
return tx
def create_self_transfer(self, *, fee_rate=Decimal("0.003"), from_node=None, utxo_to_spend=None, locktime=0, sequence=0):
def create_self_transfer(self, *, fee_rate=Decimal("0.003"), utxo_to_spend=None, locktime=0, sequence=0):
"""Create and return a tx with the specified fee_rate. Fee may be exact or at most one satoshi higher than needed."""
from_node = from_node or self._test_node
utxo_to_spend = utxo_to_spend or self.get_utxo()
if self._mode in (MiniWalletMode.RAW_OP_TRUE, MiniWalletMode.ADDRESS_OP_TRUE):
vsize = Decimal(104) # anyone-can-spend