Skip to content

Commit

Permalink
Merge pull request #2202 from rsksmart/rename-tbd600
Browse files Browse the repository at this point in the history 
Rename tbd600 to arrowhead600
  • Loading branch information
@Vovchyk
Vovchyk authored Dec 1, 2023
2 parents a63d4b8 + ccf9c10 commit 8c3b618
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/NetworkUpgrade.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public enum NetworkUpgrade {
HOP400("hop400"),
HOP401("hop401"),
FINGERROOT500("fingerroot500"),
TBD600("tbd600");
ARROWHEAD600("arrowhead600");

private String name;

Expand Down
2 changes: 1 addition & 1 deletion rskj-core/src/main/resources/config/devnet.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockchain.config {
hop400 = 0,
hop401 = 0,
fingerroot500 = 0,
tbd600 = 0
arrowhead600 = 0
},
consensusRules = {
rskip97 = -1 # disable orchid difficulty drop
Expand Down
2 changes: 1 addition & 1 deletion rskj-core/src/main/resources/config/main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockchain.config {
hop400 = 4598500,
hop401 = 4976300,
fingerroot500 = 5468000,
tbd600 = -1
arrowhead600 = -1
}
}

Expand Down
2 changes: 1 addition & 1 deletion rskj-core/src/main/resources/config/regtest.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockchain.config {
hop400 = 0,
hop401 = 0,
fingerroot500 = 0
tbd600 = 0
arrowhead600 = 0
},
consensusRules = {
rskip97 = -1 # disable orchid difficulty drop
Expand Down
2 changes: 1 addition & 1 deletion rskj-core/src/main/resources/config/testnet.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockchain.config {
hop400 = 3103000,
hop401 = 3362200,
fingerroot500 = 4015800,
tbd600 = -1
arrowhead600 = -1
},
consensusRules = {
rskip97 = -1, # disable orchid difficulty drop
Expand Down
2 changes: 1 addition & 1 deletion rskj-core/src/main/resources/expected.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ blockchain = {
hop400 = <height>
hop401 = <height>
fingerroot500 = <height>
tbd600 = <height>
arrowhead600 = <height>
}
consensusRules = {
areBridgeTxsPaid = <hardforkName>
Expand Down
6 changes: 3 additions & 3 deletions rskj-core/src/main/resources/reference.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ blockchain = {
rskip357 = hop401
rskip374 = fingerroot500
rskip375 = fingerroot500
rskip376 = tbd600
rskip376 = arrowhead600
rskip377 = fingerroot500
rskip383 = fingerroot500
rskip385 = fingerroot500
rskip398 = tbd600
rskip400 = tbd600
rskip398 = arrowhead600
rskip400 = arrowhead600
}
}
gc = {
Expand Down
18 changes: 9 additions & 9 deletions rskj-core/src/test/java/co/rsk/peg/BridgeSupportProcessFundsMigrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,31 @@ private static Stream<Arguments> processFundMigrationArgsProvider() {
BridgeMainNetConstants bridgeMainNetConstants = BridgeMainNetConstants.getInstance();
BridgeTestNetConstants bridgeTestNetConstants = BridgeTestNetConstants.getInstance();

ActivationConfig.ForBlock wasabiActivations = ActivationConfigsForTest.wasabi100().forBlock(0);;
ActivationConfig.ForBlock wasabiActivations = ActivationConfigsForTest.wasabi100().forBlock(0);
Stream<Arguments> wasabiTests = Stream.of(
Arguments.of(bridgeTestNetConstants, wasabiActivations, false),
Arguments.of(bridgeTestNetConstants, wasabiActivations, true),
Arguments.of(bridgeMainNetConstants, wasabiActivations, false),
Arguments.of(bridgeMainNetConstants, wasabiActivations, true)
);

ActivationConfig.ForBlock papyrusActivations = ActivationConfigsForTest.papyrus200().forBlock(0);;
ActivationConfig.ForBlock papyrusActivations = ActivationConfigsForTest.papyrus200().forBlock(0);
Stream<Arguments> papyrusTests = Stream.of(
Arguments.of(bridgeTestNetConstants, papyrusActivations, false),
Arguments.of(bridgeTestNetConstants, papyrusActivations, true),
Arguments.of(bridgeMainNetConstants, papyrusActivations, false),
Arguments.of(bridgeMainNetConstants, papyrusActivations, true)
);

ActivationConfig.ForBlock irisActivations = ActivationConfigsForTest.iris300().forBlock(0);;
ActivationConfig.ForBlock irisActivations = ActivationConfigsForTest.iris300().forBlock(0);
Stream<Arguments> irisTests = Stream.of(
Arguments.of(bridgeTestNetConstants, irisActivations, false),
Arguments.of(bridgeTestNetConstants, irisActivations, true),
Arguments.of(bridgeMainNetConstants, irisActivations, false),
Arguments.of(bridgeMainNetConstants, irisActivations, true)
);

ActivationConfig.ForBlock hopActivations = ActivationConfigsForTest.hop400().forBlock(0);;
ActivationConfig.ForBlock hopActivations = ActivationConfigsForTest.hop400().forBlock(0);
Stream<Arguments> hopTests = Stream.of(
Arguments.of(bridgeTestNetConstants, hopActivations, false),
Arguments.of(bridgeTestNetConstants, hopActivations, true),
Expand All @@ -73,24 +73,24 @@ private static Stream<Arguments> processFundMigrationArgsProvider() {
);


ActivationConfig.ForBlock hop401Activations = ActivationConfigsForTest.hop401().forBlock(0);;
ActivationConfig.ForBlock hop401Activations = ActivationConfigsForTest.hop401().forBlock(0);
Stream<Arguments> hop401Tests = Stream.of(
Arguments.of(bridgeTestNetConstants, hop401Activations, false),
Arguments.of(bridgeTestNetConstants, hop401Activations, true),
Arguments.of(bridgeMainNetConstants, hop401Activations, false),
Arguments.of(bridgeMainNetConstants, hop401Activations, true)
);

ActivationConfig.ForBlock fingerrootActivations = ActivationConfigsForTest.fingerroot500().forBlock(0);;
ActivationConfig.ForBlock fingerrootActivations = ActivationConfigsForTest.fingerroot500().forBlock(0);
Stream<Arguments> fingerrootTests = Stream.of(
Arguments.of(bridgeTestNetConstants, fingerrootActivations, false),
Arguments.of(bridgeTestNetConstants, fingerrootActivations, true),
Arguments.of(bridgeMainNetConstants, fingerrootActivations, false),
Arguments.of(bridgeMainNetConstants, fingerrootActivations, true)
);

ActivationConfig.ForBlock tbdActivations = ActivationConfigsForTest.tbd600().forBlock(0);;
Stream<Arguments> tbdTests = Stream.of(
ActivationConfig.ForBlock tbdActivations = ActivationConfigsForTest.arrowhead600().forBlock(0);
Stream<Arguments> arrowheadTests = Stream.of(
Arguments.of(bridgeTestNetConstants, tbdActivations, false),
Arguments.of(bridgeTestNetConstants, tbdActivations, true),
Arguments.of(bridgeMainNetConstants, tbdActivations, false),
Expand All @@ -104,7 +104,7 @@ private static Stream<Arguments> processFundMigrationArgsProvider() {
hopTests,
hop401Tests,
fingerrootTests,
tbdTests
arrowheadTests
).flatMap(Function.identity());
}

Expand Down
2 changes: 1 addition & 1 deletion rskj-core/src/test/java/co/rsk/peg/PowpegMigrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ private static Stream<Arguments> activationsArgProvider() {
.forBlock(0);

ActivationConfig.ForBlock tbdActivations = ActivationConfigsForTest
.tbd600()
.arrowhead600()
.forBlock(0);

return Stream.of(
Expand Down
8 changes: 4 additions & 4 deletions rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ActivationConfigTest {
" hop400: 0",
" hop401: 0",
" fingerroot500: 0",
" tbd600: 0",
" arrowhead600: 0",
"},",
"consensusRules: {",
" areBridgeTxsPaid: afterBridgeSync,",
Expand Down Expand Up @@ -108,12 +108,12 @@ class ActivationConfigTest {
" rskip357: hop401",
" rskip374: fingerroot500",
" rskip375: fingerroot500",
" rskip376: tbd600",
" rskip376: arrowhead600",
" rskip377: fingerroot500",
" rskip383: fingerroot500",
" rskip385: fingerroot500",
" rskip398: tbd600",
" rskip400: tbd600",
" rskip398: arrowhead600",
" rskip400: arrowhead600",
"}"
));

Expand Down
10 changes: 5 additions & 5 deletions ...-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigsForTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ private static List<ConsensusRule> getFingerroot500Rskips() {
return rskips;
}

private static List<ConsensusRule> getTbd600Rskips() {
private static List<ConsensusRule> getArrowhead600Rskips() {
List<ConsensusRule> rskips = new ArrayList<>();
rskips.addAll(Arrays.asList(
ConsensusRule.RSKIP376
Expand Down Expand Up @@ -304,11 +304,11 @@ public static ActivationConfig fingerroot500(List<ConsensusRule> except) {
return enableTheseDisableThose(rskips, except);
}

public static ActivationConfig tbd600() {
return tbd600(Collections.emptyList());
public static ActivationConfig arrowhead600() {
return arrowhead600(Collections.emptyList());
}

public static ActivationConfig tbd600(List<ConsensusRule> except) {
public static ActivationConfig arrowhead600(List<ConsensusRule> except) {
List<ConsensusRule> rskips = new ArrayList<>();
rskips.addAll(getPaidBridgeTxsRskip());
rskips.addAll(getOrchidRskips());
Expand All @@ -321,7 +321,7 @@ public static ActivationConfig tbd600(List<ConsensusRule> except) {
rskips.addAll(getHop400Rskips());
rskips.addAll(getHop401Rskips());
rskips.addAll(getFingerroot500Rskips());
rskips.addAll(getTbd600Rskips());
rskips.addAll(getArrowhead600Rskips());

return enableTheseDisableThose(rskips, except);
}
Expand Down

0 comments on commit 8c3b618

Please sign in to comment.