Merge pull request #1841 from rsksmart/update-expected-conf

Syncing expected.conf
rsksmart · Sep 20, 2022 · 0679f3e · 0679f3e
2 parents 159d59d + f44e3c8
commit 0679f3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/config/ConfigLoader.java b/rskj-core/src/main/java/co/rsk/config/ConfigLoader.java
@@ -189,15 +189,15 @@ private static boolean isActualObjectValid(@Nonnull String keyPath, @Nonnull Con
                 // if expected object is empty, then the actual object should contain only scalar items
                 if (isCollectionType(actualEntryValue.valueType())) {
                     String entryKeyPath = prefix + actualEntryKey;
-                    logger.error("Expected scalar config value for key path `{}`. Actual value is {}. See expected.conf for the expected settings",
+                    logger.warn("Expected scalar config value for key path `{}`. Actual value is {}. See expected.conf for the expected settings",
                             entryKeyPath, actualEntryValue);
                     valid = false;
                 }
             } else {
                 ConfigValue expectedEntryValue = expectedObject.get(actualEntryKey);
                 String entryKeyPath = prefix + actualEntryKey;
                 if (expectedEntryValue == null) {
-                    logger.error("Unexpected config value {} for key path `{}`. See expected.conf for the expected settings", actualEntryValue, entryKeyPath);
+                    logger.warn("Unexpected config value {} for key path `{}`. See expected.conf for the expected settings", actualEntryValue, entryKeyPath);
                     valid = false;
                 } else {
                     valid &= isActualValueValid(entryKeyPath, expectedEntryValue, actualEntryValue);
@@ -219,7 +219,7 @@ private static boolean isActualListValid(@Nonnull String keyPath, @Nonnull Confi
                 // if expected list is empty, then the actual list should contain only scalar items
                 if (isCollectionType(actualItem.valueType())) {
                     String itemKeyPath = keyPath + "[" + index + "]";
-                    logger.error("Expected scalar config value for key path `{}`. Actual value is {}. See expected.conf for the expected settings",
+                    logger.warn("Expected scalar config value for key path `{}`. Actual value is {}. See expected.conf for the expected settings",
                             itemKeyPath, actualItem);
                     valid = false;
                 }
@@ -243,7 +243,7 @@ private static boolean isActualValueValid(@Nonnull String keyPath, @Nonnull Conf
         }
 
         if (expectedValueType != actualValueType) {
-            logger.error("Config value type mismatch. `{}` has type {}, but should have {}. See expected.conf for the expected settings",
+            logger.warn("Config value type mismatch. `{}` has type {}, but should have {}. See expected.conf for the expected settings",
                     keyPath, actualValueType, expectedValueType);
             return false;
         }

diff --git a/rskj-core/src/main/resources/expected.conf b/rskj-core/src/main/resources/expected.conf
@@ -150,6 +150,7 @@ wallet = {
     }]
 }
 miner = {
+    gasUnitInDollars = <double>
     minGasPrice = <minGasPrice>
     server = {
         enabled = <enabled>