Skip to content

Commit 899eb51

Browse files
committed
feat(command): remove KeystoreFactory and DBConvert
1. consolidate KeystoreFactory into FullNode with ``--keystore` 2. consolidate DBConvert into Toolkit with `db convert`
1 parent 2cb8799 commit 899eb51

9 files changed

Lines changed: 16 additions & 561 deletions

File tree

common/src/main/java/org/tron/common/parameter/CommonParameter.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,13 @@ public class CommonParameter {
207207
@Setter
208208
@Parameter(names = {"--solidity"}, description = "running a solidity node for java tron")
209209
public boolean solidityNode = false;
210+
211+
//If you are running KeystoreFactory, this flag is set to true
212+
@Getter
213+
@Setter
214+
@Parameter(names = {"--keystore"}, description = "running KeystoreFactory")
215+
public boolean keystore = false;
216+
210217
@Getter
211218
@Setter
212219
public int rpcPort;

framework/build.gradle

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -220,28 +220,11 @@ run.enabled = false
220220
tasks.distTar.enabled = false
221221

222222
createScript(project, 'org.tron.program.FullNode', 'FullNode')
223-
createScript(project, 'org.tron.program.KeystoreFactory', 'KeystoreFactory')
224-
createScript(project, 'org.tron.program.DBConvert', 'DBConvert')
225-
226223
def releaseBinary = hasProperty('binaryRelease') ? getProperty('binaryRelease') : 'true'
227-
def skipKeystore = hasProperty('skipKeystore') ? true : false
228-
def skipConvert = hasProperty('skipConvert') ? true : false
229-
def skipAll = hasProperty('skipAll') ? true : false
230224
if (releaseBinary == 'true') {
231225
artifacts {
232226
archives(binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'))
233227
}
234-
if (!skipAll) {
235-
if (!skipKeystore) {
236-
artifacts {
237-
archives(binaryRelease('buildKeystoreFactoryJar', 'KeystoreFactory', 'org.tron.program.KeystoreFactory'))}
238-
}
239-
if (!skipConvert) {
240-
artifacts {
241-
archives(binaryRelease('buildDBConvertJar', 'DBConvert', 'org.tron.program.DBConvert'))}
242-
}
243-
}
244-
245228
}
246229

247230
task copyToParent(type: Copy) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ public static void clearParam() {
169169
PARAMETER.tcpNettyWorkThreadNum = 0;
170170
PARAMETER.udpNettyWorkThreadNum = 0;
171171
PARAMETER.solidityNode = false;
172+
PARAMETER.keystore = false;
172173
PARAMETER.trustNodeAddr = "";
173174
PARAMETER.walletExtensionApi = false;
174175
PARAMETER.estimateEnergy = false;

0 commit comments

Comments
 (0)