cleanup

src/participant_network/prelaunch_data_generator/cl_genesis/cl_genesis_data_generator.star

@@ -52,7 +52,7 @@ def generate_cl_genesis_data(
 
 	genesis_generation_config_artifact_uuid = render_templates(template_and_data_by_rel_dest_filepath)
 
-	# TODO Make this the actual data generator
+	# TODO Make this the actual data generator - comment copied from the original module
 	launcher_service_id = launch_prelaunch_data_generator(
 		{
 			genesis_generation_config_artifact_uuid:  CONFIG_DIRPATH_ON_GENERATOR,
@@ -60,9 +60,6 @@ def generate_cl_genesis_data(
 		},
 	)
 
-	# TODO add a remove_service call that removes the launcher_service_id, before the function returns
-	# do that when https://github.com/kurtosis-tech/kurtosis/issues/244 is closed
-
 	all_dirpaths_to_create_on_generator = [
 		CONFIG_DIRPATH_ON_GENERATOR,
 		OUTPUT_DIRPATH_ON_GENERATOR,
@@ -148,6 +145,8 @@ def generate_cl_genesis_data(
 		genesis_ssz_rel_filepath,
 	)
 
+	# we cleanup as the data generation is done
+	remove_service(launcher_service_id)
 	return result
 
 

src/participant_network/prelaunch_data_generator/cl_validator_keystores/cl_validator_keystore_generator.star

@@ -32,14 +32,11 @@ def generate_cl_validator_keystores(
 	mnemonic,
 	num_nodes,
 	num_validators_per_node):
-
+	
 	service_id = launch_prelaunch_data_generator(
 		{},
 	)
 
-	# TODO remove the service added above
-
-
 	all_output_dirpaths = []
 	all_sub_command_strs = []
 
@@ -107,4 +104,6 @@ def generate_cl_validator_keystores(
 		keystore_files,
 	)
 
+	# we cleanup as the data generation is done
+	remove_service(service_id)
 	return result

src/participant_network/prelaunch_data_generator/el_genesis/el_genesis_data_generator.star

@@ -45,15 +45,13 @@ def generate_el_genesis_data(
 	genesis_generation_config_artifact_uuid = render_templates(template_and_data_by_rel_dest_filepath)
 
 
-	# TODO Make this the actual data generator
+	# TODO Make this the actual data generator - comment copied from the original module
 	launcher_service_id = launch_prelaunch_data_generator(
 		{
 			genesis_generation_config_artifact_uuid: CONFIG_DIRPATH_ON_GENERATOR,
 		},
 	)
 
-	# TODO defer remove the above generated service
-
 
 	all_dirpaths_to_create_on_generator = [
 		CONFIG_DIRPATH_ON_GENERATOR,
@@ -119,7 +117,9 @@ def generate_el_genesis_data(
 		genesis_filename_to_relative_filepath_in_artifact[NETHERMIND_GENESIS_FILENAME],
 		genesis_filename_to_relative_filepath_in_artifact[BESU_GENESIS_FILENAME],
 	)
-	
+
+	# we cleanup as the data generation is done
+	remove_service(launcher_service_id)
 	return result