fix

Pandulis · Nov 14, 2019 · fbdc5de · fbdc5de
1 parent 299dede
commit fbdc5de
Show file tree

Hide file tree

Showing 13 changed files with 670 additions and 1,024 deletions.
diff --git a/chainbase/src/main/java/org/tron/common/storage/rocksdb/RocksDbDataSourceImpl.java b/chainbase/src/main/java/org/tron/common/storage/rocksdb/RocksDbDataSourceImpl.java
@@ -26,6 +26,7 @@
 import org.rocksdb.Statistics;
 import org.rocksdb.WriteBatch;
 import org.rocksdb.WriteOptions;
+import org.tron.common.setting.RocksDbSettings;
 import org.tron.common.storage.WriteOptionsWrapper;
 import org.tron.common.utils.FileUtil;
 import org.tron.common.utils.PropUtil;

diff --git a/chainbase/src/main/java/org/tron/common/utils/DBConfig.java b/chainbase/src/main/java/org/tron/common/utils/DBConfig.java
@@ -9,7 +9,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.iq80.leveldb.CompressionType;
 import org.iq80.leveldb.Options;
-import org.tron.common.storage.rocksdb.RocksDbSettings;
+import org.tron.common.setting.RocksDbSettings;
 import org.tron.core.config.args.GenesisBlock;
 
 public class DBConfig {

diff --git a/common/build.gradle b/common/build.gradle
@@ -18,5 +18,7 @@ dependencies {
     compile "com.cedarsoftware:java-util:1.8.0"
     compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.1'
     compile group: 'commons-codec', name: 'commons-codec', version: '1.11'
+    compile group: 'com.beust', name: 'jcommander', version: '1.72'
+    compile group: 'com.typesafe', name: 'config', version: '1.3.2'
     compile project(":protocol")
 }
diff --git a/...g/tron/core/db/backup/DbBackupConfig.java → ...rg/tron/common/config/DbBackupConfig.java b/...g/tron/core/db/backup/DbBackupConfig.java → ...rg/tron/common/config/DbBackupConfig.java
@@ -1,4 +1,4 @@
-package org.tron.core.db.backup;
+package org.tron.common.config;
 
 import java.io.File;
 import lombok.Getter;

diff --git a/common/src/main/java/org/tron/common/option/KademliaOptions.java b/common/src/main/java/org/tron/common/option/KademliaOptions.java
@@ -0,0 +1,13 @@
+package org.tron.common.option;
+
+public class KademliaOptions {
+
+  public static final int NODE_ID_LEN = 64;
+  public static final int BUCKET_SIZE = 16;
+  public static final int ALPHA = 3;
+  public static final int BINS = 256;
+  public static final int MAX_STEPS = 8;
+
+  public static final long BUCKET_REFRESH = 7200;     //bucket refreshing interval in millis
+  public static final long DISCOVER_CYCLE = 30;       //discovery cycle interval in seconds
+}