From a8e022bbc16db2d611277a399b392bcd919421fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= Date: Mon, 9 Oct 2023 14:11:40 +0200 Subject: [PATCH 1/6] Fix tx_fuzzer params --- src/package_io/parse_input.star | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 72f907726..ef3a88b99 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -41,8 +41,7 @@ DEFAULT_ADDITIONAL_SERVICES = [ ATTR_TO_BE_SKIPPED_AT_ROOT = ( "network_params", "participants", - "mev_params", - "tx_spammer_params", + "mev_params" ) DEFAULT_EXPLORER_VERSION = "dora" @@ -94,7 +93,8 @@ def parse_input(plan, input_args): ) ) - result["tx_spammer_params"] = get_default_tx_spammer_params() + if "tx_spammer_params" not in result: + result["tx_spammer_params"] = get_default_tx_spammer_params() return struct( participants=[ From 5b2fb65e1df7e7ebf58a66727949a47e3bb6e9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= Date: Tue, 10 Oct 2023 13:31:53 +0200 Subject: [PATCH 2/6] Lint --- src/package_io/parse_input.star | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index ef3a88b99..be248b258 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -38,11 +38,7 @@ DEFAULT_ADDITIONAL_SERVICES = [ "prometheus_grafana", ] -ATTR_TO_BE_SKIPPED_AT_ROOT = ( - "network_params", - "participants", - "mev_params" -) +ATTR_TO_BE_SKIPPED_AT_ROOT = ("network_params", "participants", "mev_params") DEFAULT_EXPLORER_VERSION = "dora" From 8341cfeab2b2654eb9134baf1c0ed8dde7d908f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= <43241881+kamilchodola@users.noreply.github.com> Date: Wed, 11 Oct 2023 10:08:32 +0200 Subject: [PATCH 3/6] Update src/package_io/parse_input.star MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Piotr Piwoński --- src/package_io/parse_input.star | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 4e3d3b9c3..e7f43dfeb 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -86,8 +86,7 @@ def parse_input(plan, input_args): ) ) - if "tx_spammer_params" not in result: - result["tx_spammer_params"] = get_default_tx_spammer_params() + result["tx_spammer_params"] = dict(get_default_tx_spammer_params(), **(result.get("tx_spammer_params", {})) result["goomy_blob_params"] = get_default_goomy_blob_params() From 8227674dd2090117799ae5ea824b897a445bddd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= Date: Wed, 11 Oct 2023 11:42:34 +0200 Subject: [PATCH 4/6] Linting and fix --- src/package_io/parse_input.star | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 70b02f0ed..7efbaa7ca 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -38,7 +38,12 @@ DEFAULT_ADDITIONAL_SERVICES = [ "prometheus_grafana", ] -ATTR_TO_BE_SKIPPED_AT_ROOT = ("network_params", "participants", "mev_params", "goomy_blob_params") +ATTR_TO_BE_SKIPPED_AT_ROOT = ( + "network_params", + "participants", + "mev_params", + "goomy_blob_params", +) package_io_constants = import_module("../package_io/constants.star") @@ -86,8 +91,10 @@ def parse_input(plan, input_args): ) ) - result["tx_spammer_params"] = dict(get_default_tx_spammer_params(), **(result.get("tx_spammer_params", {})) - + result["tx_spammer_params"] = dict( + get_default_tx_spammer_params(), **(result.get("tx_spammer_params", {})) + ) + result["goomy_blob_params"] = get_default_goomy_blob_params() return struct( From 3feb1df0729d5eb84efcba59d099816c6b7e7ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= Date: Thu, 12 Oct 2023 16:38:15 +0200 Subject: [PATCH 5/6] Apply comment --- src/package_io/parse_input.star | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 48ff5a20d..463774c66 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -45,6 +45,7 @@ ATTR_TO_BE_SKIPPED_AT_ROOT = ( "participants", "mev_params", "goomy_blob_params", + "tx_spammer_params", ) package_io_constants = import_module("../package_io/constants.star") @@ -63,6 +64,7 @@ def parse_input(plan, input_args): result["launch_additional_services"] = True result["additional_services"] = DEFAULT_ADDITIONAL_SERVICES result["grafana_additional_dashboards"] = [] + result["tx_spammer_params"] = get_default_tx_spammer_params() for attr in input_args: value = input_args[attr] @@ -74,6 +76,10 @@ def parse_input(plan, input_args): for sub_attr in input_args["mev_params"]: sub_value = input_args["mev_params"][sub_attr] result["mev_params"][sub_attr] = sub_value + elif attr == "tx_spammer_params": + for sub_attr in input_args["tx_spammer_params"]: + sub_value = input_args["tx_spammer_params"][sub_attr] + result["tx_spammer_params"][sub_attr] = sub_value if result.get("mev_type") in ("mock", "full"): result = enrich_mev_extra_params( @@ -94,10 +100,6 @@ def parse_input(plan, input_args): ) ) - result["tx_spammer_params"] = dict( - get_default_tx_spammer_params(), **(result.get("tx_spammer_params", {})) - ) - result["goomy_blob_params"] = get_default_goomy_blob_params() return struct( @@ -403,7 +405,7 @@ def get_default_mev_params(): def get_default_tx_spammer_params(): - return {"tx_spammer_extra_args": []} + return {"tx_spammer_extra_args": [ ]} def get_default_goomy_blob_params(): From 1ba45fc0396953c3b62b3f38268090674e6ed29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= Date: Thu, 12 Oct 2023 16:43:39 +0200 Subject: [PATCH 6/6] Lint --- src/package_io/parse_input.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 463774c66..e96b69c5c 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -405,7 +405,7 @@ def get_default_mev_params(): def get_default_tx_spammer_params(): - return {"tx_spammer_extra_args": [ ]} + return {"tx_spammer_extra_args": []} def get_default_goomy_blob_params():