simplify --min-gas-price dependency check (hyperledger#2582)

Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
yudongpo · Jul 28, 2021 · 1868d3c · 1868d3c
1 parent 0a04d84
commit 1868d3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 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
@@ -1558,19 +1558,13 @@ private void issueOptionWarnings() {
         !isMiningEnabled,
         asList(
             "--miner-coinbase",
+            "--min-gas-price",
             "--min-block-occupancy-ratio",
             "--miner-extra-data",
             "--miner-stratum-enabled",
             "--Xminer-remote-sealers-limit",
             "--Xminer-remote-sealers-hashrate-ttl"));
 
-    CommandLineUtils.checkMultiOptionDependencies(
-        logger,
-        commandLine,
-        "--min-gas-price ignored because none of --miner-enabled or isQuorum (in genesis file) was defined.",
-        List.of(!isMiningEnabled, !isGoQuorumCompatibilityMode),
-        singletonList("--min-gas-price"));
-
     CommandLineUtils.checkOptionDependencies(
         logger,
         commandLine,

diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
@@ -3003,8 +3003,7 @@ public void miningOptionsRequiresServiceToBeEnabled() {
   public void minGasPriceRequiresMainOption() {
     parseCommand("--min-gas-price", "0");
 
-    verifyMultiOptionsConstraintLoggerCall(
-        "--min-gas-price ignored because none of --miner-enabled or isQuorum (in genesis file) was defined.");
+    verifyOptionsConstraintLoggerCall("--miner-enabled", "--min-gas-price");
 
     assertThat(commandOutput.toString()).isEmpty();
     assertThat(commandErrorOutput.toString()).isEmpty();