Skip to content

Commit 3c68299

Browse files
committed
fix following comment
1 parent 04aae80 commit 3c68299

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

actuator/src/main/java/org/tron/core/actuator/ProposalCreateActuator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public boolean execute(Object result) throws ContractExeException {
5454

5555
long currentMaintenanceTime =
5656
chainBaseManager.getDynamicPropertiesStore().getNextMaintenanceTime();
57-
long now3 = now + VMConfig.getProposalExpireTime();
57+
long now3 = now + DBConfig.getProposalExpireTime();
5858
long round = (now3 - currentMaintenanceTime) / maintenanceTimeInterval;
5959
long expirationTime =
6060
currentMaintenanceTime + (round + 1) * maintenanceTimeInterval;

actuator/src/main/java/org/tron/core/vm/config/VMConfig.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,10 @@ public class VMConfig {
3535
@Setter
3636
private static double minTimeRatio;
3737

38-
@Getter
39-
@Setter
40-
private static boolean debug;
41-
42-
@Getter
43-
@Setter
44-
private static boolean solidityNode;
45-
4638
@Getter
4739
@Setter
4840
private static int checkFrozenTime; // for test only
4941

50-
@Getter
51-
@Setter
52-
private static long proposalExpireTime; // (ms)
53-
5442
public static final int MAX_FEE_LIMIT = 1_000_000_000; //1000 trx
5543

5644
private static boolean vmTraceCompressed = false;

actuator/src/main/java/org/tron/core/vm/program/Program.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -962,10 +962,10 @@ public void spendEnergy(long energyValue, String opName) {
962962

963963
public void checkCPUTimeLimit(String opName) {
964964

965-
if (VMConfig.isDebug()) {
965+
if (DBConfig.isDebug()) {
966966
return;
967967
}
968-
if (VMConfig.isSolidityNode()) {
968+
if (DBConfig.isSolidityNode()) {
969969
return;
970970
}
971971
long vmNowInUs = System.nanoTime() / 1000;

chainbase/src/main/java/org/tron/common/utils/DBConfig.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,17 @@ public class DBConfig {
104104
@Getter
105105
@Setter
106106
private static Set<String> actuatorSet;
107+
108+
@Getter
109+
@Setter
110+
private static boolean debug;
111+
112+
@Getter
113+
@Setter
114+
private static boolean solidityNode;
115+
116+
117+
@Getter
118+
@Setter
119+
private static long proposalExpireTime; // (ms)
107120
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,10 +1040,7 @@ public static void initConfig(Args cfgArgs) {
10401040
public static void initVMConfig(Args cfgArgs) {
10411041
VMConfig.setMaxTimeRatio(cfgArgs.getMaxTimeRatio());
10421042
VMConfig.setMinTimeRatio(cfgArgs.getMinTimeRatio());
1043-
VMConfig.setDebug(cfgArgs.isDebug());
10441043
VMConfig.setCheckFrozenTime(cfgArgs.getCheckFrozenTime());
1045-
VMConfig.setProposalExpireTime(cfgArgs.getProposalExpireTime());
1046-
VMConfig.setSolidityNode(cfgArgs.isSolidityNode());
10471044
}
10481045

10491046

@@ -1085,6 +1082,9 @@ public static void initDBConfig(Args cfgArgs) {
10851082
DBConfig.setChangedDelegation(cfgArgs.getChangedDelegation());
10861083
DBConfig.setActuatorSet(cfgArgs.getActuatorSet());
10871084
DBConfig.setZenTokenId(cfgArgs.getZenTokenId());
1085+
DBConfig.setProposalExpireTime(cfgArgs.getProposalExpireTime());
1086+
DBConfig.setSolidityNode(cfgArgs.isSolidityNode());
1087+
DBConfig.setDebug(cfgArgs.isDebug());
10881088
}
10891089

10901090
public void setFullNodeAllowShieldedTransaction(boolean fullNodeAllowShieldedTransaction) {

framework/src/test/java/org/tron/common/runtime/vm/InterpreterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class InterpreterTest {
4141

4242
@BeforeClass
4343
public static void init() {
44-
VMConfig.setDebug(true);
44+
DBConfig.setDebug(true);
4545
}
4646

4747
@AfterClass

0 commit comments

Comments
 (0)