feature: adjust printed info for constant trigger

tronprotocol · Aug 30, 2021 · 7e7d13d · 7e7d13d
1 parent f87ee8a
commit 7e7d13d
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/main/java/org/tron/walletserver/WalletApi.java b/src/main/java/org/tron/walletserver/WalletApi.java
@@ -2178,15 +2178,13 @@ public boolean triggerContract(
     Transaction transaction = transactionExtention
         .getTransaction();
     // for constant
-    if (transaction.getRetCount() != 0
-        && transactionExtention.getConstantResult(0) != null
-        && transactionExtention.getResult() != null) {
-      byte[] result = transactionExtention.getConstantResult(0).toByteArray();
-      System.out.println("message:" + transaction.getRet(0).getRet());
-      System.out.println(
-          ":" + ByteArray.toStr(transactionExtention.getResult().getMessage().toByteArray()));
-      System.out.println("Result:" + Hex.toHexString(result));
-      System.out.println("EnergyUsed:" + transactionExtention.getEnergyUsed());
+    if (transaction.getRetCount() != 0) {
+      TransactionExtention.Builder builder =
+          transactionExtention.toBuilder().clearTransaction().clearTxid();
+      if (transaction.getRet(0).getRet() == Result.code.FAILED) {
+        builder.setResult(builder.getResult().toBuilder().setResult(false));
+      }
+      System.out.println("Execution result = " + Utils.formatMessageString(builder.build()));
       return true;
     }