@@ -17,7 +17,7 @@ GRAFANA_DASHBOARD_PATH_URL = "/d/QdTOwy-nz/eth2-merge-kurtosis-module-dashboard?
1717FIRST_NODE_FINALIZATION_FACT = "cl-boot-finalization-fact"
1818HTTP_PORT_ID_FOR_FACT = "http"
1919
20- def run (args ):
20+ def run (plan , args ):
2121 args_with_right_defaults = parse_input .parse_input (args )
2222
2323 num_participants = len (args_with_right_defaults .participants )
@@ -27,10 +27,10 @@ def run(args):
2727 grafana_dashboards_config_template = read_file (static_files .GRAFANA_DASHBOARD_PROVIDERS_CONFIG_TEMPLATE_FILEPATH )
2828 prometheus_config_template = read_file (static_files .PROMETHEUS_CONFIG_TEMPLATE_FILEPATH )
2929
30- print ("Read the prometheus, grafana templates" )
30+ plan . print ("Read the prometheus, grafana templates" )
3131
32- print ("Launching participant network with {0} participants and the following network params {1}" .format (num_participants , network_params ))
33- all_participants , cl_gensis_timestamp = participant_network .launch_participant_network (args_with_right_defaults .participants , network_params , args_with_right_defaults .global_client_log_level )
32+ plan . print ("Launching participant network with {0} participants and the following network params {1}" .format (num_participants , network_params ))
33+ all_participants , cl_gensis_timestamp = participant_network .launch_participant_network (plan , args_with_right_defaults .participants , network_params , args_with_right_defaults .global_client_log_level )
3434
3535 all_el_client_contexts = []
3636 all_cl_client_contexts = []
@@ -42,39 +42,40 @@ def run(args):
4242 if not args_with_right_defaults .launch_additional_services :
4343 return
4444
45- print ("Launching transaction spammer" )
46- transaction_spammer .launch_transaction_spammer (genesis_constants .PRE_FUNDED_ACCOUNTS , all_el_client_contexts [0 ])
47- print ("Succesfully launched transaction spammer" )
45+ plan . print ("Launching transaction spammer" )
46+ transaction_spammer .launch_transaction_spammer (plan , genesis_constants .PRE_FUNDED_ACCOUNTS , all_el_client_contexts [0 ])
47+ plan . print ("Succesfully launched transaction spammer" )
4848
4949 # We need a way to do time.sleep
5050 # TODO add code that waits for CL genesis
5151
52- print ("Launching forkmon" )
52+ plan . print ("Launching forkmon" )
5353 forkmon_config_template = read_file (static_files .FORKMON_CONFIG_TEMPLATE_FILEPATH )
54- forkmon .launch_forkmon (forkmon_config_template , all_cl_client_contexts , cl_gensis_timestamp , network_params .seconds_per_slot , network_params .slots_per_epoch )
55- print ("Succesfully launched forkmon" )
54+ forkmon .launch_forkmon (plan , forkmon_config_template , all_cl_client_contexts , cl_gensis_timestamp , network_params .seconds_per_slot , network_params .slots_per_epoch )
55+ plan . print ("Succesfully launched forkmon" )
5656
57- print ("Launching prometheus..." )
57+ plan . print ("Launching prometheus..." )
5858 prometheus_private_url = prometheus .launch_prometheus (
59+ plan ,
5960 prometheus_config_template ,
6061 all_cl_client_contexts ,
6162 )
62- print ("Successfully launched Prometheus" )
63+ plan . print ("Successfully launched Prometheus" )
6364
64- print ("Launching grafana..." )
65- grafana .launch_grafana (grafana_datasource_config_template , grafana_dashboards_config_template , prometheus_private_url )
66- print ("Succesfully launched grafana" )
65+ plan . print ("Launching grafana..." )
66+ grafana .launch_grafana (plan , grafana_datasource_config_template , grafana_dashboards_config_template , prometheus_private_url )
67+ plan . print ("Succesfully launched grafana" )
6768
6869 if args_with_right_defaults .wait_for_verifications :
69- print ("Running synchrnous testnet verifier" )
70- testnet_verifier .run_synchronous_testnet_verification (args_with_right_defaults , all_el_client_contexts , all_cl_client_contexts )
71- print ("Verification succeeded" )
70+ plan . print ("Running synchrnous testnet verifier" )
71+ testnet_verifier .run_synchronous_testnet_verification (plan , args_with_right_defaults , all_el_client_contexts , all_cl_client_contexts )
72+ plan . print ("Verification succeeded" )
7273 else :
73- print ("Running asynchronous verification" )
74- testnet_verifier .launch_testnet_verifier (args_with_right_defaults , all_el_client_contexts , all_cl_client_contexts )
75- print ("Succesfully launched asynchronous verifier" )
74+ plan . print ("Running asynchronous verification" )
75+ testnet_verifier .launch_testnet_verifier (plan , args_with_right_defaults , all_el_client_contexts , all_cl_client_contexts )
76+ plan . print ("Succesfully launched asynchronous verifier" )
7677 if args_with_right_defaults .wait_for_finalization :
77- print ("Waiting for the first finalized epoch" )
78+ plan . print ("Waiting for the first finalized epoch" )
7879 first_cl_client = all_cl_client_contexts [0 ]
7980 first_cl_client_id = first_cl_client .beacon_service_id
8081 epoch_recipe = struct (
@@ -87,8 +88,8 @@ def run(args):
8788 "finalized_epoch" : ".data.finalized.epoch"
8889 }
8990 )
90- wait (epoch_recipe , "extract.finalized_epoch" , "!=" , "0" , timeout = "40m" )
91- print ("First finalized epoch occurred successfully" )
91+ plan . wait (epoch_recipe , "extract.finalized_epoch" , "!=" , "0" , timeout = "40m" )
92+ plan . print ("First finalized epoch occurred successfully" )
9293
9394
9495 grafana_info = struct (
0 commit comments