Merge pull request #3697 from tronprotocol/modify-tx-return-value

Modify tx return value

Author: forfreeday

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

@@ -1,16 +1,13 @@
 package org.tron.core.services.http;
 
-import com.google.protobuf.ByteString;
 import java.util.Collection;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.api.GrpcAPI.TransactionIdList;
-import org.tron.api.GrpcAPI.TransactionList;
 import org.tron.core.db.Manager;
-import org.tron.protos.Protocol.Transaction;
 
 
 @Component
@@ -26,7 +23,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
       Collection<String> result = manager.getTxListFromPending();
       TransactionIdList.Builder builder = TransactionIdList.newBuilder();
       builder.addAllTxId(result);
-      response.getWriter().println(Util.printTransactionList(builder.build(), visible));
+      response.getWriter().println(Util.printTransactionIdList(builder.build(), visible));
     } catch (Exception e) {
       Util.processError(e, response);
     }
@@ -39,7 +36,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       TransactionIdList.Builder builder = TransactionIdList.newBuilder();
       builder.addAllTxId(result);
       response.getWriter()
-          .println(Util.printTransactionList(builder.build(), params.isVisible()));
+          .println(Util.printTransactionIdList(builder.build(), params.isVisible()));
     } catch (Exception e) {
       Util.processError(e, response);
     }

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

@@ -58,7 +58,6 @@ public class Util {
   public static final String PERMISSION_ID = "Permission_id";
   public static final String VISIBLE = "visible";
   public static final String TRANSACTION = "transaction";
-  public static final String TRANSACTION_ID = "transactionId";
   public static final String VALUE = "value";
   public static final String CONTRACT_TYPE = "contractType";
   public static final String EXTRA_DATA = "extra_data";
@@ -114,13 +113,9 @@ public static String printTransactionList(TransactionList list, boolean selfType
     return jsonObject.toJSONString();
   }
 
-  public static String printTransactionList(TransactionIdList list, boolean selfType) {
+  public static String printTransactionIdList(TransactionIdList list, boolean selfType) {
     List<String> transactions = list.getTxIdList();
     JSONObject jsonObject = JSONObject.parseObject(JsonFormat.printToString(list, selfType));
-    JSONArray jsonArray = new JSONArray();
-    transactions.stream()
-        .forEach(transaction -> jsonArray.add(transaction));
-    jsonObject.put(TRANSACTION_ID, jsonArray);
 
     return jsonObject.toJSONString();
   }

framework/src/test/java/stest/tron/wallet/dailybuild/http/HttpTestTransactionPending001.java

@@ -64,15 +64,12 @@ public void test02GetPendingTransactionList() {
       if (retryTimes % 5 == 0) {
         response = HttpMethed.getTransactionListFromPending(httpnode);
         responseContent = HttpMethed.parseResponseContent(response);
-        transactionSize = responseContent.getJSONArray("transaction").size();
+        transactionSize = responseContent.getJSONArray("txId").size();
       }
     }
     Assert.assertNotEquals(transactionSize,0);
 
-    transaction = responseContent.getJSONArray("transaction").getJSONObject(0);
-    HttpMethed.printJsonContent(transaction);
-    txid = transaction.getString("txID");
-    Assert.assertTrue(transaction.containsKey("raw_data"));
+    txid = responseContent.getJSONArray("txId").getString(0);
   }