remove remaining 4 deprecated CLI options

CHANGELOG.md

@@ -3,13 +3,13 @@
 ## Unreleased
 
 ### Breaking Changes
+- Remove these deprecated CLI options [#9385](https://github.com/hyperledger/besu/pull/9385)
+  - Remove`--Xbonsai-parallel-tx-processing-enabled` deprecated since 25.7.0. Use `--bonsai-parallel-tx-processing-enabled` instead.
+  - Remove `--Xsnapsync-server-enabled` deprecated since 25.7.0. Use `--snapsync-server-enabled` instead.
+  - Remove `--Xsnapsync-synchronizer-pre-merge-headers-only-enabled` deprecated since 25.7.0. Use `--snapsync-synchronizer-pre-checkpoint-headers-only-enabled` instead.
+  - Remove `--Xhistory-expiry-prune` deprecated since 25.7.0. Use `--history-expiry-prune` instead.
 
 ### Upcoming Breaking Changes
-- Deprecated CLI options
-  - `--Xbonsai-parallel-tx-processing-enabled` is deprecated since 25.7.0. Use `--bonsai-parallel-tx-processing-enabled` instead.
-  - `--Xsnapsync-server-enabled` is deprecated since 25.7.0. Use `--snapsync-server-enabled` instead.
-  - `--Xsnapsync-synchronizer-pre-merge-headers-only-enabled` is deprecated since 25.7.0. Use `--snapsync-synchronizer-pre-checkpoint-headers-only-enabled` instead.
-  - `--Xhistory-expiry-prune` is deprecated since 25.7.0. Use `--history-expiry-prune` instead.
 - Sunsetting features - for more context on the reasoning behind the deprecation of these features, including alternative options, read [this blog post](https://www.lfdecentralizedtrust.org/blog/sunsetting-tessera-and-simplifying-hyperledger-besu)
   - Proof of Work consensus (PoW)
   - Fast Sync

app/src/main/java/org/hyperledger/besu/cli/options/SynchronizerOptions.java

@@ -67,8 +67,6 @@ public class SynchronizerOptions implements CLIOptions<SynchronizerConfiguration
 
   // Regular (stable) flag
   private static final String SNAP_SERVER_ENABLED_FLAG = "--snapsync-server-enabled";
-  // Deprecated experimental flag
-  private static final String SNAP_SERVER_ENABLED_EXPERIMENTAL_FLAG = "--Xsnapsync-server-enabled";
 
   private static final String SNAP_PIVOT_BLOCK_WINDOW_VALIDITY_FLAG =
       "--Xsnapsync-synchronizer-pivot-block-window-validity";
@@ -307,12 +305,11 @@ public void parseBlockPropagationRange(final String arg) {
   // TODO --Xsnapsync-server-enabled is deprecated, remove in a future release
   @SuppressWarnings("ExperimentalCliOptionMustBeCorrectlyDisplayed")
   @CommandLine.Option(
-      names = {SNAP_SERVER_ENABLED_FLAG, SNAP_SERVER_ENABLED_EXPERIMENTAL_FLAG},
+      names = {SNAP_SERVER_ENABLED_FLAG},
       paramLabel = "<Boolean>",
       arity = "0..1",
       fallbackValue = "true",
-      description =
-          "Enable snap sync server capability. Note: --Xsnapsync-server-enabled is deprecated and will be removed in a future release. --snapsync-server-enabled is used instead. (default: ${DEFAULT-VALUE})")
+      description = "Enable snap sync server capability. (default: ${DEFAULT-VALUE})")
   private Boolean snapsyncServerEnabled = SnapSyncConfiguration.DEFAULT_SNAP_SERVER_ENABLED;
 
   @CommandLine.Option(
@@ -338,12 +335,8 @@ public void parseBlockPropagationRange(final String arg) {
   private Boolean snapTransactionIndexingEnabled =
       SnapSyncConfiguration.DEFAULT_SNAP_SYNC_TRANSACTION_INDEXING_ENABLED;
 
-  @SuppressWarnings("ExperimentalCliOptionMustBeCorrectlyDisplayed")
   @CommandLine.Option(
-      names = {
-        "--Xsnapsync-synchronizer-pre-merge-headers-only-enabled",
-        SNAP_SYNC_SAVE_PRE_CHECKPOINT_HEADERS_ONLY_FLAG
-      },
+      names = {SNAP_SYNC_SAVE_PRE_CHECKPOINT_HEADERS_ONLY_FLAG},
       paramLabel = "<Boolean>",
       arity = "0..1",
       description =

app/src/main/java/org/hyperledger/besu/cli/options/storage/DataStorageOptions.java

@@ -49,9 +49,8 @@ public class DataStorageOptions implements CLIOptions<DataStorageConfiguration>
       fallbackValue = "true")
   private Boolean receiptCompactionEnabled = DEFAULT_RECEIPT_COMPACTION_ENABLED;
 
-  @SuppressWarnings("ExperimentalCliOptionMustBeCorrectlyDisplayed")
   @CommandLine.Option(
-      names = {"--Xhistory-expiry-prune", "--history-expiry-prune"},
+      names = {"--history-expiry-prune"},
       description =
           "Convenience option to enable online history pruning and configure BlobDB garbage collection settings (default: ${DEFAULT-VALUE}). \"--Xhistory-expiry-prune\" is deprecated and will be removed in a future release. Use \"--history-expiry-prune\" instead.")
   private Boolean historyExpiryPrune = false;

app/src/main/java/org/hyperledger/besu/cli/options/storage/PathBasedExtraStorageOptions.java

@@ -75,13 +75,8 @@ public class PathBasedExtraStorageOptions
           "The max number of blocks to load and prune trie logs for at startup. (default: ${DEFAULT-VALUE})")
   private Integer trieLogPruningWindowSize = DEFAULT_TRIE_LOG_PRUNING_WINDOW_SIZE;
 
-  // TODO --Xbonsai-parallel-tx-processing-enabled is deprecated, remove in a future release
-  @SuppressWarnings("ExperimentalCliOptionMustBeCorrectlyDisplayed")
   @Option(
-      names = {
-        PARALLEL_TX_PROCESSING_ENABLED,
-        "--Xbonsai-parallel-tx-processing-enabled" // deprecated
-      },
+      names = {PARALLEL_TX_PROCESSING_ENABLED},
       arity = "1",
       description =
           "Enables parallelization of transactions to optimize processing speed by concurrently loading and executing necessary data in advance. Will be ignored if --data-storage-format is not bonsai (default: ${DEFAULT-VALUE})")

app/src/test/resources/everything_config.toml

@@ -229,7 +229,6 @@ bonsai-parallel-tx-processing-enabled=false
 # feature flags
 Xsecp256k1-native-enabled=false
 Xaltbn128-native-enabled=false
-Xsnapsync-server-enabled=true
 snapsync-server-enabled=true
 Xbonsai-full-flat-db-enabled=true
 Xpeertask-system-enabled=false