Skip to content

Commit

Permalink
refactor: using local relative locators instead of absolute (#257)
Browse files Browse the repository at this point in the history
  • Loading branch information
leoporoli authored Oct 2, 2023
1 parent b4fde3d commit cf6fbca
Show file tree
Hide file tree
Showing 29 changed files with 143 additions and 375 deletions.
62 changes: 18 additions & 44 deletions main.star
Original file line number Diff line number Diff line change
@@ -1,59 +1,33 @@
parse_input = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/parse_input.star"
)
parse_input = import_module("./src/package_io/parse_input.star")

participant_network = import_module(
"github.com/kurtosis-tech/ethereum-package/src/participant_network.star"
)
participant_network = import_module("./src/participant_network.star")

static_files = import_module(
"github.com/kurtosis-tech/ethereum-package/src/static_files/static_files.star"
)
static_files = import_module("./src/static_files/static_files.star")
genesis_constants = import_module(
"github.com/kurtosis-tech/ethereum-package/src/prelaunch_data_generator/genesis_constants/genesis_constants.star"
"./src/prelaunch_data_generator/genesis_constants/genesis_constants.star"
)

transaction_spammer = import_module(
"github.com/kurtosis-tech/ethereum-package/src/transaction_spammer/transaction_spammer.star"
)
blob_spammer = import_module(
"github.com/kurtosis-tech/ethereum-package/src/blob_spammer/blob_spammer.star"
)
cl_forkmon = import_module(
"github.com/kurtosis-tech/ethereum-package/src/cl_forkmon/cl_forkmon_launcher.star"
)
el_forkmon = import_module(
"github.com/kurtosis-tech/ethereum-package/src/el_forkmon/el_forkmon_launcher.star"
"./src/transaction_spammer/transaction_spammer.star"
)
blob_spammer = import_module("./src/blob_spammer/blob_spammer.star")
cl_forkmon = import_module("./src/cl_forkmon/cl_forkmon_launcher.star")
el_forkmon = import_module("./src/el_forkmon/el_forkmon_launcher.star")
beacon_metrics_gazer = import_module(
"github.com/kurtosis-tech/ethereum-package/src/beacon_metrics_gazer/beacon_metrics_gazer_launcher.star"
)
dora = import_module(
"github.com/kurtosis-tech/ethereum-package/src/dora/dora_launcher.star"
"./src/beacon_metrics_gazer/beacon_metrics_gazer_launcher.star"
)
dora = import_module("./src/dora/dora_launcher.star")
full_beaconchain_explorer = import_module(
"github.com/kurtosis-tech/ethereum-package/src/full_beaconchain/full_beaconchain_launcher.star"
)
prometheus = import_module(
"github.com/kurtosis-tech/ethereum-package/src/prometheus/prometheus_launcher.star"
)
grafana = import_module(
"github.com/kurtosis-tech/ethereum-package/src/grafana/grafana_launcher.star"
)
mev_boost_launcher_module = import_module(
"github.com/kurtosis-tech/ethereum-package/src/mev_boost/mev_boost_launcher.star"
)
mock_mev_launcher_module = import_module(
"github.com/kurtosis-tech/ethereum-package/src/mock_mev/mock_mev_launcher.star"
)
mev_relay_launcher_module = import_module(
"github.com/kurtosis-tech/ethereum-package/src/mev_relay/mev_relay_launcher.star"
)
mev_flood_module = import_module(
"github.com/kurtosis-tech/ethereum-package/src/mev_flood/mev_flood_launcher.star"
"./src/full_beaconchain/full_beaconchain_launcher.star"
)
prometheus = import_module("./src/prometheus/prometheus_launcher.star")
grafana = import_module("./src/grafana/grafana_launcher.star")
mev_boost_launcher_module = import_module("./src/mev_boost/mev_boost_launcher.star")
mock_mev_launcher_module = import_module("./src/mock_mev/mock_mev_launcher.star")
mev_relay_launcher_module = import_module("./src/mev_relay/mev_relay_launcher.star")
mev_flood_module = import_module("./src/mev_flood/mev_flood_launcher.star")
mev_custom_flood_module = import_module(
"github.com/kurtosis-tech/ethereum-package/src/mev_custom_flood/mev_custom_flood_launcher.star"
"./src/mev_custom_flood/mev_custom_flood_launcher.star"
)

GRAFANA_USER = "admin"
Expand Down
8 changes: 2 additions & 6 deletions src/beacon_metrics_gazer/beacon_metrics_gazer_launcher.star
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
prometheus = import_module(
"github.com/kurtosis-tech/ethereum-package/src/prometheus/prometheus_launcher.star"
)
shared_utils = import_module("../shared_utils/shared_utils.star")
prometheus = import_module("../prometheus/prometheus_launcher.star")


SERVICE_NAME = "beacon-metrics-gazer"
Expand Down
22 changes: 6 additions & 16 deletions src/cl/lighthouse/lighthouse_launcher.star
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
input_parser = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/parse_input.star"
)
cl_client_context = import_module(
"github.com/kurtosis-tech/ethereum-package/src/cl/cl_client_context.star"
)
node_metrics = import_module(
"github.com/kurtosis-tech/ethereum-package/src/node_metrics_info.star"
)

package_io = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/constants.star"
)
shared_utils = import_module("../../shared_utils/shared_utils.star")
input_parser = import_module("../../package_io/parse_input.star")
cl_client_context = import_module("../../cl/cl_client_context.star")
node_metrics = import_module("../../node_metrics_info.star")

package_io = import_module("../../package_io/constants.star")

LIGHTHOUSE_BINARY_COMMAND = "lighthouse"

Expand Down
26 changes: 7 additions & 19 deletions src/cl/lodestar/lodestar_launcher.star
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
input_parser = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/parse_input.star"
)
cl_client_context = import_module(
"github.com/kurtosis-tech/ethereum-package/src/cl/cl_client_context.star"
)
node_metrics = import_module(
"github.com/kurtosis-tech/ethereum-package/src/node_metrics_info.star"
)
cl_node_ready_conditions = import_module(
"github.com/kurtosis-tech/ethereum-package/src/cl/cl_node_ready_conditions.star"
)

package_io = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/constants.star"
)
shared_utils = import_module("../../shared_utils/shared_utils.star")
input_parser = import_module("../../package_io/parse_input.star")
cl_client_context = import_module("../../cl/cl_client_context.star")
node_metrics = import_module("../../node_metrics_info.star")
cl_node_ready_conditions = import_module("../../cl/cl_node_ready_conditions.star")

package_io = import_module("../../package_io/constants.star")

GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER = "/genesis"
# ---------------------------------- Beacon client -------------------------------------
Expand Down
26 changes: 7 additions & 19 deletions src/cl/nimbus/nimbus_launcher.star
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
input_parser = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/parse_input.star"
)
cl_client_context = import_module(
"github.com/kurtosis-tech/ethereum-package/src/cl/cl_client_context.star"
)
node_metrics = import_module(
"github.com/kurtosis-tech/ethereum-package/src/node_metrics_info.star"
)
cl_node_ready_conditions = import_module(
"github.com/kurtosis-tech/ethereum-package/src/cl/cl_node_ready_conditions.star"
)

package_io = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/constants.star"
)
shared_utils = import_module("../../shared_utils/shared_utils.star")
input_parser = import_module("../../package_io/parse_input.star")
cl_client_context = import_module("../../cl/cl_client_context.star")
node_metrics = import_module("../../node_metrics_info.star")
cl_node_ready_conditions = import_module("../../cl/cl_node_ready_conditions.star")

package_io = import_module("../../package_io/constants.star")

GENESIS_DATA_MOUNTPOINT_ON_CLIENT = "/genesis-data"

Expand Down
24 changes: 6 additions & 18 deletions src/cl/prysm/prysm_launcher.star
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
input_parser = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/parse_input.star"
)
cl_client_context = import_module(
"github.com/kurtosis-tech/ethereum-package/src/cl/cl_client_context.star"
)
node_metrics = import_module(
"github.com/kurtosis-tech/ethereum-package/src/node_metrics_info.star"
)
cl_node_ready_conditions = import_module(
"github.com/kurtosis-tech/ethereum-package/src/cl/cl_node_ready_conditions.star"
)
package_io = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/constants.star"
)
shared_utils = import_module("../../shared_utils/shared_utils.star")
input_parser = import_module("../../package_io/parse_input.star")
cl_client_context = import_module("../../cl/cl_client_context.star")
node_metrics = import_module("../../node_metrics_info.star")
cl_node_ready_conditions = import_module("../../cl/cl_node_ready_conditions.star")
package_io = import_module("../../package_io/constants.star")

IMAGE_SEPARATOR_DELIMITER = ","
EXPECTED_NUM_IMAGES = 2
Expand Down
26 changes: 7 additions & 19 deletions src/cl/teku/teku_launcher.star
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
input_parser = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/parse_input.star"
)
cl_client_context = import_module(
"github.com/kurtosis-tech/ethereum-package/src/cl/cl_client_context.star"
)
node_metrics = import_module(
"github.com/kurtosis-tech/ethereum-package/src/node_metrics_info.star"
)
cl_node_ready_conditions = import_module(
"github.com/kurtosis-tech/ethereum-package/src/cl/cl_node_ready_conditions.star"
)

package_io = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/constants.star"
)
shared_utils = import_module("../../shared_utils/shared_utils.star")
input_parser = import_module("../../package_io/parse_input.star")
cl_client_context = import_module("../../cl/cl_client_context.star")
node_metrics = import_module("../../node_metrics_info.star")
cl_node_ready_conditions = import_module("../../cl/cl_node_ready_conditions.star")

package_io = import_module("../../package_io/constants.star")

TEKU_BINARY_FILEPATH_IN_IMAGE = "/opt/teku/bin/teku"

Expand Down
4 changes: 1 addition & 3 deletions src/cl_forkmon/cl_forkmon_launcher.star
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
shared_utils = import_module("../shared_utils/shared_utils.star")


SERVICE_NAME = "cl-forkmon"
Expand Down
4 changes: 1 addition & 3 deletions src/dora/dora_launcher.star
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
shared_utils = import_module("../shared_utils/shared_utils.star")


SERVICE_NAME = "dora"
Expand Down
24 changes: 6 additions & 18 deletions src/el/besu/besu_launcher.star
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
input_parser = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/parse_input.star"
)
el_client_context = import_module(
"github.com/kurtosis-tech/ethereum-package/src/el/el_client_context.star"
)
el_admin_node_info = import_module(
"github.com/kurtosis-tech/ethereum-package/src/el/el_admin_node_info.star"
)
node_metrics = import_module(
"github.com/kurtosis-tech/ethereum-package/src/node_metrics_info.star"
)
package_io = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/constants.star"
)
shared_utils = import_module("../../shared_utils/shared_utils.star")
input_parser = import_module("../../package_io/parse_input.star")
el_client_context = import_module("../../el/el_client_context.star")
el_admin_node_info = import_module("../../el/el_admin_node_info.star")
node_metrics = import_module("../../node_metrics_info.star")
package_io = import_module("../../package_io/constants.star")

# The dirpath of the execution data directory on the client container
EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER = "/opt/besu/execution-data"
Expand Down
26 changes: 7 additions & 19 deletions src/el/erigon/erigon_launcher.star
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
input_parser = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/parse_input.star"
)
el_admin_node_info = import_module(
"github.com/kurtosis-tech/ethereum-package/src/el/el_admin_node_info.star"
)
el_client_context = import_module(
"github.com/kurtosis-tech/ethereum-package/src/el/el_client_context.star"
)

node_metrics = import_module(
"github.com/kurtosis-tech/ethereum-package/src/node_metrics_info.star"
)
package_io = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/constants.star"
)
shared_utils = import_module("../../shared_utils/shared_utils.star")
input_parser = import_module("../../package_io/parse_input.star")
el_admin_node_info = import_module("../../el/el_admin_node_info.star")
el_client_context = import_module("../../el/el_client_context.star")

node_metrics = import_module("../../node_metrics_info.star")
package_io = import_module("../../package_io/constants.star")

# The dirpath of the execution data directory on the client container
EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER = "/home/erigon/execution-data"
Expand Down
26 changes: 7 additions & 19 deletions src/el/ethereumjs/ethereumjs_launcher.star
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
input_parser = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/parse_input.star"
)
el_client_context = import_module(
"github.com/kurtosis-tech/ethereum-package/src/el/el_client_context.star"
)
el_admin_node_info = import_module(
"github.com/kurtosis-tech/ethereum-package/src/el/el_admin_node_info.star"
)

node_metrics = import_module(
"github.com/kurtosis-tech/ethereum-package/src/node_metrics_info.star"
)
package_io = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/constants.star"
)
shared_utils = import_module("../../shared_utils/shared_utils.star")
input_parser = import_module("../..//package_io/parse_input.star")
el_client_context = import_module("../../el/el_client_context.star")
el_admin_node_info = import_module("../../el/el_admin_node_info.star")

node_metrics = import_module("../../node_metrics_info.star")
package_io = import_module("../../package_io/constants.star")


RPC_PORT_NUM = 8545
Expand Down
26 changes: 7 additions & 19 deletions src/el/geth/geth_launcher.star
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
shared_utils = import_module(
"github.com/kurtosis-tech/ethereum-package/src/shared_utils/shared_utils.star"
)
input_parser = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/parse_input.star"
)
el_client_context = import_module(
"github.com/kurtosis-tech/ethereum-package/src/el/el_client_context.star"
)
el_admin_node_info = import_module(
"github.com/kurtosis-tech/ethereum-package/src/el/el_admin_node_info.star"
)
shared_utils = import_module("../../shared_utils/shared_utils.star")
input_parser = import_module("../../package_io/parse_input.star")
el_client_context = import_module("../../el/el_client_context.star")
el_admin_node_info = import_module("../../el/el_admin_node_info.star")
genesis_constants = import_module(
"github.com/kurtosis-tech/ethereum-package/src/prelaunch_data_generator/genesis_constants/genesis_constants.star"
"../../prelaunch_data_generator/genesis_constants/genesis_constants.star"
)

node_metrics = import_module(
"github.com/kurtosis-tech/ethereum-package/src/node_metrics_info.star"
)
package_io = import_module(
"github.com/kurtosis-tech/ethereum-package/src/package_io/constants.star"
)
node_metrics = import_module("../../node_metrics_info.star")
package_io = import_module("../../package_io/constants.star")


RPC_PORT_NUM = 8545
Expand Down
Loading

0 comments on commit cf6fbca

Please sign in to comment.