Skip to content

Commit 723440c

Browse files
committed
test framework, wallet: rename get_scriptPubKey method to get_output_script
1 parent fa0232a commit 723440c

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

test/functional/feature_coinstatsindex.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def _test_coin_stats_index(self):
151151
# Generate and send a normal tx with two outputs
152152
tx1 = self.wallet.send_to(
153153
from_node=node,
154-
scriptPubKey=self.wallet.get_scriptPubKey(),
154+
scriptPubKey=self.wallet.get_output_script(),
155155
amount=21 * COIN,
156156
)
157157

test/functional/feature_framework_miniwallet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_wallet_tagging(self):
4141
tag = ''.join(random.choice(string.ascii_letters) for _ in range(20))
4242
self.log.debug(f"-> ({i}) tag name: {tag}")
4343
tagged_wallet = MiniWallet(node, tag_name=tag)
44-
untagged_wallet.send_to(from_node=node, scriptPubKey=tagged_wallet.get_scriptPubKey(), amount=100000)
44+
untagged_wallet.send_to(from_node=node, scriptPubKey=tagged_wallet.get_output_script(), amount=100000)
4545
tagged_wallet.rescan_utxos()
4646
tagged_wallet.send_self_transfer(from_node=node)
4747
self.generate(node, 1) # clear mempool

test/functional/feature_rbf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def make_utxo(self, node, amount, *, confirmed=True, scriptPubKey=None):
8585
confirmed - txout created will be confirmed in the blockchain;
8686
unconfirmed otherwise.
8787
"""
88-
tx = self.wallet.send_to(from_node=node, scriptPubKey=scriptPubKey or self.wallet.get_scriptPubKey(), amount=amount)
88+
tx = self.wallet.send_to(from_node=node, scriptPubKey=scriptPubKey or self.wallet.get_output_script(), amount=amount)
8989

9090
if confirmed:
9191
mempool_size = len(node.getrawmempool())

test/functional/rpc_blockchain.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,8 @@ def _test_gettxout(self):
422422
assert_equal(txout['confirmations'], 1)
423423
assert_equal(txout['value'], 25)
424424
assert_equal(txout['scriptPubKey']['address'], self.wallet.get_address())
425-
assert_equal(txout['scriptPubKey']['hex'], self.wallet.get_scriptPubKey().hex())
426-
decoded_script = node.decodescript(self.wallet.get_scriptPubKey().hex())
425+
assert_equal(txout['scriptPubKey']['hex'], self.wallet.get_output_script().hex())
426+
decoded_script = node.decodescript(self.wallet.get_output_script().hex())
427427
assert_equal(txout['scriptPubKey']['asm'], decoded_script['asm'])
428428
assert_equal(txout['scriptPubKey']['desc'], decoded_script['desc'])
429429
assert_equal(txout['scriptPubKey']['type'], decoded_script['type'])

test/functional/test_framework/wallet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def generate(self, num_blocks, **kwargs):
212212
self.rescan_utxos()
213213
return blocks
214214

215-
def get_scriptPubKey(self):
215+
def get_output_script(self):
216216
return self._scriptPubKey
217217

218218
def get_descriptor(self):

0 commit comments

Comments
 (0)