Merge pull request tronprotocol#2663 from tronprotocol/branchForCommunity

improve statement lambda and check error words

Author: jiangyy0824

common/src/main/java/org/tron/common/runtime/vm/LogInfo.java

@@ -44,9 +44,9 @@ public LogInfo(byte[] address, List<DataWord> topics, byte[] data) {
 
   public static Log buildLog(LogInfo logInfo) {
     List<ByteString> topics = Lists.newArrayList();
-    logInfo.getTopics().forEach(topic -> {
-      topics.add(ByteString.copyFrom(topic.getData()));
-    });
+    logInfo.getTopics().forEach(topic ->
+      topics.add(ByteString.copyFrom(topic.getData()))
+    );
     ByteString address = ByteString.copyFrom(logInfo.getAddress());
     ByteString data = ByteString.copyFrom(logInfo.getData());
     return Log.newBuilder().setAddress(address).addAllTopics(topics).setData(data).build();

framework/src/main/java/org/tron/core/Wallet.java

@@ -551,11 +551,11 @@ public TransactionCapsule createTransactionCapsule(com.google.protobuf.Message m
   /**
    * Broadcast a transaction.
    */
-  public GrpcAPI.Return broadcastTransaction(Transaction signaturedTransaction) {
+  public GrpcAPI.Return broadcastTransaction(Transaction signedTransaction) {
     GrpcAPI.Return.Builder builder = GrpcAPI.Return.newBuilder();
-    TransactionCapsule trx = new TransactionCapsule(signaturedTransaction);
+    TransactionCapsule trx = new TransactionCapsule(signedTransaction);
     try {
-      Message message = new TransactionMessage(signaturedTransaction.toByteArray());
+      Message message = new TransactionMessage(signedTransaction.toByteArray());
       if (minEffectiveConnection != 0) {
         if (tronNetDelegate.getActivePeer().isEmpty()) {
           logger
@@ -686,7 +686,7 @@ public TransactionSignWeight getTransactionSignWeight(Transaction trx) {
       }
       if (permissionId != 0) {
         if (permission.getType() != PermissionType.Active) {
-          throw new PermissionException("Permission type is error");
+          throw new PermissionException("Permission type is wrong!");
         }
         //check operations
         if (!checkPermissionOprations(permission, contract)) {
@@ -1109,9 +1109,7 @@ public AssetIssueList getAssetIssueByAccount(ByteString accountAddress) {
     AssetIssueList.Builder builder = AssetIssueList.newBuilder();
     assetIssueCapsuleList.stream()
         .filter(assetIssueCapsule -> assetIssueCapsule.getOwnerAddress().equals(accountAddress))
-        .forEach(issueCapsule -> {
-          builder.addAssetIssue(issueCapsule.getInstance());
-        });
+        .forEach(issueCapsule -> builder.addAssetIssue(issueCapsule.getInstance()));
 
     return builder.build();
   }
@@ -1249,9 +1247,7 @@ public AssetIssueContract getAssetIssueByName(ByteString assetName)
           .stream()
           .filter(assetIssueCapsule -> assetIssueCapsule.getName().equals(assetName))
           .forEach(
-              issueCapsule -> {
-                builder.addAssetIssue(issueCapsule.getInstance());
-              });
+              issueCapsule -> builder.addAssetIssue(issueCapsule.getInstance()));
 
       // check count
       if (builder.getAssetIssueCount() > 1) {
@@ -1273,7 +1269,7 @@ public AssetIssueContract getAssetIssueByName(ByteString assetName)
           // check count
           if (builder.getAssetIssueCount() > 1) {
             throw new NonUniqueObjectException(
-                "To get more than one asset, please use getAssetIssuebyid syntax");
+                "To get more than one asset, please use getAssetIssueById syntax");
           }
         }
       }
@@ -1297,9 +1293,7 @@ public AssetIssueList getAssetIssueListByName(ByteString assetName) {
     AssetIssueList.Builder builder = AssetIssueList.newBuilder();
     assetIssueCapsuleList.stream()
         .filter(assetIssueCapsule -> assetIssueCapsule.getName().equals(assetName))
-        .forEach(issueCapsule -> {
-          builder.addAssetIssue(issueCapsule.getInstance());
-        });
+        .forEach(issueCapsule -> builder.addAssetIssue(issueCapsule.getInstance()));
 
     return builder.build();
   }
@@ -1473,7 +1467,7 @@ private IncrementalMerkleVoucherContainer createWitness(OutputPoint outPoint, Lo
     //Get the tree in blockNum-1 position
     byte[] treeRoot = dbManager.getMerkleTreeIndexStore().get(blockNumber - 1);
     if (treeRoot == null) {
-      throw new RuntimeException("treeRoot is null,blockNumber:" + (blockNumber - 1));
+      throw new RuntimeException("treeRoot is null, blockNumber:" + (blockNumber - 1));
     }
 
     IncrementalMerkleTreeCapsule treeCapsule = dbManager.getMerkleTreeStore()
@@ -1986,7 +1980,7 @@ public TransactionCapsule createShieldedTransactionWithoutSpendAuthSig(
     try {
       transactionCapsule = builder.buildWithoutAsk();
     } catch (ZksnarkException e) {
-      logger.error("createShieldedTransaction except, error is " + e.toString());
+      logger.error("createShieldedTransaction exception, error is " + e.toString());
       throw new ZksnarkException(e.toString());
     }
     return transactionCapsule;
@@ -2368,7 +2362,7 @@ public Transaction callConstantContract(TransactionCapsule trxCap, Builder
     ProgramResult result = context.getProgramResult();
     if (result.getException() != null) {
       RuntimeException e = result.getException();
-      logger.warn("Constant call has error {}", e.getMessage());
+      logger.warn("Constant call has an error {}", e.getMessage());
       throw e;
     }
 

framework/src/main/java/org/tron/core/services/RpcApiService.java

@@ -217,12 +217,12 @@ public void start() {
       logger.debug(e.getMessage(), e);
     }
 
-    logger.info("RpcApiService started, listening on " + port);
+    logger.info("RpcApiService has started, listening on " + port);
 
     Runtime.getRuntime().addShutdownHook(new Thread(() -> {
       System.err.println("*** shutting down gRPC server since JVM is shutting down");
       //server.this.stop();
-      System.err.println("*** server shut down");
+      System.err.println("*** server is shutdown");
     }));
   }
 
@@ -1068,7 +1068,7 @@ private void checkVoteWitnessAccount(VoteWitnessContract req) {
 
         Preconditions.checkNotNull(witness, "witness[" + readableWitnessAddress + "] not exists");
         Preconditions.checkArgument(vote.getVoteCount() <= 0,
-            "VoteAddress[" + readableWitnessAddress + "],VotesCount[" + vote
+            "VoteAddress[" + readableWitnessAddress + "], VotesCount[" + vote
                 .getVoteCount() + "] <= 0");
       });
     }

framework/src/main/java/org/tron/core/services/http/Util.java

@@ -70,9 +70,7 @@ public static String printBlockList(BlockList list, boolean selfType) {
     List<Block> blocks = list.getBlockList();
     JSONObject jsonObject = JSONObject.parseObject(JsonFormat.printToString(list, selfType));
     JSONArray jsonArray = new JSONArray();
-    blocks.stream().forEach(block -> {
-      jsonArray.add(printBlockToJSON(block, selfType));
-    });
+    blocks.stream().forEach(block -> jsonArray.add(printBlockToJSON(block, selfType)));
     jsonObject.put("block", jsonArray);
 
     return jsonObject.toJSONString();
@@ -98,9 +96,9 @@ public static String printTransactionList(TransactionList list, boolean selfType
     List<Transaction> transactions = list.getTransactionList();
     JSONObject jsonObject = JSONObject.parseObject(JsonFormat.printToString(list, selfType));
     JSONArray jsonArray = new JSONArray();
-    transactions.stream().forEach(transaction -> {
-      jsonArray.add(printTransactionToJSON(transaction, selfType));
-    });
+    transactions.stream().forEach(transaction -> jsonArray
+            .add(printTransactionToJSON(transaction, selfType))
+    );
     jsonObject.put(TRANSACTION, jsonArray);
 
     return jsonObject.toJSONString();
@@ -109,9 +107,8 @@ public static String printTransactionList(TransactionList list, boolean selfType
   public static JSONArray printTransactionListToJSON(List<TransactionCapsule> list,
       boolean selfType) {
     JSONArray transactions = new JSONArray();
-    list.stream().forEach(transactionCapsule -> {
-      transactions.add(printTransactionToJSON(transactionCapsule.getInstance(), selfType));
-    });
+    list.stream().forEach(transactionCapsule -> transactions
+                    .add(printTransactionToJSON(transactionCapsule.getInstance(), selfType)));
     return transactions;
   }
 
@@ -285,7 +282,7 @@ public static Transaction packTransaction(String strTransaction, boolean selfTyp
   public static void checkBodySize(String body) throws Exception {
     Args args = Args.getInstance();
     if (body.getBytes().length > args.getMaxMessageSize()) {
-      throw new Exception("body size is too big, limit is " + args.getMaxMessageSize());
+      throw new Exception("body size is too big, the limit is " + args.getMaxMessageSize());
     }
   }
 
@@ -386,21 +383,21 @@ public static long getJsonLongValue(final JSONObject jsonObject, final String ke
   public static long getJsonLongValue(JSONObject jsonObject, String key, boolean required) {
     BigDecimal bigDecimal = jsonObject.getBigDecimal(key);
     if (required && bigDecimal == null) {
-      throw new InvalidParameterException("key [" + key + "] not exist");
+      throw new InvalidParameterException("key [" + key + "] does not exist");
     }
     return (bigDecimal == null) ? 0L : bigDecimal.longValueExact();
   }
 
-  public static String getMemo(byte[] meno) {
-    int index = meno.length;
+  public static String getMemo(byte[] memo) {
+    int index = memo.length;
     for (; index > 0; --index) {
-      if (meno[index - 1] != 0) {
+      if (memo[index - 1] != 0) {
         break;
       }
     }
 
     byte[] inputCheck = new byte[index];
-    System.arraycopy(meno, 0, inputCheck, 0, index);
+    System.arraycopy(memo, 0, inputCheck, 0, index);
     return new String(inputCheck, Charset.forName("UTF-8"));
   }
 

framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/GetBrokerageOnSolidityServlet.java

@@ -21,8 +21,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
   }
 
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {
-    walletOnSolidity.futureGet(() -> {
-      super.doPost(request, response);
-    });
+    walletOnSolidity.futureGet(() -> super.doPost(request, response));
   }
 }