Skip to content

Commit bdfde58

Browse files
geb789geb789
committed
move variable name
1 parent cd93679 commit bdfde58

File tree

22 files changed

+190
-192
lines changed

22 files changed

+190
-192
lines changed

‎framework/src/main/java/org/tron/common/application/Application.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public interface Application {
2424

2525
void setOptions(Args args);
2626

27-
void init(CommonParameter args);
27+
void init(CommonParameter parameter);
2828

29-
void initServices(CommonParameter args);
29+
void initServices(CommonParameter parameter);
3030

3131
void startup();
3232

‎framework/src/main/java/org/tron/common/application/CliApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ public void setOptions(Args args) {
2828
}
2929

3030
@Override
31-
public void init(CommonParameter args) {
31+
public void init(CommonParameter parameter) {
3232

3333
}
3434

3535
@Override
36-
public void initServices(CommonParameter args) {
36+
public void initServices(CommonParameter parameter) {
3737

3838
}
3939

‎framework/src/main/java/org/tron/common/application/Service.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public interface Service {
2121

2222
void init();
2323

24-
void init(CommonParameter args);
24+
void init(CommonParameter parameter);
2525

2626
void start();
2727

‎framework/src/main/java/org/tron/common/application/ServiceContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public void init() {
4141
}
4242
}
4343

44-
public void init(CommonParameter args) {
44+
public void init(CommonParameter parameter) {
4545
for (Service service : this.services) {
4646
logger.debug("Initing " + service.getClass().getSimpleName());
47-
service.init(args);
47+
service.init(parameter);
4848
}
4949
}
5050

‎framework/src/main/java/org/tron/common/backup/BackupManager.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@
2020
import org.tron.common.net.udp.message.Message;
2121
import org.tron.common.net.udp.message.backup.KeepAliveMessage;
2222
import org.tron.common.parameter.CommonParameter;
23-
import org.tron.core.config.args.Args;
2423

2524
@Slf4j(topic = "backup")
2625
@Component
2726
public class BackupManager implements EventHandler {
2827

29-
private CommonParameter args = CommonParameter.getInstance();
28+
private CommonParameter parameter = CommonParameter.getInstance();
3029

31-
private int priority = args.getBackupPriority();
30+
private int priority = parameter.getBackupPriority();
3231

33-
private int port = args.getBackupPort();
32+
private int port = parameter.getBackupPort();
3433

3534
private String localIp = "";
3635

@@ -74,7 +73,7 @@ public void init() {
7473
logger.warn("Get local ip failed.");
7574
}
7675

77-
for (String member : args.getBackupMembers()) {
76+
for (String member : parameter.getBackupMembers()) {
7877
if (!localIp.equals(member)) {
7978
members.add(member);
8079
}

‎framework/src/main/java/org/tron/common/overlay/server/ChannelManager.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class ChannelManager {
3737
private SyncPool syncPool;
3838
@Autowired
3939
private FastForward fastForward;
40-
private CommonParameter args = CommonParameter.getInstance();
40+
private CommonParameter parameter = CommonParameter.getInstance();
4141
private Cache<InetAddress, ReasonCode> badPeers = CacheBuilder.newBuilder().maximumSize(10000)
4242
.expireAfterWrite(1, TimeUnit.HOURS).recordStats().build();
4343

@@ -53,29 +53,29 @@ public class ChannelManager {
5353
@Getter
5454
private Map<InetAddress, Node> fastForwardNodes = new ConcurrentHashMap();
5555

56-
private int maxActivePeers = args.getNodeMaxActiveNodes();
56+
private int maxActivePeers = parameter.getNodeMaxActiveNodes();
5757

58-
private int getMaxActivePeersWithSameIp = args.getNodeMaxActiveNodesWithSameIp();
58+
private int getMaxActivePeersWithSameIp = parameter.getNodeMaxActiveNodesWithSameIp();
5959

6060
public void init() {
61-
if (this.args.getNodeListenPort() > 0) {
61+
if (this.parameter.getNodeListenPort() > 0) {
6262
new Thread(() -> peerServer.start(Args.getInstance().getNodeListenPort()),
6363
"PeerServerThread").start();
6464
}
6565

6666
InetAddress address;
67-
for (Node node : args.getPassiveNodes()) {
67+
for (Node node : parameter.getPassiveNodes()) {
6868
address = new InetSocketAddress(node.getHost(), node.getPort()).getAddress();
6969
trustNodes.put(address, node);
7070
}
7171

72-
for (Node node : args.getActiveNodes()) {
72+
for (Node node : parameter.getActiveNodes()) {
7373
address = new InetSocketAddress(node.getHost(), node.getPort()).getAddress();
7474
trustNodes.put(address, node);
7575
activeNodes.put(address, node);
7676
}
7777

78-
for (Node node : args.getFastForwardNodes()) {
78+
for (Node node : parameter.getFastForwardNodes()) {
7979
address = new InetSocketAddress(node.getHost(), node.getPort()).getAddress();
8080
trustNodes.put(address, node);
8181
fastForwardNodes.put(address, node);

‎framework/src/main/java/org/tron/common/overlay/server/FastForward.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public class FastForward {
4545

4646
private ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
4747

48-
private CommonParameter args = Args.getInstance();
49-
private List<Node> fastForwardNodes = args.getFastForwardNodes();
48+
private CommonParameter parameter = Args.getInstance();
49+
private List<Node> fastForwardNodes = parameter.getFastForwardNodes();
5050
private ByteString witnessAddress = ByteString
51-
.copyFrom(args.getLocalWitnesses().getWitnessAccountAddress());
52-
private int keySize = args.getLocalWitnesses().getPrivateKeys().size();
51+
.copyFrom(parameter.getLocalWitnesses().getWitnessAccountAddress());
52+
private int keySize = parameter.getLocalWitnesses().getPrivateKeys().size();
5353

5454
public void init() {
5555
manager = ctx.getBean(Manager.class);
@@ -58,9 +58,9 @@ public void init() {
5858
backupManager = ctx.getBean(BackupManager.class);
5959

6060
logger.info("Fast forward config, isWitness: {}, keySize: {}, fastForwardNodes: {}",
61-
args.isWitness(), keySize, fastForwardNodes.size());
61+
parameter.isWitness(), keySize, fastForwardNodes.size());
6262

63-
if (!args.isWitness() || keySize == 0 || fastForwardNodes.isEmpty()) {
63+
if (!parameter.isWitness() || keySize == 0 || fastForwardNodes.isEmpty()) {
6464
return;
6565
}
6666

@@ -84,7 +84,7 @@ public void fillHelloMessage(HelloMessage message, Channel channel) {
8484
InetAddress address = new InetSocketAddress(node.getHost(), node.getPort()).getAddress();
8585
if (address.equals(channel.getInetAddress())) {
8686
ECKey ecKey = ECKey
87-
.fromPrivate(ByteArray.fromHexString(args.getLocalWitnesses().getPrivateKey()));
87+
.fromPrivate(ByteArray.fromHexString(parameter.getLocalWitnesses().getPrivateKey()));
8888
Sha256Hash hash = Sha256Hash.of(ByteArray.fromLong(message.getTimestamp()));
8989
ECDSASignature signature = ecKey.sign(hash.getBytes());
9090
ByteString sig = ByteString.copyFrom(signature.toByteArray());
@@ -96,7 +96,7 @@ public void fillHelloMessage(HelloMessage message, Channel channel) {
9696
}
9797

9898
public boolean checkHelloMessage(HelloMessage message, Channel channel) {
99-
if (!args.isFastForward()
99+
if (!parameter.isFastForward()
100100
|| channelManager.getTrustNodes().getIfPresent(channel.getInetAddress()) != null) {
101101
return true;
102102
}
@@ -136,7 +136,7 @@ public boolean checkHelloMessage(HelloMessage message, Channel channel) {
136136
}
137137

138138
private boolean isActiveWitness() {
139-
return args.isWitness()
139+
return parameter.isWitness()
140140
&& keySize > 0
141141
&& fastForwardNodes.size() > 0
142142
&& witnessScheduleStore.getActiveWitnesses().contains(witnessAddress)

‎framework/src/main/java/org/tron/common/overlay/server/PeerServer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@Component
2020
public class PeerServer {
2121

22-
private CommonParameter args = CommonParameter.getInstance();
22+
private CommonParameter parameter = CommonParameter.getInstance();
2323

2424
private ApplicationContext ctx;
2525

@@ -35,7 +35,7 @@ public PeerServer(final Args args, final ApplicationContext ctx) {
3535
public void start(int port) {
3636

3737
EventLoopGroup bossGroup = new NioEventLoopGroup(1);
38-
EventLoopGroup workerGroup = new NioEventLoopGroup(args.getTcpNettyWorkThreadNum());
38+
EventLoopGroup workerGroup = new NioEventLoopGroup(parameter.getTcpNettyWorkThreadNum());
3939
TronChannelInitializer tronChannelInitializer = ctx.getBean(TronChannelInitializer.class, "");
4040

4141
try {
@@ -45,7 +45,7 @@ public void start(int port) {
4545
b.channel(NioServerSocketChannel.class);
4646

4747
b.option(ChannelOption.MESSAGE_SIZE_ESTIMATOR, DefaultMessageSizeEstimator.DEFAULT);
48-
b.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, this.args.getNodeConnectionTimeout());
48+
b.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, this.parameter.getNodeConnectionTimeout());
4949

5050
b.handler(new LoggingHandler());
5151
b.childHandler(tronChannelInitializer);

‎framework/src/main/java/org/tron/core/capsule/utils/BlockUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public class BlockUtil {
3232
*/
3333
public static BlockCapsule newGenesisBlockCapsule() {
3434

35-
CommonParameter args = Args.getInstance();
36-
GenesisBlock genesisBlockArg = args.getGenesisBlock();
35+
CommonParameter parameter = Args.getInstance();
36+
GenesisBlock genesisBlockArg = parameter.getGenesisBlock();
3737
List<Transaction> transactionList =
3838
genesisBlockArg.getAssets().stream()
3939
.map(key -> {

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

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -928,89 +928,89 @@ private static void initBackupProperty(Config config) {
928928
}
929929

930930
private static void logConfig() {
931-
CommonParameter args = CommonParameter.getInstance();
931+
CommonParameter parameter = CommonParameter.getInstance();
932932
logger.info("\n");
933933
logger.info("************************ Net config ************************");
934-
logger.info("P2P version: {}", args.getNodeP2pVersion());
935-
logger.info("Bind IP: {}", args.getNodeDiscoveryBindIp());
936-
logger.info("External IP: {}", args.getNodeExternalIp());
937-
logger.info("Listen port: {}", args.getNodeListenPort());
938-
logger.info("Discover enable: {}", args.isNodeDiscoveryEnable());
939-
logger.info("Active node size: {}", args.getActiveNodes().size());
940-
logger.info("Passive node size: {}", args.getPassiveNodes().size());
941-
logger.info("FastForward node size: {}", args.getFastForwardNodes().size());
942-
logger.info("Seed node size: {}", args.getSeedNode().getIpList().size());
943-
logger.info("Max connection: {}", args.getNodeMaxActiveNodes());
944-
logger.info("Max connection with same IP: {}", args.getNodeMaxActiveNodesWithSameIp());
945-
logger.info("Solidity threads: {}", args.getSolidityThreads());
934+
logger.info("P2P version: {}", parameter.getNodeP2pVersion());
935+
logger.info("Bind IP: {}", parameter.getNodeDiscoveryBindIp());
936+
logger.info("External IP: {}", parameter.getNodeExternalIp());
937+
logger.info("Listen port: {}", parameter.getNodeListenPort());
938+
logger.info("Discover enable: {}", parameter.isNodeDiscoveryEnable());
939+
logger.info("Active node size: {}", parameter.getActiveNodes().size());
940+
logger.info("Passive node size: {}", parameter.getPassiveNodes().size());
941+
logger.info("FastForward node size: {}", parameter.getFastForwardNodes().size());
942+
logger.info("Seed node size: {}", parameter.getSeedNode().getIpList().size());
943+
logger.info("Max connection: {}", parameter.getNodeMaxActiveNodes());
944+
logger.info("Max connection with same IP: {}", parameter.getNodeMaxActiveNodesWithSameIp());
945+
logger.info("Solidity threads: {}", parameter.getSolidityThreads());
946946
logger.info("************************ Backup config ************************");
947-
logger.info("Backup listen port: {}", args.getBackupPort());
948-
logger.info("Backup member size: {}", args.getBackupMembers().size());
949-
logger.info("Backup priority: {}", args.getBackupPriority());
947+
logger.info("Backup listen port: {}", parameter.getBackupPort());
948+
logger.info("Backup member size: {}", parameter.getBackupMembers().size());
949+
logger.info("Backup priority: {}", parameter.getBackupPriority());
950950
logger.info("************************ Code version *************************");
951951
logger.info("Code version : {}", Version.getVersion());
952952
logger.info("Version name: {}", Version.versionName);
953953
logger.info("Version code: {}", Version.versionCode);
954954
logger.info("************************ DB config *************************");
955-
logger.info("DB version : {}", args.getStorage().getDbVersion());
956-
logger.info("DB engine : {}", args.getStorage().getDbEngine());
955+
logger.info("DB version : {}", parameter.getStorage().getDbVersion());
956+
logger.info("DB engine : {}", parameter.getStorage().getDbEngine());
957957
logger.info("***************************************************************");
958958
logger.info("\n");
959959
}
960960

961-
public static void initConfig(CommonParameter cfgArgs) {
962-
initVMConfig(cfgArgs);
963-
initDBConfig(cfgArgs);
961+
public static void initConfig(CommonParameter parameter) {
962+
initVMConfig(parameter);
963+
initDBConfig(parameter);
964964
}
965965

966-
public static void initVMConfig(CommonParameter cfgArgs) {
967-
VMConfig.setMaxTimeRatio(cfgArgs.getMaxTimeRatio());
968-
VMConfig.setMinTimeRatio(cfgArgs.getMinTimeRatio());
969-
VMConfig.setCheckFrozenTime(cfgArgs.getCheckFrozenTime());
966+
public static void initVMConfig(CommonParameter parameter) {
967+
VMConfig.setMaxTimeRatio(parameter.getMaxTimeRatio());
968+
VMConfig.setMinTimeRatio(parameter.getMinTimeRatio());
969+
VMConfig.setCheckFrozenTime(parameter.getCheckFrozenTime());
970970
}
971971

972972

973-
public static void initDBConfig(CommonParameter cfgArgs) {
974-
if (Objects.nonNull(cfgArgs.getStorage())) {
975-
DBConfig.setDbVersion(cfgArgs.getStorage().getDbVersion());
976-
DBConfig.setDbEngine(cfgArgs.getStorage().getDbEngine());
977-
DBConfig.setPropertyMap(cfgArgs.getStorage().getPropertyMap());
978-
DBConfig.setDbSync(cfgArgs.getStorage().isDbSync());
979-
DBConfig.setDbDirectory(cfgArgs.getStorage().getDbDirectory());
973+
public static void initDBConfig(CommonParameter parameter) {
974+
if (Objects.nonNull(parameter.getStorage())) {
975+
DBConfig.setDbVersion(parameter.getStorage().getDbVersion());
976+
DBConfig.setDbEngine(parameter.getStorage().getDbEngine());
977+
DBConfig.setPropertyMap(parameter.getStorage().getPropertyMap());
978+
DBConfig.setDbSync(parameter.getStorage().isDbSync());
979+
DBConfig.setDbDirectory(parameter.getStorage().getDbDirectory());
980980
}
981981

982-
if (Objects.nonNull(cfgArgs.getGenesisBlock())) {
983-
DBConfig.setBlocktimestamp(cfgArgs.getGenesisBlock().getTimestamp());
984-
DBConfig.setGenesisBlock(cfgArgs.getGenesisBlock());
982+
if (Objects.nonNull(parameter.getGenesisBlock())) {
983+
DBConfig.setBlocktimestamp(parameter.getGenesisBlock().getTimestamp());
984+
DBConfig.setGenesisBlock(parameter.getGenesisBlock());
985985
}
986986

987-
DBConfig.setOutputDirectoryConfig(cfgArgs.getOutputDirectory());
988-
DBConfig.setRocksDbSettings(cfgArgs.getRocksDBCustomSettings());
989-
DBConfig.setAllowMultiSign(cfgArgs.getAllowMultiSign());
990-
DBConfig.setMaintenanceTimeInterval(cfgArgs.getMaintenanceTimeInterval());
991-
DBConfig.setAllowAdaptiveEnergy(cfgArgs.getAllowAdaptiveEnergy());
992-
DBConfig.setAllowDelegateResource(cfgArgs.getAllowDelegateResource());
993-
DBConfig.setAllowTvmTransferTrc10(cfgArgs.getAllowTvmTransferTrc10());
994-
DBConfig.setAllowTvmConstantinople(cfgArgs.getAllowTvmConstantinople());
995-
DBConfig.setAllowTvmSolidity059(cfgArgs.getAllowTvmSolidity059());
996-
DBConfig.setAllowSameTokenName(cfgArgs.getAllowSameTokenName());
997-
DBConfig.setAllowCreationOfContracts(cfgArgs.getAllowCreationOfContracts());
998-
DBConfig.setAllowShieldedTransaction(cfgArgs.getAllowShieldedTransaction());
999-
DBConfig.setAllowAccountStateRoot(cfgArgs.getAllowAccountStateRoot());
1000-
DBConfig.setAllowProtoFilterNum(cfgArgs.getAllowProtoFilterNum());
1001-
DBConfig.setProposalExpireTime(cfgArgs.getProposalExpireTime());
1002-
DBConfig.setBlockNumForEneryLimit(cfgArgs.getBlockNumForEneryLimit());
1003-
DBConfig.setFullNodeAllowShieldedTransaction(cfgArgs.isFullNodeAllowShieldedTransactionArgs());
1004-
DBConfig.setZenTokenId(cfgArgs.getZenTokenId());
1005-
DBConfig.setValidContractProtoThreadNum(cfgArgs.getValidContractProtoThreadNum());
1006-
DBConfig.setVmTrace(cfgArgs.isVmTrace());
1007-
DBConfig.setDebug(cfgArgs.isDebug());
1008-
DBConfig.setSolidityNode(cfgArgs.isSolidityNode());
1009-
DBConfig.setSupportConstant(cfgArgs.isSupportConstant());
1010-
DBConfig.setLongRunningTime(cfgArgs.getLongRunningTime());
1011-
DBConfig.setChangedDelegation(cfgArgs.getChangedDelegation());
1012-
DBConfig.setActuatorSet(cfgArgs.getActuatorSet());
1013-
DBConfig.setTransactionHistoreSwitch(cfgArgs.getStorage().getTransactionHistoreSwitch());
987+
DBConfig.setOutputDirectoryConfig(parameter.getOutputDirectory());
988+
DBConfig.setRocksDbSettings(parameter.getRocksDBCustomSettings());
989+
DBConfig.setAllowMultiSign(parameter.getAllowMultiSign());
990+
DBConfig.setMaintenanceTimeInterval(parameter.getMaintenanceTimeInterval());
991+
DBConfig.setAllowAdaptiveEnergy(parameter.getAllowAdaptiveEnergy());
992+
DBConfig.setAllowDelegateResource(parameter.getAllowDelegateResource());
993+
DBConfig.setAllowTvmTransferTrc10(parameter.getAllowTvmTransferTrc10());
994+
DBConfig.setAllowTvmConstantinople(parameter.getAllowTvmConstantinople());
995+
DBConfig.setAllowTvmSolidity059(parameter.getAllowTvmSolidity059());
996+
DBConfig.setAllowSameTokenName(parameter.getAllowSameTokenName());
997+
DBConfig.setAllowCreationOfContracts(parameter.getAllowCreationOfContracts());
998+
DBConfig.setAllowShieldedTransaction(parameter.getAllowShieldedTransaction());
999+
DBConfig.setAllowAccountStateRoot(parameter.getAllowAccountStateRoot());
1000+
DBConfig.setAllowProtoFilterNum(parameter.getAllowProtoFilterNum());
1001+
DBConfig.setProposalExpireTime(parameter.getProposalExpireTime());
1002+
DBConfig.setBlockNumForEneryLimit(parameter.getBlockNumForEneryLimit());
1003+
DBConfig.setFullNodeAllowShieldedTransaction(parameter.isFullNodeAllowShieldedTransactionArgs());
1004+
DBConfig.setZenTokenId(parameter.getZenTokenId());
1005+
DBConfig.setValidContractProtoThreadNum(parameter.getValidContractProtoThreadNum());
1006+
DBConfig.setVmTrace(parameter.isVmTrace());
1007+
DBConfig.setDebug(parameter.isDebug());
1008+
DBConfig.setSolidityNode(parameter.isSolidityNode());
1009+
DBConfig.setSupportConstant(parameter.isSupportConstant());
1010+
DBConfig.setLongRunningTime(parameter.getLongRunningTime());
1011+
DBConfig.setChangedDelegation(parameter.getChangedDelegation());
1012+
DBConfig.setActuatorSet(parameter.getActuatorSet());
1013+
DBConfig.setTransactionHistoreSwitch(parameter.getStorage().getTransactionHistoreSwitch());
10141014
}
10151015

10161016
public static void setFullNodeAllowShieldedTransaction(boolean fullNodeAllowShieldedTransaction) {

‎framework/src/main/java/org/tron/core/consensus/ConsensusService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ public class ConsensusService {
3030
@Autowired
3131
private BlockHandleImpl blockHandle;
3232

33-
private CommonParameter args = Args.getInstance();
33+
private CommonParameter parameter = Args.getInstance();
3434

3535
public void start() {
3636
Param param = new Param();
37-
param.setEnable(args.isWitness());
38-
param.setGenesisBlock(args.getGenesisBlock());
39-
param.setMinParticipationRate(args.getMinParticipationRate());
37+
param.setEnable(parameter.isWitness());
38+
param.setGenesisBlock(parameter.getGenesisBlock());
39+
param.setMinParticipationRate(parameter.getMinParticipationRate());
4040
param.setBlockProduceTimeoutPercent(Args.getInstance().getBlockProducedTimeOut());
41-
param.setNeedSyncCheck(args.isNeedSyncCheck());
41+
param.setNeedSyncCheck(parameter.isNeedSyncCheck());
4242
List<Miner> miners = new ArrayList<>();
4343
byte[] privateKey = ByteArray
4444
.fromHexString(Args.getInstance().getLocalWitnesses().getPrivateKey());

0 commit comments

Comments
 (0)