Merge pull request #781 from tronprotocol/develop

merge from develop

Author: zhaohong

.travis.yml

@@ -9,7 +9,7 @@ addons:
   ssh_known_hosts:
   - 47.93.9.236:22008
 skip_build:
-- README.md
+- README.md：
 - LICENSE
 deploy:
   provider: script
@@ -18,3 +18,5 @@ deploy:
     branch: develop
 after_deploy:
   - ./gradlew stest
+
+

Chinese version of TRON Protocol document.md

@@ -212,8 +212,7 @@
    `trx_num`：对应TRX数量——比如：_232241_。  
    `num`： 对应的自定义资产数目。  
    `start_time`：开始时间——比如：_20170312_。  
-   `end_time`：结束时间——比如：_20170512_。  
-   `decav_ratio`：衰减速率。  
+   `end_time`：结束时间——比如：_20170512_。
    `vote_score`：合约的评分——比如：_12343_。  
    `description`：合约的描述——比如：_”trondada”_。  
    `url`：合约的url地址链接。
@@ -225,8 +224,7 @@
       int32 trx_num = 6;
  
       int32 num = 8;
  
       int64 start_time = 9;
  
-      int64 end_time = 10;
  
-      int32 decay_ratio = 15;
 
+      int64 end_time = 10;

       int32 vote_score = 16;
 
       bytes description = 20;
  
       bytes url = 21;


English version of TRON Protocol document.md

@@ -213,8 +213,7 @@
      `trx_num`: the number of TRONIX – e.g._232241_.  
      `num`: number of corresponding asset.  
      `start_time`: the starting date of this contract – e.g._20170312_.  
-     `end_time`: the expiring date of this contract – e.g. _20170512_.  
-     `decay_ratio`: decay ratio.  
+     `end_time`: the expiring date of this contract – e.g. _20170512_. 
      `vote_score`: the vote score of this contract received – e.g. _12343_.  
      `description`: the description of this contract – e.g.”_trondada_”.  
      `url`: the url of this contract – e.g. “_https://www.noonetrust.com_”.
@@ -227,7 +226,6 @@
            int32 num = 8;
  
            int64 start_time = 9;
  
            int64 end_time = 10;
  
-           int32 decay_ratio = 15;
  
            int32 vote_score = 16;
  
            bytes description = 20;
  
            bytes url = 21;


README.md

@@ -271,7 +271,7 @@ Then, run `FullNode::main()` again.
 ### Running multi-nodes
 
 To run TRON on more than one node, you need to specify several seed nodes' IPs in `config.conf` in `seed.node.ip.list`:
-For private testnet, the IPs are allocated by yourself.
+For private test net, the IPs are allocated by yourself.
 
 ## Running a local node and connecting to the public testnet 
 
@@ -293,8 +293,6 @@ cd build/libs
 java -jar java-tron.jar
 ```
 
-It is almost the same as that does in the private testnet, except that the IPs in the `config.conf` are officially declared by TRON.
-
 ### Running a Super Node
 
 * Use the executable JAR(Recommend the way)

build.gradle

@@ -6,6 +6,8 @@ apply plugin: 'com.google.protobuf'
 apply plugin: 'application'
 apply plugin: 'checkstyle'
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: "jacoco"
+
 
 sourceCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
@@ -33,6 +35,11 @@ def versions = [
         checkstyle: '8.7',
 ]
 
+jacoco {
+    toolVersion = "0.8.1"
+}
+
+
 configurations {
     checkstyleConfig
 
@@ -215,6 +222,10 @@ test {
     testLogging {
         exceptionFormat = 'full'
     }
+    jacoco {
+        append = false
+        destinationFile = file("$buildDir/jacoco/jacocoTest.exec")
+    }
 }
 
 task stest(type:Test){

src/main/java/org/tron/common/overlay/client/WalletGrpcClient.java

@@ -5,14 +5,12 @@
 import io.grpc.ManagedChannelBuilder;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import org.tron.api.GrpcAPI.AccountList;
 import org.tron.api.GrpcAPI.AssetIssueList;
 import org.tron.api.GrpcAPI.BytesMessage;
 import org.tron.api.GrpcAPI.EmptyMessage;
 import org.tron.api.GrpcAPI.NodeList;
 import org.tron.api.GrpcAPI.NumberMessage;
 import org.tron.api.GrpcAPI.Return;
-import org.tron.api.GrpcAPI.WitnessList;
 import org.tron.api.WalletGrpc;
 import org.tron.protos.Contract;
 import org.tron.protos.Contract.AssetIssueContract;
@@ -88,31 +86,6 @@ public Block getBlock(long blockNum) {
     return walletBlockingStub.getBlockByNum(builder.build());
   }
 
-  public Optional<AccountList> listAccounts() {
-    AccountList accountList = walletBlockingStub.listAccounts(EmptyMessage.newBuilder().build());
-    if (accountList != null) {
-      return Optional.of(accountList);
-    }
-    return Optional.empty();
-  }
-
-  public Optional<WitnessList> listWitnesses() {
-    WitnessList witnessList = walletBlockingStub.listWitnesses(EmptyMessage.newBuilder().build());
-    if (witnessList != null) {
-      return Optional.of(witnessList);
-    }
-    return Optional.empty();
-  }
-
-  public Optional<AssetIssueList> getAssetIssueList() {
-    AssetIssueList assetIssueList = walletBlockingStub
-        .getAssetIssueList(EmptyMessage.newBuilder().build());
-    if (assetIssueList != null) {
-      return Optional.of(assetIssueList);
-    }
-    return Optional.empty();
-  }
-
   public Optional<NodeList> listNodes() {
     NodeList nodeList = walletBlockingStub
         .listNodes(EmptyMessage.newBuilder().build());
@@ -139,8 +112,4 @@ public AssetIssueContract getAssetIssueByName(String assetName) {
     return walletBlockingStub.getAssetIssueByName(request);
   }
 
-  public NumberMessage getTotalTransaction() {
-    return walletBlockingStub.totalTransaction(EmptyMessage.newBuilder().build());
-  }
-
 }