From b9b2ccaa151e80e82c2022a261d42ad02d788f64 Mon Sep 17 00:00:00 2001
From: Fabio Di Fabio <fabio.difabio@consensys.net>
Date: Mon, 16 Sep 2024 11:48:41 +0200
Subject: [PATCH] Fix reading tx-pool-min-score option from configuration file

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
---
 CHANGELOG.md                                   |  1 +
 .../util/TomlConfigurationDefaultProvider.java |  6 +++++-
 .../options/TransactionPoolOptionsTest.java    | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2418386370..fbe23376480 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Bug fixes
 - Fix for `debug_traceCall` to handle transactions without specified gas price. [#7510](https://github.com/hyperledger/besu/pull/7510)
+- Fix reading `tx-pool-min-score` option from configuration file [#7623](https://github.com/hyperledger/besu/pull/7623)
 
 ## 24.9.1
 
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigurationDefaultProvider.java b/besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigurationDefaultProvider.java
index ca76b40b686..636be329d43 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigurationDefaultProvider.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigurationDefaultProvider.java
@@ -120,7 +120,11 @@ private String getConfigurationValue(final OptionSpec optionSpec) {
   }
 
   private boolean isNumericType(final Class<?> type) {
-    return type.equals(Integer.class)
+    return type.equals(Byte.class)
+        || type.equals(byte.class)
+        || type.equals(Short.class)
+        || type.equals(short.class)
+        || type.equals(Integer.class)
         || type.equals(int.class)
         || type.equals(Long.class)
         || type.equals(long.class)
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java
index eb48a3f2a5c..37acbe167ff 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java
@@ -427,6 +427,24 @@ public void minScoreWorks() {
         Byte.toString(minScore));
   }
 
+  @Test
+  public void minScoreWorksConfigFile() throws IOException {
+    final byte minScore = -10;
+    final Path tempConfigFilePath =
+        createTempFile(
+            "config",
+            String.format(
+                """
+              tx-pool-min-score=%s
+              """,
+                minScore));
+
+    internalTestSuccess(
+        config -> assertThat(config.getMinScore()).isEqualTo(minScore),
+        "--config-file",
+        tempConfigFilePath.toString());
+  }
+
   @Test
   public void minScoreNonByteValueReturnError() {
     final var overflowMinScore = Integer.toString(-300);