Skip to content

Commit 7b3c9e4

Browse files
committed
Make explicit the node param in init_wallet()
1 parent 23a7d56 commit 7b3c9e4

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

test/functional/feature_rbf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ def test_rpc(self):
539539
assert_equal(json1["vin"][0]["sequence"], 4294967295)
540540

541541
if self.is_wallet_compiled():
542-
self.init_wallet(0)
542+
self.init_wallet(node=0)
543543
rawtx2 = self.nodes[0].createrawtransaction([], outs)
544544
frawtx2a = self.nodes[0].fundrawtransaction(rawtx2, {"replaceable": True})
545545
frawtx2b = self.nodes[0].fundrawtransaction(rawtx2, {"replaceable": False})

test/functional/rpc_invalid_address_message.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def run_test(self):
9090
self.test_validateaddress()
9191

9292
if self.is_wallet_compiled():
93-
self.init_wallet(0)
93+
self.init_wallet(node=0)
9494
self.test_getaddressinfo()
9595

9696

test/functional/test_framework/test_framework.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,12 +423,12 @@ def setup_nodes(self):
423423

424424
def import_deterministic_coinbase_privkeys(self):
425425
for i in range(self.num_nodes):
426-
self.init_wallet(i)
426+
self.init_wallet(node=i)
427427

428-
def init_wallet(self, i):
429-
wallet_name = self.default_wallet_name if self.wallet_names is None else self.wallet_names[i] if i < len(self.wallet_names) else False
428+
def init_wallet(self, *, node):
429+
wallet_name = self.default_wallet_name if self.wallet_names is None else self.wallet_names[node] if node < len(self.wallet_names) else False
430430
if wallet_name is not False:
431-
n = self.nodes[i]
431+
n = self.nodes[node]
432432
if wallet_name is not None:
433433
n.createwallet(wallet_name=wallet_name, descriptors=self.options.descriptors, load_on_startup=True)
434434
n.importprivkey(privkey=n.get_deterministic_priv_key().key, label='coinbase')

test/functional/wallet_backup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ def restore_wallet_existent_name(self):
124124
assert_raises_rpc_error(-8, "Wallet name already exists.", node.restorewallet, wallet_name, wallet_file)
125125

126126
def init_three(self):
127-
self.init_wallet(0)
128-
self.init_wallet(1)
129-
self.init_wallet(2)
127+
self.init_wallet(node=0)
128+
self.init_wallet(node=1)
129+
self.init_wallet(node=2)
130130

131131
def run_test(self):
132132
self.log.info("Generating initial blockchain")

test/functional/wallet_listdescriptors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def skip_test_if_missing_module(self):
2323
self.skip_if_no_sqlite()
2424

2525
# do not create any wallet by default
26-
def init_wallet(self, i):
26+
def init_wallet(self, *, node):
2727
return
2828

2929
def run_test(self):

test/functional/wallet_taproot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def skip_test_if_missing_module(self):
185185
def setup_network(self):
186186
self.setup_nodes()
187187

188-
def init_wallet(self, i):
188+
def init_wallet(self, *, node):
189189
pass
190190

191191
@staticmethod

0 commit comments

Comments
 (0)