File tree Expand file tree Collapse file tree 4 files changed +3
-17
lines changed
chainbase/src/main/java/org/tron/common/utils
main/java/org/tron/core/config/args
test/java/org/tron/common/runtime/vm Expand file tree Collapse file tree 4 files changed +3
-17
lines changed Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ public static Options getOptionsByDbName(String dbName) {
59
59
return createDefaultDbOptions ();
60
60
}
61
61
62
- protected static Options createDefaultDbOptions () {
62
+ public static Options createDefaultDbOptions () {
63
63
Options dbOptions = new Options ();
64
64
65
65
dbOptions .createIfMissing (true );
Original file line number Diff line number Diff line change @@ -1051,7 +1051,6 @@ public static void initDBConfig(Args cfgArgs) {
1051
1051
DBConfig .setPropertyMap (cfgArgs .getStorage ().getPropertyMap ());
1052
1052
DBConfig .setDbSync (cfgArgs .getStorage ().isDbSync ());
1053
1053
DBConfig .setDbDirectory (cfgArgs .getStorage ().getDbDirectory ());
1054
-
1055
1054
}
1056
1055
1057
1056
if (Objects .nonNull (cfgArgs .getGenesisBlock ())) {
Original file line number Diff line number Diff line change 37
37
* @since 2018/5/25
38
38
*/
39
39
40
- public class Storage extends StorageUtils {
40
+ public class Storage {
41
41
42
42
/**
43
43
* Keys (names) of database config
@@ -190,7 +190,7 @@ private static Property createProperty(final ConfigObject conf) {
190
190
}
191
191
192
192
// Check, get and set fields of Options
193
- Options dbOptions = createDefaultDbOptions ();
193
+ Options dbOptions = StorageUtils . createDefaultDbOptions ();
194
194
195
195
if (conf .containsKey (CREATE_IF_MISSING_CONFIG_KEY )) {
196
196
dbOptions .createIfMissing (
@@ -313,16 +313,4 @@ public void deleteAllStoragePaths() {
313
313
}
314
314
}
315
315
}
316
-
317
- private boolean hasProperty (String dbName ) {
318
- if (propertyMap != null ) {
319
- return propertyMap .containsKey (dbName );
320
- }
321
- return false ;
322
- }
323
-
324
- private Property getProperty (String dbName ) {
325
- return propertyMap .get (dbName );
326
- }
327
-
328
316
}
Original file line number Diff line number Diff line change 28
28
import org .tron .core .config .args .Args ;
29
29
import org .tron .core .exception .ContractValidateException ;
30
30
import org .tron .core .vm .VM ;
31
- import org .tron .core .vm .config .VMConfig ;
32
31
import org .tron .core .vm .program .Program ;
33
32
import org .tron .core .vm .program .invoke .ProgramInvokeMockImpl ;
34
33
import org .tron .protos .Protocol .Transaction ;
You can’t perform that action at this time.
0 commit comments