Update limit trie logs validation message for sync-mode=FULL (hyperle…

…dger#7279) Signed-off-by: Simon Dudley <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]> Signed-off-by: Daniel Lehrner <[email protected]>
daniellehrner · Jul 16, 2024 · 4424feb · 4424feb
1 parent d6f3470
commit 4424feb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/DataStorageOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/DataStorageOptions.java
@@ -147,8 +147,10 @@ public void validate(final CommandLine commandLine, final SyncMode syncMode) {
         throw new CommandLine.ParameterException(
             commandLine,
             String.format(
-                "Cannot enable " + BONSAI_LIMIT_TRIE_LOGS_ENABLED + " with sync-mode %s",
-                syncMode));
+                "Cannot enable %s with sync-mode %s. You must set %s or use a different sync-mode",
+                BONSAI_LIMIT_TRIE_LOGS_ENABLED,
+                SyncMode.FULL,
+                BONSAI_LIMIT_TRIE_LOGS_ENABLED + "=false"));
       }
       if (bonsaiMaxLayersToLoad < MINIMUM_BONSAI_TRIE_LOG_RETENTION_LIMIT) {
         throw new CommandLine.ParameterException(

diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/stable/DataStorageOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/stable/DataStorageOptionsTest.java
@@ -55,6 +55,14 @@ public void bonsaiTrieLogsEnabled_explicitlySetToFalse() {
         "--bonsai-limit-trie-logs-enabled=false");
   }
 
+  @Test
+  public void bonsaiTrieLogPruningWindowSizeShouldBePositive2() {
+    internalTestFailure(
+        "Cannot enable --bonsai-limit-trie-logs-enabled with sync-mode FULL. You must set --bonsai-limit-trie-logs-enabled=false or use a different sync-mode",
+        "--sync-mode",
+        "FULL");
+  }
+
   @Test
   public void bonsaiTrieLogPruningWindowSizeShouldBePositive() {
     internalTestFailure(