From f56c49dca7238bc87ca73d860abbf808430297cb Mon Sep 17 00:00:00 2001
From: Reynold Morel <reynold.morel@iovlabs.org>
Date: Fri, 9 Aug 2024 08:22:48 -0400
Subject: [PATCH] Addressing comments

---
 rskj-core/src/main/resources/config/main.conf                | 3 +--
 rskj-core/src/main/resources/config/regtest.conf             | 3 +--
 rskj-core/src/main/resources/expected.conf                   | 1 -
 rskj-core/src/main/resources/reference.conf                  | 1 -
 .../config/blockchain/upgrades/ActivationConfigTest.java     | 5 +++--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/rskj-core/src/main/resources/config/main.conf b/rskj-core/src/main/resources/config/main.conf
index b43f16d67be..da37b9165e1 100644
--- a/rskj-core/src/main/resources/config/main.conf
+++ b/rskj-core/src/main/resources/config/main.conf
@@ -14,8 +14,7 @@ blockchain.config {
         fingerroot500 = 5468000,
         arrowhead600 = 6223700,
         arrowhead631 = 6549300,
-        lovell700 = -1,
-        tbd000 = -1
+        lovell700 = -1
     }
 }
 
diff --git a/rskj-core/src/main/resources/config/regtest.conf b/rskj-core/src/main/resources/config/regtest.conf
index b3fb83b7b1f..d19ce575c34 100644
--- a/rskj-core/src/main/resources/config/regtest.conf
+++ b/rskj-core/src/main/resources/config/regtest.conf
@@ -14,8 +14,7 @@ blockchain.config {
         fingerroot500 = 0,
         arrowhead600 = 0,
         arrowhead631 = -1,
-        lovell700 = 0,
-        tbd000 = 0
+        lovell700 = 0
     },
     consensusRules = {
         rskip97 = -1 # disable orchid difficulty drop
diff --git a/rskj-core/src/main/resources/expected.conf b/rskj-core/src/main/resources/expected.conf
index 855deaf1a2d..718dd008902 100644
--- a/rskj-core/src/main/resources/expected.conf
+++ b/rskj-core/src/main/resources/expected.conf
@@ -96,7 +96,6 @@ blockchain = {
              rskip417 = <hardforkName>
              rskip428 = <hardforkName>
              rskip434 = <hardforkName>
-             rskip00 = <hardforkName>
              rskip432 = <hardforkName>
          }
     }
diff --git a/rskj-core/src/main/resources/reference.conf b/rskj-core/src/main/resources/reference.conf
index c51b921ff61..a10741524be 100644
--- a/rskj-core/src/main/resources/reference.conf
+++ b/rskj-core/src/main/resources/reference.conf
@@ -81,7 +81,6 @@ blockchain = {
             rskip417 = arrowhead600
             rskip428 = lovell700
             rskip434 = arrowhead631
-            rskip00 = tbd000
             rskip432 = lovell700
         }
     }
diff --git a/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java b/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java
index 0e5e0dcef8d..fc8fccf599b 100644
--- a/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java
+++ b/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java
@@ -45,7 +45,6 @@ class ActivationConfigTest {
             "    arrowhead600: 0",
             "    arrowhead631: 0",
             "    lovell700: 0",
-            "    tbd000: 0",
             "},",
             "consensusRules: {",
             "    areBridgeTxsPaid: afterBridgeSync,",
@@ -122,7 +121,9 @@ class ActivationConfigTest {
             "    rskip412: arrowhead600",
             "    rskip415: arrowhead600",
             "    rskip417: arrowhead600",
-            "    rskip00: tbd000",
+            "    rskip432: lovell700",
+            "    rskip434: arrowhead631",
+            "    rskip428: lovell700",
             "}"
     ));