non-existent genesis file: clarify error (hyperledger#2320)

* add error message * added a test for non-existent genesis file Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
garyschulte · May 25, 2021 · 81d4fac · 81d4fac
1 parent 1cb9d28
commit 81d4fac
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -1488,7 +1488,8 @@ private GenesisConfigOptions readGenesisConfigOptions() {
       final GenesisConfigFile genesisConfigFile = GenesisConfigFile.fromConfig(genesisConfig());
       genesisConfigOptions = genesisConfigFile.getConfigOptions(genesisConfigOverrides);
     } catch (final Exception e) {
-      throw new IllegalStateException("Unable to read genesis file for GoQuorum options", e);
+      throw new ParameterException(
+          this.commandLine, "Unable to load genesis file. " + e.getCause());
     }
     return genesisConfigOptions;
   }

diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
@@ -994,6 +994,18 @@ public void genesisAndNetworkMustNotBeUsedTogether() throws Exception {
         .startsWith("--network option and --genesis-file option can't be used at the same time.");
   }
 
+  @Test
+  public void nonExistentGenesisGivesError() throws Exception {
+    final String nonExistentGenesis = "non-existent-genesis.json";
+    parseCommand("--genesis-file", nonExistentGenesis);
+
+    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+
+    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString()).startsWith("Unable to load genesis file");
+    assertThat(commandErrorOutput.toString()).contains(nonExistentGenesis);
+  }
+
   @Test
   public void testDnsDiscoveryUrlEthConfig() throws Exception {
     final ArgumentCaptor<EthNetworkConfig> networkArg =