Skip to content

Commit 45a2af0

Browse files
authored
feat(param): modify the default value of maxUnsolidifiedBlocks (#5751)
* feat(param): modify the default value of maxUnsolidifiedBlocks
1 parent 74c42e3 commit 45a2af0

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

framework/src/main/java/org/tron/core/config/args/Args.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ public static void clearParam() {
229229
PARAMETER.dynamicConfigEnable = false;
230230
PARAMETER.dynamicConfigCheckInterval = 600;
231231
PARAMETER.allowTvmShangHai = 0;
232-
PARAMETER.unsolidifiedBlockCheck = true;
233-
PARAMETER.maxUnsolidifiedBlocks = 1000;
232+
PARAMETER.unsolidifiedBlockCheck = false;
233+
PARAMETER.maxUnsolidifiedBlocks = 54;
234234
PARAMETER.allowOldRewardOpt = 0;
235235
}
236236

@@ -1186,12 +1186,12 @@ public static void setParam(final String[] args, final String confFileName) {
11861186
.getInt(Constant.COMMITTEE_ALLOW_TVM_SHANGHAI) : 0;
11871187

11881188
PARAMETER.unsolidifiedBlockCheck =
1189-
!config.hasPath(Constant.UNSOLIDIFIED_BLOCK_CHECK)
1190-
|| config.getBoolean(Constant.UNSOLIDIFIED_BLOCK_CHECK);
1189+
config.hasPath(Constant.UNSOLIDIFIED_BLOCK_CHECK)
1190+
&& config.getBoolean(Constant.UNSOLIDIFIED_BLOCK_CHECK);
11911191

11921192
PARAMETER.maxUnsolidifiedBlocks =
11931193
config.hasPath(Constant.MAX_UNSOLIDIFIED_BLOCKS) ? config
1194-
.getInt(Constant.MAX_UNSOLIDIFIED_BLOCKS) : 1000;
1194+
.getInt(Constant.MAX_UNSOLIDIFIED_BLOCKS) : 54;
11951195

11961196
long allowOldRewardOpt = config.hasPath(Constant.COMMITTEE_ALLOW_OLD_REWARD_OPT) ? config
11971197
.getInt(Constant.COMMITTEE_ALLOW_OLD_REWARD_OPT) : 0;

framework/src/test/java/org/tron/core/config/args/ArgsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ public void get() {
9999
Assert.assertEquals(0, parameter.getActiveNodes().size());
100100
Assert.assertEquals(30, parameter.getMaxConnections());
101101
Assert.assertEquals(43, parameter.getNodeP2pVersion());
102-
Assert.assertEquals(1000, parameter.getMaxUnsolidifiedBlocks());
103-
Assert.assertEquals(true, parameter.isUnsolidifiedBlockCheck());
102+
Assert.assertEquals(54, parameter.getMaxUnsolidifiedBlocks());
103+
Assert.assertEquals(false, parameter.isUnsolidifiedBlockCheck());
104104
//Assert.assertEquals(30, args.getSyncNodeCount());
105105

106106
// gRPC network configs checking

framework/src/test/java/org/tron/core/net/TronNetDelegateTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public void test() throws Exception {
2020
Args.setParam(new String[] {"-w"}, Constant.TEST_CONF);
2121
CommonParameter parameter = Args.getInstance();
2222
Args.logConfig();
23+
parameter.setUnsolidifiedBlockCheck(true);
2324

2425
BlockCapsule.BlockId blockId = new BlockCapsule.BlockId(Sha256Hash.ZERO_HASH, 10000L);
2526

0 commit comments

Comments
 (0)