Keep CLI options consistent by removing the '-enable' suffix from the outliers (#3928)

Makefile

@@ -383,7 +383,7 @@ define CONNECT_TO_NETWORK_IN_DEV_MODE
 		--network=$(1) $(3) $(GOERLI_TESTNETS_PARAMS) \
 		--log-level="DEBUG; TRACE:discv5,networking; REQUIRED:none; DISABLED:none" \
 		--data-dir=build/data/shared_$(1)_$(NODE_ID) \
-		--light-client-enable=on \
+		--light-client=on \
 		--dump $(NODE_PARAMS)
 endef
 

beacon_chain/conf.nim

@@ -283,7 +283,7 @@ type
         hidden
         desc: "BETA: Accelerate sync using light client."
         defaultValue: false
-        name: "light-client-enable" .}: bool
+        name: "light-client" .}: bool
 
       lightClientTrustedBlockRoot* {.
         hidden
@@ -546,7 +546,7 @@ type
         hidden
         desc: "Enable external payload builder"
         defaultValue: false
-        name: "payload-builder-enable" .}: bool
+        name: "payload-builder" .}: bool
 
       payloadBuilderUrl* {.
         hidden

scripts/launch_local_testnet.sh

@@ -924,7 +924,7 @@ for NUM_NODE in $(seq 0 $(( NUM_NODES - 1 ))); do
     ${STOP_AT_EPOCH_FLAG} \
     --rest-port="$(( BASE_REST_PORT + NUM_NODE ))" \
     --metrics-port="$(( BASE_METRICS_PORT + NUM_NODE ))" \
-    --light-client-enable=on \
+    --light-client=on \
     ${EXTRA_ARGS} \
     &> "${DATA_DIR}/log${NUM_NODE}.txt" &