logos-messaging/logos-messaging-interop-tests
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-interop-tests.git synced 2026-05-16 07:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: pass exec commands instead of specialized docker exec func

Browse Source
This commit is contained in:
Roman 2024-02-01 19:31:11 +08:00
parent 0e6e62077b
commit 72307cb0e8
No known key found for this signature in database
GPG Key ID: B8FE070B54E11B75
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/node/docker_mananger.py
View File

@ -36,8 +36,11 @@ class DockerManager:
for key, value in args.items(): for key, value in args.items():
if isinstance(value, list): # Check if value is a list if isinstance(value, list): # Check if value is a list
cli_args.extend([f"--{key}={item}" for item in value]) # Add a command for each item in the list cli_args.extend([f"--{key}={item}" for item in value]) # Add a command for each item in the list
elif value is None:
cli_args.append(f"{key}") # Add simple command as it is passed in the key
else: else:
cli_args.append(f"--{key}={value}") # Add a single command cli_args.append(f"--{key}={value}") # Add a single command
port_bindings = {f"{port}/tcp": ("", port) for port in ports} port_bindings = {f"{port}/tcp": ("", port) for port in ports}
logger.debug(f"Starting container with image {image_name}") logger.debug(f"Starting container with image {image_name}")
logger.debug(f"Using args {cli_args}") logger.debug(f"Using args {cli_args}")

6
src/node/waku_node.py
View File

@ -87,6 +87,9 @@ class WakuNode:
"cred-password": default_args["rln-creds"]["keystore_password"], "cred-password": default_args["rln-creds"]["keystore_password"],
"eth-contract-address": default_args["rln-creds"]["eth_contract_address"], "eth-contract-address": default_args["rln-creds"]["eth_contract_address"],
} }
if default_args["rln-register-only"]:
rln_opts["generate-rln-credentials"] = None
elif self.is_nwaku(): elif self.is_nwaku():
rln_opts = { rln_opts = {
"rln-relay-eth-client-address": default_args["rln-creds"]["eth_client_address"], "rln-relay-eth-client-address": default_args["rln-creds"]["eth_client_address"],
@ -95,7 +98,8 @@ class WakuNode:
"rln-relay-eth-contract-address": default_args["rln-creds"]["eth_contract_address"], "rln-relay-eth-contract-address": default_args["rln-creds"]["eth_contract_address"],
} }
if default_args["rln-register-only"]: if default_args["rln-register-only"]:
rln_opts["execute"] = None rln_opts["--execute"] = None
rln_opts["generateRlnKeystore"] = None
rln_opts["rln-relay-cred-path"] = "/keystore/keystore.json" rln_opts["rln-relay-cred-path"] = "/keystore/keystore.json"
del default_args["rln-creds"] del default_args["rln-creds"]