Handle null genesis config

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
hyperledger · Jul 4, 2023 · 4b88158 · 4b88158
1 parent 12e38d2
commit 4b88158
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -93,6 +93,7 @@
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.GenesisConfigOptions;
 import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
 import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfiguration;
 import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfigurationProvider;
 import org.hyperledger.besu.controller.BesuController;
@@ -2133,7 +2134,10 @@ private void issueOptionWarnings() {
             "--remote-connections-max-percentage"));
 
     // Check that block producer options work
-    if (!isMergeEnabled() && !genesisConfigOptions.isPoa()) {
+    if (!isMergeEnabled()
+        && !(Optional.ofNullable(genesisConfigOptions)
+            .orElseGet(() -> new StubGenesisConfigOptions())
+            .isPoa())) {
       CommandLineUtils.checkOptionDependencies(
           logger,
           commandLine,
@@ -2146,7 +2150,9 @@ private void issueOptionWarnings() {
               "--miner-extra-data"));
     }
 
-    if (!genesisConfigOptions.isPoa()) {
+    if (!Optional.ofNullable(genesisConfigOptions)
+        .orElseGet(() -> new StubGenesisConfigOptions())
+        .isPoa()) {
       // Check that mining options are able to work
       CommandLineUtils.checkOptionDependencies(
           logger,