Skip to content

Commit 04aae80

Browse files
committed
fix check style
1 parent 7360bf0 commit 04aae80

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class ShieldedTransferActuator extends AbstractActuator {
5252

5353
public ShieldedTransferActuator() {
5454
super(ContractType.ShieldedTransferContract, ShieldedTransferContract.class);
55-
zenTokenId = VMConfig.getZenTokenId();
55+
zenTokenId = DBConfig.getZenTokenId();
5656
}
5757

5858
@Override

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ public class VMConfig {
4343
@Setter
4444
private static boolean solidityNode;
4545

46-
@Getter
47-
@Setter
48-
private static String zenTokenId;
49-
5046
@Getter
5147
@Setter
5248
private static int checkFrozenTime; // for test only

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ public class DBConfig {
9797
@Setter
9898
private static long changedDelegation;
9999

100+
@Getter
101+
@Setter
102+
private static String zenTokenId;
103+
100104
@Getter
101105
@Setter
102106
private static Set<String> actuatorSet;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private static Property getProperty(String dbName) {
4646
}
4747

4848
public static String getOutputDirectory() {
49-
if (!DBConfig.getOutputDirectoryConfig().equals("") && !DBConfig.getOutputDirectoryConfig().endsWith(File.separator)) {
49+
if (!"".equals(DBConfig.getOutputDirectoryConfig()) && !DBConfig.getOutputDirectoryConfig().endsWith(File.separator)) {
5050
return DBConfig.getOutputDirectoryConfig() + File.separator;
5151
}
5252
return DBConfig.getOutputDirectoryConfig();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
import org.tron.core.config.Configuration;
5959
import org.tron.core.config.Parameter.NetConstants;
6060
import org.tron.core.config.Parameter.NodeConstant;
61+
import org.tron.core.db2.common.DB;
6162
import org.tron.core.store.AccountStore;
6263
import org.tron.core.vm.config.VMConfig;
6364
import org.tron.keystore.CipherException;
@@ -1040,7 +1041,6 @@ public static void initVMConfig(Args cfgArgs) {
10401041
VMConfig.setMaxTimeRatio(cfgArgs.getMaxTimeRatio());
10411042
VMConfig.setMinTimeRatio(cfgArgs.getMinTimeRatio());
10421043
VMConfig.setDebug(cfgArgs.isDebug());
1043-
VMConfig.setZenTokenId(cfgArgs.getZenTokenId());
10441044
VMConfig.setCheckFrozenTime(cfgArgs.getCheckFrozenTime());
10451045
VMConfig.setProposalExpireTime(cfgArgs.getProposalExpireTime());
10461046
VMConfig.setSolidityNode(cfgArgs.isSolidityNode());
@@ -1084,6 +1084,7 @@ public static void initDBConfig(Args cfgArgs) {
10841084
DBConfig.setLongRunningTime(cfgArgs.getLongRunningTime());
10851085
DBConfig.setChangedDelegation(cfgArgs.getChangedDelegation());
10861086
DBConfig.setActuatorSet(cfgArgs.getActuatorSet());
1087+
DBConfig.setZenTokenId(cfgArgs.getZenTokenId());
10871088
}
10881089

10891090
public void setFullNodeAllowShieldedTransaction(boolean fullNodeAllowShieldedTransaction) {

0 commit comments

Comments
 (0)