Commit 0f1381a1 authored by Gyanendra Mishra's avatar Gyanendra Mishra

make output less verbose

parent 05240578
...@@ -31,9 +31,6 @@ def main(input_args): ...@@ -31,9 +31,6 @@ def main(input_args):
print("Launching participant network with {0} participants and the following network params {1}".format(num_participants, network_params)) print("Launching participant network with {0} participants and the following network params {1}".format(num_participants, network_params))
all_participants, cl_gensis_timestamp = launch_participant_network(input_args_with_right_defaults.participants, network_params, input_args_with_right_defaults.global_client_log_level) all_participants, cl_gensis_timestamp = launch_participant_network(input_args_with_right_defaults.participants, network_params, input_args_with_right_defaults.global_client_log_level)
print(all_participants)
print(cl_gensis_timestamp)
all_el_client_contexts = [] all_el_client_contexts = []
all_cl_client_contexts = [] all_cl_client_contexts = []
for participant in all_participants: for participant in all_participants:
......
...@@ -65,13 +65,15 @@ def launch( ...@@ -65,13 +65,15 @@ def launch(
service = add_service(service_id, service_config) service = add_service(service_id, service_config)
# TODO add facts & waits # TODO this fact might start breaking if the endpoint requires a leading slash, currently breaks with a leading slash
define_fact(service_id = service_id, fact_name = ENODE_FACT_NAME, fact_recipe = struct(method= "POST", endpoint = "", field_extractor = ".result.enode", body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}', content_type = "application/json", port_id = RPC_PORT_ID))
enode = wait(service_id = service_id, fact_name = ENODE_FACT_NAME)
return new_el_client_context( return new_el_client_context(
"nethermind", "nethermind",
"", # nethermind has no ENR in the eth2-merge-kurtosis-module either "", # nethermind has no ENR in the eth2-merge-kurtosis-module either
# Nethermind node info endpoint doesn't return ENR field https://docs.nethermind.io/nethermind/ethereum-client/json-rpc/admin # Nethermind node info endpoint doesn't return ENR field https://docs.nethermind.io/nethermind/ethereum-client/json-rpc/admin
"", # TODO add Enode from wait & fact, enode,
service.ip_address, service.ip_address,
RPC_PORT_NUM, RPC_PORT_NUM,
WS_PORT_NUM, WS_PORT_NUM,
...@@ -128,9 +130,7 @@ def get_service_config(genesis_data, image, existing_el_clients, log_level, extr ...@@ -128,9 +130,7 @@ def get_service_config(genesis_data, image, existing_el_clients, log_level, extr
files_artifact_mount_dirpaths = { files_artifact_mount_dirpaths = {
genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNT_DIRPATH genesis_data.files_artifact_uuid: GENESIS_DATA_MOUNT_DIRPATH
}, },
# TODO add private IP address place holder when add servicde supports it privaite_ip_address_placeholder = PRIVATE_IP_ADDRESS_PLACEHOLDER,
# for now this will work as we use the service config default above
# https://github.com/kurtosis-tech/kurtosis/pull/290
) )
......
...@@ -10,6 +10,7 @@ load("github.com/kurtosis-tech/eth2-module/src/static_files/static_files.star", ...@@ -10,6 +10,7 @@ load("github.com/kurtosis-tech/eth2-module/src/static_files/static_files.star",
load("github.com/kurtosis-tech/eth2-module/src/participant_network/el/geth/geth_launcher.star", launch_geth="launch", "new_geth_launcher") load("github.com/kurtosis-tech/eth2-module/src/participant_network/el/geth/geth_launcher.star", launch_geth="launch", "new_geth_launcher")
load("github.com/kurtosis-tech/eth2-module/src/participant_network/el/besu/besu_launcher.star", launch_besu="launch", "new_besu_launcher") load("github.com/kurtosis-tech/eth2-module/src/participant_network/el/besu/besu_launcher.star", launch_besu="launch", "new_besu_launcher")
load("github.com/kurtosis-tech/eth2-module/src/participant_network/el/erigon/erigon_launcher.star", launch_erigon="launch", "new_erigon_launcher") load("github.com/kurtosis-tech/eth2-module/src/participant_network/el/erigon/erigon_launcher.star", launch_erigon="launch", "new_erigon_launcher")
load("github.com/kurtosis-tech/eth2-module/src/participant_network/el/nethermind/nethermind_launcher.star", launch_nethermind="launch", "new_nethermind_launcher")
load("github.com/kurtosis-tech/eth2-module/src/participant_network/cl/lighthouse/lighthouse_launcher.star", launch_lighthouse="launch", "new_lighthouse_launcher") load("github.com/kurtosis-tech/eth2-module/src/participant_network/cl/lighthouse/lighthouse_launcher.star", launch_lighthouse="launch", "new_lighthouse_launcher")
...@@ -78,6 +79,7 @@ def launch_participant_network(participants, network_params, global_log_level): ...@@ -78,6 +79,7 @@ def launch_participant_network(participants, network_params, global_log_level):
module_io.ELClientType.geth : {"launcher": new_geth_launcher(network_params.network_id, el_genesis_data, geth_prefunded_keys_artifact_id, PRE_FUNDED_ACCOUNTS), "launch_method": launch_geth}, module_io.ELClientType.geth : {"launcher": new_geth_launcher(network_params.network_id, el_genesis_data, geth_prefunded_keys_artifact_id, PRE_FUNDED_ACCOUNTS), "launch_method": launch_geth},
module_io.ELClientType.besu : {"launcher": new_besu_launcher(network_params.network_id, el_genesis_data), "launch_method": launch_besu}, module_io.ELClientType.besu : {"launcher": new_besu_launcher(network_params.network_id, el_genesis_data), "launch_method": launch_besu},
module_io.ELClientType.erigon : {"launcher": new_erigon_launcher(network_params.network_id, el_genesis_data), "launch_method": launch_erigon}, module_io.ELClientType.erigon : {"launcher": new_erigon_launcher(network_params.network_id, el_genesis_data), "launch_method": launch_erigon},
module_io.ELClientType.nethermind : {"launcher": new_nethermind_launcher(network_params.network_id, el_genesis_data)},
} }
all_el_client_contexts = [] all_el_client_contexts = []
...@@ -166,6 +168,8 @@ def launch_participant_network(participants, network_params, global_log_level): ...@@ -166,6 +168,8 @@ def launch_participant_network(participants, network_params, global_log_level):
all_cl_client_contexts.append(cl_client_context) all_cl_client_contexts.append(cl_client_context)
print("Succesfully added {0} CL participants".format(num_participants))
all_participants = [] all_participants = []
for index, participant in enumerate(participants): for index, participant in enumerate(participants):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment