Skip to content

Commit b2127dc

Browse files
committed
Make changes to commander.py to accomodate v30 test_framework.
1 parent cd2523f commit b2127dc

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

resources/scenarios/commander.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import sys
1212
import tempfile
1313
import threading
14+
import types
1415
from time import sleep
1516

1617
from kubernetes import client, config
@@ -240,6 +241,10 @@ def setup(self):
240241
self.lns: dict[str, LNNode] = {}
241242
self.channels = WARNET["channels"]
242243

244+
self.binary_paths = types.SimpleNamespace()
245+
self.binary_paths.bitcoin_cmd = None
246+
self.binary_paths.bitcoind = None
247+
243248
for i, tank in enumerate(WARNET["tanks"]):
244249
self.log.info(
245250
f"Adding TestNode #{i} from pod {tank['tank']} with IP {tank['rpc_host']}"
@@ -251,13 +256,12 @@ def setup(self):
251256
rpchost=tank["rpc_host"],
252257
timewait=60,
253258
timeout_factor=self.options.timeout_factor,
254-
bitcoind=None,
255-
bitcoin_cli=None,
259+
binaries=self.get_binaries(),
256260
cwd=self.options.tmpdir,
257261
coverage_dir=self.options.coveragedir,
258262
)
259263
node.tank = tank["tank"]
260-
node.rpc = get_rpc_proxy(
264+
node._rpc = get_rpc_proxy(
261265
f"http://{tank['rpc_user']}:{tank['rpc_password']}@{tank['rpc_host']}:{tank['rpc_port']}",
262266
i,
263267
timeout=60,
@@ -450,6 +454,12 @@ def parse_args(self, _):
450454
action="store_true",
451455
help="use BIP324 v2 connections between all nodes by default",
452456
)
457+
parser.add_argument(
458+
"--test_methods",
459+
dest="test_methods",
460+
nargs="*",
461+
help="Run specified test methods sequentially instead of the full test. Use only for methods that do not depend on any context set up in run_test or other methods.",
462+
)
453463

454464
self.add_options(parser)
455465
# Running TestShell in a Jupyter notebook causes an additional -f argument
@@ -565,7 +575,7 @@ def connect_nodes(self, a, b, *, peer_advertises_v2=None, wait_for_connect: bool
565575

566576
def generatetoaddress(self, generator, n, addr, sync_fun=None, **kwargs):
567577
if generator.chain == "regtest":
568-
blocks = generator.generatetoaddress(n, addr, invalid_call=False, **kwargs)
578+
blocks = generator.generatetoaddress(n, addr, called_by_framework=True, **kwargs)
569579
sync_fun() if sync_fun else self.sync_all()
570580
return blocks
571581
if generator.chain == "signet":

0 commit comments

Comments
 (0)