From 2b26cb58721e348d5b7bbe091dc0113c8dc87f2e Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Wed, 9 Oct 2024 13:11:26 +0200 Subject: [PATCH] rename the rest of the import modules --- main.star | 3 --- src/batcher/op-batcher/op_batcher_launcher.star | 12 ++++++------ src/el_cl_launcher.star | 9 ++++----- src/l2.star | 4 ++-- src/proposer/op-proposer/op_proposer_launcher.star | 12 ++++++------ 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/main.star b/main.star index fc3fa97..55654c4 100644 --- a/main.star +++ b/main.star @@ -1,8 +1,5 @@ ethereum_package = import_module("github.com/ethpandaops/ethereum-package/main.star") contract_deployer = import_module("./src/contracts/contract_deployer.star") -static_files = import_module( - "github.com/ethpandaops/ethereum-package/src/static_files/static_files.star" -) l2_launcher = import_module("./src/l2.star") wait_for_sync = import_module("./src/wait/wait_for_sync.star") input_parser = import_module("./src/package_io/input_parser.star") diff --git a/src/batcher/op-batcher/op_batcher_launcher.star b/src/batcher/op-batcher/op_batcher_launcher.star index 33a5d68..112205a 100644 --- a/src/batcher/op-batcher/op_batcher_launcher.star +++ b/src/batcher/op-batcher/op_batcher_launcher.star @@ -1,8 +1,8 @@ -shared_utils = import_module( +ethereum_package_shared_utils = import_module( "github.com/ethpandaops/ethereum-package/src/shared_utils/shared_utils.star" ) -constants = import_module( +ethereum_package_constants = import_module( "github.com/ethpandaops/ethereum-package/src/package_io/constants.star" ) @@ -20,10 +20,10 @@ BATCHER_HTTP_PORT_NUM = 8548 def get_used_ports(): used_ports = { - BATCHER_HTTP_PORT_ID: shared_utils.new_port_spec( + BATCHER_HTTP_PORT_ID: ethereum_package_shared_utils.new_port_spec( BATCHER_HTTP_PORT_NUM, - shared_utils.TCP_PROTOCOL, - shared_utils.HTTP_APPLICATION_PROTOCOL, + ethereum_package_shared_utils.TCP_PROTOCOL, + ethereum_package_shared_utils.HTTP_APPLICATION_PROTOCOL, ), } return used_ports @@ -95,5 +95,5 @@ def get_batcher_config( image=image, ports=ports, cmd=cmd, - private_ip_address_placeholder=constants.PRIVATE_IP_ADDRESS_PLACEHOLDER, + private_ip_address_placeholder=ethereum_package_constants.PRIVATE_IP_ADDRESS_PLACEHOLDER, ) diff --git a/src/el_cl_launcher.star b/src/el_cl_launcher.star index c352d8d..92c245d 100644 --- a/src/el_cl_launcher.star +++ b/src/el_cl_launcher.star @@ -1,7 +1,4 @@ -constants = import_module( - "github.com/ethpandaops/ethereum-package/src/package_io/constants.star" -) -shared_utils = import_module( +ethereum_package_shared_utils = import_module( "github.com/ethpandaops/ethereum-package/src/shared_utils/shared_utils.star" ) @@ -141,7 +138,9 @@ def launch( ) # Zero-pad the index using the calculated zfill value - index_str = shared_utils.zfill_custom(index + 1, len(str(len(participants)))) + index_str = ethereum_package_shared_utils.zfill_custom( + index + 1, len(str(len(participants))) + ) el_service_name = "op-el-{0}-{1}-{2}-{3}".format( index_str, el_type, cl_type, l2_services_suffix diff --git a/src/l2.star b/src/l2.star index d0a3d93..f12c6b1 100644 --- a/src/l2.star +++ b/src/l2.star @@ -2,7 +2,7 @@ participant_network = import_module("./participant_network.star") blockscout = import_module("./blockscout/blockscout_launcher.star") contract_deployer = import_module("./contracts/contract_deployer.star") input_parser = import_module("./package_io/input_parser.star") -static_files = import_module( +ethereum_package_static_files = import_module( "github.com/ethpandaops/ethereum-package/src/static_files/static_files.star" ) util = import_module("./util.star") @@ -29,7 +29,7 @@ def launch_l2( plan.print("Deploying L2 with name {0}".format(network_params.name)) jwt_file = plan.upload_files( - src=static_files.JWT_PATH_FILEPATH, + src=ethereum_package_static_files.JWT_PATH_FILEPATH, name="op_jwt_file{0}".format(l2_services_suffix), ) diff --git a/src/proposer/op-proposer/op_proposer_launcher.star b/src/proposer/op-proposer/op_proposer_launcher.star index 6b049f1..6b3078d 100644 --- a/src/proposer/op-proposer/op_proposer_launcher.star +++ b/src/proposer/op-proposer/op_proposer_launcher.star @@ -1,8 +1,8 @@ -shared_utils = import_module( +ethereum_package_shared_utils = import_module( "github.com/ethpandaops/ethereum-package/src/shared_utils/shared_utils.star" ) -constants = import_module( +ethereum_package_constants = import_module( "github.com/ethpandaops/ethereum-package/src/package_io/constants.star" ) @@ -20,10 +20,10 @@ PROPOSER_HTTP_PORT_NUM = 8560 def get_used_ports(): used_ports = { - PROPOSER_HTTP_PORT_ID: shared_utils.new_port_spec( + PROPOSER_HTTP_PORT_ID: ethereum_package_shared_utils.new_port_spec( PROPOSER_HTTP_PORT_NUM, - shared_utils.TCP_PROTOCOL, - shared_utils.HTTP_APPLICATION_PROTOCOL, + ethereum_package_shared_utils.TCP_PROTOCOL, + ethereum_package_shared_utils.HTTP_APPLICATION_PROTOCOL, ), } return used_ports @@ -87,5 +87,5 @@ def get_proposer_config( image=image, ports=ports, cmd=cmd, - private_ip_address_placeholder=constants.PRIVATE_IP_ADDRESS_PLACEHOLDER, + private_ip_address_placeholder=ethereum_package_constants.PRIVATE_IP_ADDRESS_PLACEHOLDER, )