Skip to content

Commit 31880b9

Browse files
committed
duplicate code improvement
1 parent effb2ea commit 31880b9

File tree

1 file changed

+8
-11
lines changed
  • framework/src/main/java/org/tron/core/services/http

1 file changed

+8
-11
lines changed

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -148,24 +148,21 @@ public static String printTransactionExtention(TransactionExtention transactionE
148148
public static String printTransactionSignWeight(TransactionSignWeight transactionSignWeight,
149149
boolean selfType) {
150150
String string = JsonFormat.printToString(transactionSignWeight, selfType);
151-
JSONObject jsonObject = JSONObject.parseObject(string);
152-
JSONObject jsonObjectExt = jsonObject.getJSONObject(TRANSACTION);
153-
jsonObjectExt
154-
.put(TRANSACTION,
155-
printTransactionToJSON(transactionSignWeight.getTransaction().getTransaction(),
156-
selfType));
157-
jsonObject.put(TRANSACTION, jsonObjectExt);
158-
return jsonObject.toJSONString();
151+
return printTxInfo(transactionSignWeight.getTransaction().getTransaction(), string, selfType);
159152
}
160153

161154
public static String printTransactionApprovedList(
162155
TransactionApprovedList transactionApprovedList, boolean selfType) {
163156
String string = JsonFormat.printToString(transactionApprovedList, selfType);
164-
JSONObject jsonObject = JSONObject.parseObject(string);
157+
return printTxInfo(transactionApprovedList.getTransaction().getTransaction(), string, selfType);
158+
}
159+
160+
public static String printTxInfo(Transaction tx, String str, boolean selfType) {
161+
JSONObject jsonObject = JSONObject.parseObject(str);
165162
JSONObject jsonObjectExt = jsonObject.getJSONObject(TRANSACTION);
166163
jsonObjectExt.put(TRANSACTION,
167-
printTransactionToJSON(transactionApprovedList.getTransaction().getTransaction(),
168-
selfType));
164+
printTransactionToJSON(tx,
165+
selfType));
169166
jsonObject.put(TRANSACTION, jsonObjectExt);
170167
return jsonObject.toJSONString();
171168
}

0 commit comments

Comments
 (0)