foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-21 12:22:50 -05:00
Code Issues Activity

test framework, wallet: rename get_scriptPubKey method to get_output_script

Browse source
This commit is contained in:
Alfonso Roman Zubeldia 2025-01-24 14:57:36 -03:00
parent fa0232a3e0
commit 723440c5b8
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/functional/feature_coinstatsindex.py
View file

@ -151,7 +151,7 @@ class CoinStatsIndexTest(BitcoinTestFramework):
# Generate and send a normal tx with two outputs
tx1 = self.wallet.send_to(
from_node=node,
scriptPubKey=self.wallet.get_scriptPubKey(),
scriptPubKey=self.wallet.get_output_script(),
amount=21 * COIN,
)

2
test/functional/feature_framework_miniwallet.py
View file

@ -41,7 +41,7 @@ class FeatureFrameworkMiniWalletTest(BitcoinTestFramework):
tag = ''.join(random.choice(string.ascii_letters) for _ in range(20))
self.log.debug(f"-> ({i}) tag name: {tag}")
tagged_wallet = MiniWallet(node, tag_name=tag)
untagged_wallet.send_to(from_node=node, scriptPubKey=tagged_wallet.get_scriptPubKey(), amount=100000)
untagged_wallet.send_to(from_node=node, scriptPubKey=tagged_wallet.get_output_script(), amount=100000)
tagged_wallet.rescan_utxos()
tagged_wallet.send_self_transfer(from_node=node)
self.generate(node, 1) # clear mempool

2
test/functional/feature_rbf.py
View file

@ -85,7 +85,7 @@ class ReplaceByFeeTest(BitcoinTestFramework):
confirmed - txout created will be confirmed in the blockchain;
unconfirmed otherwise.
"""
tx = self.wallet.send_to(from_node=node, scriptPubKey=scriptPubKey or self.wallet.get_scriptPubKey(), amount=amount)
tx = self.wallet.send_to(from_node=node, scriptPubKey=scriptPubKey or self.wallet.get_output_script(), amount=amount)
if confirmed:
mempool_size = len(node.getrawmempool())

4
test/functional/rpc_blockchain.py
View file

@ -422,8 +422,8 @@ class BlockchainTest(BitcoinTestFramework):
assert_equal(txout['confirmations'], 1)
assert_equal(txout['value'], 25)
assert_equal(txout['scriptPubKey']['address'], self.wallet.get_address())
assert_equal(txout['scriptPubKey']['hex'], self.wallet.get_scriptPubKey().hex())
decoded_script = node.decodescript(self.wallet.get_scriptPubKey().hex())
assert_equal(txout['scriptPubKey']['hex'], self.wallet.get_output_script().hex())
decoded_script = node.decodescript(self.wallet.get_output_script().hex())
assert_equal(txout['scriptPubKey']['asm'], decoded_script['asm'])
assert_equal(txout['scriptPubKey']['desc'], decoded_script['desc'])
assert_equal(txout['scriptPubKey']['type'], decoded_script['type'])

2
test/functional/test_framework/wallet.py
View file

@ -212,7 +212,7 @@ class MiniWallet:
self.rescan_utxos()
return blocks
def get_scriptPubKey(self):
def get_output_script(self):
return self._scriptPubKey
def get_descriptor(self):