Skip to content

Commit

Permalink
refactor: remove "launch_additional_services"' (#315)
Browse files Browse the repository at this point in the history
  • Loading branch information
barnabasbusa authored Oct 19, 2023
1 parent 9bf9979 commit 6e8e290
Show file tree
Hide file tree
Showing 18 changed files with 17 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .circleci/tests/besu-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
"cl_client_type": "lodestar"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/disable-peer-scoring.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
"cl_client_type": "teku"
}
],
"launch_additional_services": false,
"additional_services": [],
"disable_peer_scoring": true
}
2 changes: 1 addition & 1 deletion .circleci/tests/erigon-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"cl_client_type": "lodestar"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/ethereumjs-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"cl_client_type": "lodestar"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/geth-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"cl_client_type": "lodestar"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/lighthouse-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
"cl_client_type": "lighthouse"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/lodestar-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
"cl_client_type": "lodestar"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/mix-with-capella.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
"network_params": {
"capella_fork_epoch": 1
},
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/mix.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
"cl_client_type": "teku"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/nethermind-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"cl_client_type": "lodestar"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/nimbus-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
"cl_client_type": "nimbus"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/prysm-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
"cl_client_type": "prysm"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/reth-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"cl_client_type": "lodestar"
}
],
"launch_additional_services": false
"additional_services": []
}
2 changes: 1 addition & 1 deletion .circleci/tests/teku-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
"cl_client_type": "teku"
}
],
"launch_additional_services": false
"additional_services": []
}
13 changes: 3 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,6 @@ To configure the package behaviour, you can modify your `network_params.json` fi
"goomy_blob_args": []
},
// True by defaults, adds services defined in "additional_services" alongside the Ethereum network
// If set to false:
// - only Ethereum network (EL and CL nodes) will be launched. Nothing else (no transaction spammer)
// - params for the CL nodes will be ignored (e.g. CL node image, CL node extra params)
"launch_additional_services": true,
// By default includes
// - A transaction spammer & blob spammer is launched to fake transactions sent to the network
// - Forkmon for EL will be launched
Expand Down Expand Up @@ -368,7 +362,7 @@ To configure the package behaviour, you can modify your `network_params.json` fi
"capella_fork_epoch": 2,
"deneb_fork_epoch": 5
},
"launch_additional_services": false,
"additional_services": [],
"wait_for_finalization": false,
"wait_for_verifications": false,
"global_client_log_level": "info"
Expand Down Expand Up @@ -407,7 +401,7 @@ To configure the package behaviour, you can modify your `network_params.json` fi
},
],
"mev_type": "mock",
"launch_additional_services": false
"additional_services": []
}
```
Expand Down Expand Up @@ -445,7 +439,7 @@ To configure the package behaviour, you can modify your `network_params.json` fi
"network_params": {
"capella_fork_epoch": 1
},
"launch_additional_services": false
"additional_services": []
}
```
Expand All @@ -465,7 +459,6 @@ To configure the package behaviour, you can modify your `network_params.json` fi
"count": 2
}
],
"launch_additional_services": true,
"snooper_enabled": true
}
```
Expand Down
1 change: 0 additions & 1 deletion main.star
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ def run(plan, args={}):
)
all_mevboost_contexts.append(mev_boost_context)

if not args_with_right_defaults.launch_additional_services:
output = struct(
all_participants=all_participants,
final_genesis_timestamp=final_genesis_timestamp,
Expand Down
1 change: 0 additions & 1 deletion network_params.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"deneb_fork_epoch": 4,
"electra_fork_epoch": null
},
"launch_additional_services": true,
"additional_services": [
"tx_spammer",
"blob_spammer",
Expand Down
2 changes: 0 additions & 2 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ def input_parser(plan, input_args):
# add default eth2 input params
result["mev_type"] = None
result["mev_params"] = get_default_mev_params()
result["launch_additional_services"] = True
result["additional_services"] = DEFAULT_ADDITIONAL_SERVICES
result["grafana_additional_dashboards"] = []
result["tx_spammer_params"] = get_default_tx_spammer_params()
Expand Down Expand Up @@ -195,7 +194,6 @@ def input_parser(plan, input_args):
"interval_between_transactions"
],
),
launch_additional_services=result["launch_additional_services"],
additional_services=result["additional_services"],
wait_for_finalization=result["wait_for_finalization"],
global_client_log_level=result["global_client_log_level"],
Expand Down

0 comments on commit 6e8e290

Please sign in to comment.