merge

Author: olenheim

.travis.yml

@@ -1,13 +1,20 @@
 sudo: required
 language: java
 jdk: oraclejdk8
-script:
-- sh tron.sh
-- ./gradlew lint
-- ./gradlew test
 addons:
   ssh_known_hosts:
   - 47.93.9.236:22008
+  sonarcloud:
+    organization: tron-zhaohong
+    token:
+      secure: "KXWEeQ1elAoQ0XfR54TQWfhrIdDP0+2CYPv2X9aWpU/YDl7hqZBAjcCOAUGvlbyM54jtG6YMaWwG48jlrOwwl5l/VjWSnUXF+7ixQy5ki0Ci9s7Y1pTQwV9SpL8TLIK2TYqabN8Mw+FJULASXLjYr9GerbbcUbCPTmcL6mQKw6ivxxpNPmz4eNoKAEuOzruO9fTXGAV3yr8Nn85c+mVxV8EUhkR17zpE9O8fvzOtSnYArWNOSCgDBn0EG45UNNPF2vn44s1c3h3gX1m3WK6PeCXPgy3hPqRn3wTG+xglnbqthGpo2wt1rJ83af+BwdYwvPEcUq84yLgXcE/aMkTKcVAfPWBP/6vblaoI90jxCeFji+MdMimKZAqIXt7oLqDZVmIq65de5YC5s7QTSbzJNY/tsAu3dqzSfbUJY6CRNFDcoenVpvgQkqb37TkDah4mJM8EUjbu2A9Q2HSFbyCVsQJtdasuu9cBOf6azK3U0XgFNBc0y2aziZrTnX30q7bi+5L/mbTnRdXrDqBOqyPeGtT77UZfcajHHmEWU/e6gYWiA/c+K25n13DD53Au6gpnnQ6ALeUl/1gDwz3fPBebJ5bVWrkIcLj7bbysjzfOvQmDS6G13RNz58Hm0/B7bVtZTr1E1q6Z1zEJwbuJYEJASNcezAfK5x/hIfZTGNqT3M8="
+cache:
+  directories:
+    - '$HOME/.sonar/cache'
+script:
+- sh tron.sh
+- "./gradlew build"
+- sonar-scanner
 skip_build:
 - README.md：
 - LICENSE
@@ -17,6 +24,5 @@ deploy:
   on:
     branch: develop
 after_deploy:
-  - ./gradlew stest
-
+- "./gradlew stest"
 

build.gradle

@@ -1,3 +1,18 @@
+buildscript {
+    repositories {
+        maven { url 'http://mvnrepository.com' }
+        mavenCentral()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+    }
+}
+plugins {
+    id "org.sonarqube" version "2.6"
+}
+
 group 'org.tron'
 version '1.0.0'
 
@@ -8,7 +23,6 @@ apply plugin: 'checkstyle'
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "jacoco"
 
-
 sourceCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 mainClassName = 'org.tron.program.FullNode'
@@ -18,19 +32,6 @@ repositories {
     mavenLocal()
     mavenCentral()
 }
-
-buildscript {
-    repositories {
-        maven { url 'http://mvnrepository.com' }
-        mavenCentral()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
-    }
-}
-
 def versions = [
         checkstyle: '8.7',
 ]
@@ -143,17 +144,15 @@ checkstyle {
 }
 
 checkstyleMain {
-    source 'src'
-    include '**/*.java'
-    exclude '**/gen/**'
+    source = 'src/main/java'
 }
 
 task lint(type: Checkstyle) {
     // Cleaning the old log because of the creation of the new ones (not sure if totaly needed)
     delete fileTree(dir: "${project.rootDir}/app/build/reports")
     source 'src'
     include '**/*.java'
-    exclude '**/gen/**'
+    exclude 'main/gen/**'
     // empty classpath
     classpath = files()
     //Failing the build
@@ -186,6 +185,7 @@ protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:3.5.1-1"
     }
+
     plugins {
         grpc {
             artifact = 'io.grpc:protoc-gen-grpc-java:1.9.0'
@@ -236,9 +236,9 @@ jacocoTestReport {
     }
 }
 
-task stest(type:Test){
-    useTestNG{
-        suites( file('src/test/resources/testng.xml') )
+task stest(type: Test) {
+    useTestNG {
+        suites(file('src/test/resources/testng.xml'))
     }
 
     testLogging {
@@ -247,7 +247,7 @@ task stest(type:Test){
     }
 }
 
-def binaryRelease(taskName,jarName,mainClass) {
+def binaryRelease(taskName, jarName, mainClass) {
     return tasks.create("${taskName}", Jar) {
         baseName = jarName
         version = null
@@ -267,7 +267,8 @@ def binaryRelease(taskName,jarName,mainClass) {
     }
 }
 
+
 artifacts {
-    archives(binaryRelease('buildSolidityNodeJar','SolidityNode','org.tron.program.SolidityNode'),
-            binaryRelease('buildFullNodeJar','FullNode','org.tron.program.FullNode'))
+    archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'org.tron.program.SolidityNode'),
+            binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'))
 }

sonar-project.properties

@@ -0,0 +1,19 @@
+sonar.projectKey=java-tron
+sonar.projectName=java-tron
+sonar.projectVersion=2.1
+# =====================================================
+#   Meta-data for the project
+# =====================================================
+sonar.links.homepage=https://github.com/tronprotocol/java-tron
+sonar.links.ci=https://travis-ci.org/tronprotocol/java-tron
+sonar.links.scm=https://github.com/tronprotocol/java-tron
+sonar.links.issue=https://github.com/tronprotocol/java-tron/issues
+# =====================================================
+#   Properties that will be shared amongst all modules
+# =====================================================
+# SQ standard properties
+sonar.sources=src/main
+sonar.tests=src/test
+sonar.java.binaries=build/classes
+# =====================================================
+#   Properties that will be shared amongst all modules

src/main/java/org/tron/common/storage/leveldb/LevelDbDataSourceImpl.java

@@ -60,9 +60,11 @@ public class LevelDbDataSourceImpl implements DbSourceInter<byte[]>,
    * constructor.
    */
   public LevelDbDataSourceImpl(String parentName, String name) {
-    parentName += Args.getInstance().getStorage().getDirectory();
-    this.parentName = parentName;
     this.dataBaseName = name;
+    this.parentName = Paths.get(
+            parentName,
+            Args.getInstance().getStorage().getDbDirectory()
+    ).toString();
   }
 
   @Override
@@ -79,7 +81,7 @@ public void initDB() {
         throw new NullPointerException("no name set to the dbStore");
       }
 
-      Options dbOptions = createDbOptions();
+      Options dbOptions = Args.getInstance().getStorage().getOptionsByDbName(dataBaseName);
 
       try {
         openDatabase(dbOptions);
@@ -109,6 +111,7 @@ private void openDatabase(Options dbOptions) throws IOException {
     }
   }
 
+  @Deprecated
   private Options createDbOptions() {
     Options dbOptions = new Options();
     dbOptions.createIfMissing(true);

src/main/java/org/tron/core/config/DefaultConfig.java

@@ -26,72 +26,6 @@ public DefaultConfig() {
     Thread.setDefaultUncaughtExceptionHandler((t, e) -> logger.error("Uncaught exception", e));
   }
 
-  @Bean(name = "witness")
-  public String witness() {
-    return "witness";
-  }
-
-  @Bean(name = "account")
-  public String account() {
-    return "account";
-  }
-
-  @Bean(name = "asset-issue")
-  public String assetIssue() {
-    return "asset-issue";
-  }
-
-  @Bean(name = "block")
-  public String block() {
-    return "block";
-  }
-
-  @Bean(name = "votes")
-  public String votes() {
-    return "votes";
-  }
-
-  @Bean(name = "trans")
-  public String trans() {
-    return "trans";
-  }
-
-  @Bean(name = "utxo")
-  public String utxo() {
-    return "utxo";
-  }
-
-  @Bean(name = "properties")
-  public String properties() {
-    return "properties";
-  }
-
-  @Bean(name = "block_KDB")
-  public String blockKdb() {
-    return "block_KDB";
-  }
-
-  @Bean(name = "block-index")
-  public String blockIndex() {
-    return "block-index";
-  }
-
-  @Bean(name = "account-index")
-  public String accountIndex() {
-    return "account-index";
-  }
-
-  @Bean(name = "witness_schedule")
-  public String witnessSchedule() {
-    return "witness_schedule";
-  }
-
-  @Bean(name = "recent-block")
-  public String recentBlock() {
-    return "recent-block";
-  }
-
-
   @Bean
   public IndexHelper indexHelper() {
     if (!Args.getInstance().isSolidityNode()) {

src/main/java/org/tron/core/config/Parameter.java

@@ -14,14 +14,15 @@ interface ChainConstant {
     double SOLIDIFIED_THRESHOLD = 0.7;
     int PRIVATE_KEY_LENGTH = 64;
     int MAX_ACTIVE_WITNESS_NUM = 27;
-    int TRXS_SIZE = 2_000_000; // < 2MiB
+    //int TRXS_SIZE = 2_000_000; // < 2MiB
+    int BLOCK_SIZE = 2_000_000;
     int BLOCK_PRODUCED_INTERVAL = 3000; //ms,produce block period, must be divisible by 60. millisecond
-    long CLOCK_MAX_DELAY = 3600 * 1000; //ms
+    long CLOCK_MAX_DELAY = 3600000; // 3600 * 1000 ms
     double BLOCK_PRODUCED_TIME_OUT = 0.75;
     long BATCH_FETCH_RESPONSE_SIZE = 1000; //for each inventory message from peer, the max count of fetch inv message
     long PRECISION = 1000_000;
     long ONE_DAY_NET_LIMIT = 57_600_000_000L;
-    long WINDOW_SIZE_MS = 24 * 3600 * 1000;
+    long WINDOW_SIZE_MS = 24 * 3600 * 1000L;
     long CREATE_NEW_ACCOUNT_COST = 10000;
   }
 
@@ -37,6 +38,7 @@ interface NodeConstant {
   }
 
   interface NetConstants {
+
     long GRPC_IDLE_TIME_OUT = 60000L;
     long ADV_TIME_OUT = 20000L;
     long SYNC_TIME_OUT = 5000L;
@@ -50,6 +52,7 @@ interface NetConstants {
   }
 
   interface DatabaseConstants {
+
     int TRANSACTIONS_COUNT_LIMIT_MAX = 1000;
   }
 }

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

@@ -27,6 +27,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.iq80.leveldb.Options;
 import org.spongycastle.util.encoders.Hex;
 import org.springframework.stereotype.Component;
 import org.tron.common.crypto.ECKey;
@@ -65,8 +66,11 @@ public class Args {
   @Parameter(names = {"-p", "--private-key"}, description = "private-key")
   private String privateKey = "";
 
-  @Parameter(names = {"--storage-directory"}, description = "Storage directory")
-  private String storageDirectory = "";
+  @Parameter(names = {"--storage-db-directory"}, description = "Storage db directory")
+  private String storageDbDirectory = "";
+
+  @Parameter(names = {"--storage-index-directory"}, description = "Storage index directory")
+  private String storageIndexDirectory = "";
 
   @Getter
   private Storage storage;
@@ -218,8 +222,16 @@ public static void clearParam() {
     INSTANCE.witness = false;
     INSTANCE.seedNodes = new ArrayList<>();
     INSTANCE.privateKey = "";
-    INSTANCE.storageDirectory = "";
-    INSTANCE.storage = null;
+    INSTANCE.storageDbDirectory = "";
+    INSTANCE.storageIndexDirectory = "";
+
+    // FIXME: INSTANCE.storage maybe null ?
+    if (INSTANCE.storage != null) {
+      // WARNING: WILL DELETE DB STORAGE PATHS
+      INSTANCE.storage.deleteAllStoragePaths();
+      INSTANCE.storage = null;
+    }
+
     INSTANCE.overlay = null;
     INSTANCE.seedNode = null;
     INSTANCE.genesisBlock = null;
@@ -253,6 +265,7 @@ public static void clearParam() {
     INSTANCE.getTransactionsToThisCountFeature = false;
     INSTANCE.getTransactionsByTimestampFeature = false;
     INSTANCE.getTransactionsByTimestampCountFeature = false;
+
   }
 
   /**
@@ -281,9 +294,16 @@ public static void setParam(final String[] args, final String confFileName) {
     }
 
     INSTANCE.storage = new Storage();
-    INSTANCE.storage.setDirectory(Optional.ofNullable(INSTANCE.storageDirectory)
+    INSTANCE.storage.setDbDirectory(Optional.ofNullable(INSTANCE.storageDbDirectory)
         .filter(StringUtils::isNotEmpty)
-        .orElse(config.getString("storage.directory")));
+        .orElse(config.getString("storage.db.directory")));
+
+    INSTANCE.storage.setIndexDirectory(Optional.ofNullable(INSTANCE.storageIndexDirectory)
+            .filter(StringUtils::isNotEmpty)
+            .orElse(config.getString("storage.index.directory")));
+
+    INSTANCE.storage.setPropertyMapFromConfig(config);
+
     INSTANCE.seedNode = new SeedNode();
     INSTANCE.seedNode.setIpList(Optional.ofNullable(INSTANCE.seedNodes)
         .filter(seedNode -> 0 != seedNode.size())
@@ -436,6 +456,20 @@ public static Args getInstance() {
     return INSTANCE;
   }
 
+  /**
+   * Get storage path by name of database
+   *
+   * @param dbName name of database
+   * @return path of that database
+   */
+  public String getOutputDirectoryByDbName(String dbName) {
+    String path = storage.getPathByDbName(dbName);
+    if (!StringUtils.isBlank(path)) {
+      return path;
+    }
+    return getOutputDirectory();
+  }
+
   /**
    * get output directory.
    */
@@ -475,7 +509,7 @@ private static String getGeneratedNodePrivateKey() {
     String nodeId;
     try {
       File file = new File(
-          INSTANCE.outputDirectory + File.separator + INSTANCE.storage.getDirectory(),
+          INSTANCE.outputDirectory + File.separator + INSTANCE.storage.getDbDirectory(),
           "nodeId.properties");
       Properties props = new Properties();
       if (file.canRead()) {