Merge branch 'develop' into feature/wallet

Author: [email protected]

src/main/java/org/tron/command/Cli.java

@@ -27,12 +27,11 @@ public void run(Peer peer) {
         Scanner in = new Scanner(System.in);
 
         while (true) {
-            String cmd = in.nextLine();
-            cmd = cmd.trim();
+            String cmd = in.nextLine().trim();
 
             String[] cmdArray = cmd.split("\\s+");
-
-            if (cmdArray.length == 0 || cmdArray[0].equals("")) {
+            // split on trim() string will always return at the minimum: [""]
+            if ("".equals(cmdArray[0])) {
                 continue;
             }
 

src/main/java/org/tron/core/TransactionUtils.java

@@ -134,54 +134,51 @@ public static String toPrintString(Transaction transaction) {
             return "";
         }
 
-        String str =
-                "\nTransaction {\n" +
-                        "\tid=" + ByteArray.toHexString(transaction.getId()
-                        .toByteArray()) + "\n" +
-                        "\tvin=[\n";
-        int i = 0;
-        for (TXInput vin : transaction.getVinList()) {
-            str += "\t\t{\n" +
+        StringBuilder sb = new StringBuilder("\nTransaction {\n" +
+                "\tid=" + ByteArray.toHexString(transaction.getId()
+                .toByteArray()) + "\n" +
+                "\tvin=[\n");
+
+
+        for (int i = 0, vinCount = transaction.getVinCount(); i < vinCount; i++) {
+            TXInput vin = transaction.getVin(i);
+
+            sb.append("\t\t{\n" +
                     "\t\t\ttxID=" + ByteArray.toHexString(vin.getTxID()
                     .toByteArray()) + "\n" +
                     "\t\t\tvout=" + vin.getVout() + "\n" +
                     "\t\t\tsignature=" + ByteArray.toHexString(vin
                     .getSignature().toByteArray()) + "\n" +
                     "\t\t\tpubKey=" + ByteArray.toHexString(vin.getPubKey()
                     .toByteArray()) + "\n" +
-                    "\t\t}";
+                    "\t\t}");
 
-            if (i != transaction.getVinList().size() - 1) {
-                str += ",";
+            if (i != vinCount - 1) {
+                sb.append(",");
             }
-
-            i++;
-
-            str += "\n";
+            sb.append("\n");
         }
 
-        str += "\t],\n\tvout=[\n";
+        sb.append("\t],\n\tvout=[\n");
+
 
-        i = 0;
-        for (TXOutput vout : transaction.getVoutList()) {
-            str += "\t\t{\n" +
+        for (int i = 0, voutCount =  transaction.getVoutCount(); i < voutCount; i++) {
+            TXOutput vout = transaction.getVout(i);
+            sb.append("\t\t{\n" +
                     "\t\t\tvalue=" + vout.getValue() + "\n" +
                     "\t\t\tpubKeyHash=" + ByteArray.toHexString(vout
                     .getPubKeyHash().toByteArray()) + "\n" +
-                    "\t\t}";
+                    "\t\t}");
 
-            if (i != transaction.getVoutList().size() - 1) {
-                str += ",";
+            if (i != voutCount - 1) {
+                sb.append(",");
             }
-
-            i++;
-
-            str += "\n";
+            sb.append("\n");
         }
 
-        str += "\t]\n}";
+        sb.append("\t]\n}");
 
-        return str;
+        return sb.toString();
     }
 
     /**