Skip to content

feat(command): change newly added "--keystore" parameter to "--keystore-factory" #6446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2025
Merged

feat(command): change newly added "--keystore" parameter to "--keystore-factory" #6446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/src/main/java/org/tron/common/parameter/CommonParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ public class CommonParameter {
//If you are running KeystoreFactory, this flag is set to true
@Getter
@Setter
@Parameter(names = {"--keystore"}, description = "running KeystoreFactory")
public boolean keystore = false;
@Parameter(names = {"--keystore-factory"}, description = "running KeystoreFactory")
public boolean keystoreFactory = false;

@Getter
@Setter
Expand Down
2 changes: 1 addition & 1 deletion framework/src/main/java/org/tron/core/config/args/Args.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public static void clearParam() {
PARAMETER.tcpNettyWorkThreadNum = 0;
PARAMETER.udpNettyWorkThreadNum = 0;
PARAMETER.solidityNode = false;
PARAMETER.keystore = false;
PARAMETER.keystoreFactory = false;
PARAMETER.trustNodeAddr = "";
PARAMETER.walletExtensionApi = false;
PARAMETER.estimateEnergy = false;
Expand Down
2 changes: 1 addition & 1 deletion framework/src/main/java/org/tron/program/FullNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static void main(String[] args) {
SolidityNode.start();
return;
}
if (parameter.isKeystore()) {
if (parameter.isKeystoreFactory()) {
KeystoreFactory.start();
return;
}
Expand Down
5 changes: 3 additions & 2 deletions framework/src/test/java/org/tron/core/config/args/ArgsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ public void destroy() {

@Test
public void get() {
Args.setParam(new String[] {"-c", Constant.TEST_CONF, "--keystore"}, Constant.TESTNET_CONF);
Args.setParam(new String[] {"-c", Constant.TEST_CONF, "--keystore-factory"},
Constant.TESTNET_CONF);

CommonParameter parameter = Args.getInstance();

Expand Down Expand Up @@ -128,7 +129,7 @@ public void get() {
ByteArray.toHexString(Args.getLocalWitnesses()
.getWitnessAccountAddress()));

Assert.assertTrue(parameter.isKeystore());
Assert.assertTrue(parameter.isKeystoreFactory());
}

@Test
Expand Down