Skip to content

Commit b4aafae

Browse files
authored
Merge pull request #421 from tronprotocol/release_4.1.3
fix log error
2 parents 75cfdf3 + 25efaf5 commit b4aafae

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/main/java/org/tron/common/utils/Utils.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public static String printTransactionInfoList(TransactionInfoList transactionInf
165165
List<TransactionInfo> infoList = transactionInfoList.getTransactionInfoList();
166166
infoList.stream()
167167
.forEach(
168-
transactionInfo -> jsonArray.add(formatMessageString(transactionInfo))
168+
transactionInfo -> jsonArray.add(printTransactionInfoToJSON(transactionInfo))
169169
);
170170
return JsonFormatUtil.formatJson(jsonArray.toJSONString());
171171
}
@@ -610,6 +610,10 @@ public static JSONObject printTransactionToJSON(Transaction transaction, boolean
610610
return jsonTransaction;
611611
}
612612

613+
public static JSONObject printTransactionInfoToJSON(TransactionInfo transactioninfo) {
614+
return JSONObject.parseObject(JsonFormat.printToString(transactioninfo, true));
615+
}
616+
613617
public static boolean confirmEncrption() {
614618
System.out.println(
615619
"Please confirm encryption module,if input y or Y means default Eckey, other means SM2.");

src/main/java/org/tron/walletcli/Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2028,7 +2028,6 @@ private void getBrokerage(String[] parameters) {
20282028

20292029
private void getTransactionInfoByBlockNum(String[] parameters) {
20302030
if (parameters.length != 1) {
2031-
System.out.println("Too many parameters !!!");
20322031
System.out.println("You need input number with the following syntax:");
20332032
System.out.println("GetTransactionInfoByBlockNum number");
20342033
return;
@@ -4251,6 +4250,7 @@ private void run() {
42514250
}
42524251
case "gettransactioninfobyblocknum": {
42534252
getTransactionInfoByBlockNum(parameters);
4253+
break;
42544254
}
42554255
case "marketsellasset": {
42564256
marketSellAsset(parameters);

0 commit comments

Comments
 (0)