Skip to content

fix: Support multiple sequencers: Fix service name for builders [26/N] #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sigma merged 1 commit into from
Jun 4, 2025
Merged

fix: Support multiple sequencers: Fix service name for builders [26/N] #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/l2/participant/cl/input_parser.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def parse(args, participant_name, network_params, registry):


def parse_builder(args, participant_name, network_params, registry):
return _parse(args, participant_name, network_params, registry, "cl_builder")
return _parse(args, participant_name, network_params, registry, "clbuilder")


def _parse(args, participant_name, network_params, registry, cl_kind):
Expand Down Expand Up @@ -60,8 +60,8 @@ def _parse(args, participant_name, network_params, registry, cl_kind):
)

cl_params["name"] = participant_name
cl_params["service_name"] = "op-cl-{}-{}-{}".format(
network_id, participant_name, cl_params["type"]
cl_params["service_name"] = "op-{}-{}-{}-{}".format(
cl_kind, network_id, participant_name, cl_params["type"]
)

# Draft of what the labels could look like
Expand Down
6 changes: 3 additions & 3 deletions src/l2/participant/el/input_parser.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def parse_builder(el_args, participant_name, network_params, registry):
participant_name=participant_name,
network_params=network_params,
registry=registry,
el_kind="el_builder",
el_kind="elbuilder",
)


Expand Down Expand Up @@ -80,8 +80,8 @@ def _parse(el_args, default_args, participant_name, network_params, registry, el
)

el_params["name"] = participant_name
el_params["service_name"] = "op-el-{}-{}-{}".format(
network_id, participant_name, el_params["type"]
el_params["service_name"] = "op-{}-{}-{}-{}".format(
el_kind, network_id, participant_name, el_params["type"]
)

# Draft of what the labels could look like
Expand Down
2 changes: 1 addition & 1 deletion test/l2/participant/el/launcher_test.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ def test_l2_participant_el_launcher_op_rbuilder(plan):
expect.eq(
service_config.labels,
{
"op.kind": "el_builder",
"op.kind": "elbuilder",
"op.network.id": "2151908",
"op.network.participant.name": "node0",
"op.el.type": "op-rbuilder",
Expand Down
16 changes: 8 additions & 8 deletions test/l2/participant/input_parser_test.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ def test_l2_participant_input_parser_defaults(plan):
name="node0",
type="op-node",
image="us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.13.3",
service_name="op-cl-1000-node0-op-node",
service_name="op-clbuilder-1000-node0-op-node",
labels={
"op.kind": "cl_builder",
"op.kind": "clbuilder",
"op.network.id": "1000",
"op.network.participant.name": "node0",
"op.cl.type": "op-node",
Expand Down Expand Up @@ -130,9 +130,9 @@ def test_l2_participant_input_parser_defaults(plan):
name="node0",
type="op-geth",
image="us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:latest",
service_name="op-el-1000-node0-op-geth",
service_name="op-elbuilder-1000-node0-op-geth",
labels={
"op.kind": "el_builder",
"op.kind": "elbuilder",
"op.network.id": "1000",
"op.network.participant.name": "node0",
"op.el.type": "op-geth",
Expand Down Expand Up @@ -194,9 +194,9 @@ def test_l2_participant_input_parser_defaults(plan):
name="node1",
type="op-node",
image="us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.13.3",
service_name="op-cl-1000-node1-op-node",
service_name="op-clbuilder-1000-node1-op-node",
labels={
"op.kind": "cl_builder",
"op.kind": "clbuilder",
"op.network.id": "1000",
"op.network.participant.name": "node1",
"op.cl.type": "op-node",
Expand Down Expand Up @@ -236,9 +236,9 @@ def test_l2_participant_input_parser_defaults(plan):
name="node1",
type="op-geth",
image="us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:latest",
service_name="op-el-1000-node1-op-geth",
service_name="op-elbuilder-1000-node1-op-geth",
labels={
"op.kind": "el_builder",
"op.kind": "elbuilder",
"op.network.id": "1000",
"op.network.participant.name": "node1",
"op.el.type": "op-geth",
Expand Down
Loading