Addressing comments

rsksmart · Aug 12, 2024 · f56c49d · f56c49d
1 parent 1431865
commit f56c49d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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",
             "}"
     ));