Skip to content

Commit 973491d

Browse files
xxo1shinexxo1shine
authored
Merge pull request tronprotocol#3108 from kaiserlinda/optimize_solid_http_if
Optimize solid http interface & delete extra import files
2 parents ad3bb3b + 7530d9a commit 973491d

12 files changed

+15
-29
lines changed

‎framework/src/main/java/org/tron/core/services/http/solidity/GetTransactionByIdSolidityServlet.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2828
try {
2929
boolean visible = Util.getVisible(request);
3030
String input = request.getParameter("value");
31-
Transaction reply = wallet
32-
.getTransactionById(ByteString.copyFrom(ByteArray.fromHexString(input)));
33-
if (reply != null) {
34-
response.getWriter().println(Util.printTransaction(reply, visible));
35-
} else {
36-
response.getWriter().println("{}");
37-
}
31+
fillResponse(ByteString.copyFrom(ByteArray.fromHexString(input)), visible, response);
3832
} catch (Exception e) {
3933
logger.debug("Exception: {}", e.getMessage());
4034
try {
@@ -53,12 +47,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
5347
boolean visible = Util.getVisiblePost(input);
5448
BytesMessage.Builder build = BytesMessage.newBuilder();
5549
JsonFormat.merge(input, build, visible);
56-
Transaction reply = wallet.getTransactionById(build.build().getValue());
57-
if (reply != null) {
58-
response.getWriter().println(Util.printTransaction(reply, visible));
59-
} else {
60-
response.getWriter().println("{}");
61-
}
50+
fillResponse(build.build().getValue(), visible, response);
6251
} catch (Exception e) {
6352
logger.debug("Exception: {}", e.getMessage());
6453
try {
@@ -69,4 +58,14 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
6958
}
7059
}
7160

61+
private void fillResponse(ByteString txId, boolean visible, HttpServletResponse response)
62+
throws IOException {
63+
Transaction reply = wallet.getTransactionById(txId);
64+
if (reply != null) {
65+
response.getWriter().println(Util.printTransaction(reply, visible));
66+
} else {
67+
response.getWriter().println("{}");
68+
}
69+
}
70+
7271
}

‎framework/src/main/java/org/tron/core/services/http/solidity/GetTransactionInfoByIdSolidityServlet.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2929
try {
3030
boolean visible = Util.getVisible(request);
3131
String input = request.getParameter("value");
32-
TransactionInfo transInfo = wallet.getTransactionInfoById(ByteString.copyFrom(
33-
ByteArray.fromHexString(input)));
32+
TransactionInfo transInfo = wallet
33+
.getTransactionInfoById(ByteString.copyFrom(ByteArray.fromHexString(input)));
3434
if (transInfo == null) {
3535
response.getWriter().println("{}");
3636
} else {
@@ -70,4 +70,5 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
7070
}
7171
}
7272
}
73+
7374
}

‎framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/batchValidateSignContract/batchValidateSignContract001.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.tron.common.utils.ByteArray;
2323
import org.tron.common.utils.StringUtil;
2424
import org.tron.common.utils.Utils;
25-
import org.tron.common.utils.WalletUtil;
2625
import org.tron.core.Wallet;
2726
import stest.tron.wallet.common.client.Configuration;
2827
import stest.tron.wallet.common.client.Parameter;

‎framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/batchValidateSignContract/batchValidateSignContract002.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.tron.common.utils.ByteArray;
2323
import org.tron.common.utils.StringUtil;
2424
import org.tron.common.utils.Utils;
25-
import org.tron.common.utils.WalletUtil;
2625
import org.tron.core.Wallet;
2726
import org.tron.protos.Protocol;
2827
import org.tron.protos.Protocol.TransactionInfo;

‎framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/batchValidateSignContract/batchValidateSignContract003.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package stest.tron.wallet.dailybuild.tvmnewcommand.batchValidateSignContract;
22

3-
import static stest.tron.wallet.common.client.utils.PublicMethed.parametersString;
4-
53
import io.grpc.ManagedChannel;
64
import io.grpc.ManagedChannelBuilder;
75
import java.util.ArrayList;
@@ -25,7 +23,6 @@
2523
import org.tron.common.utils.ByteArray;
2624
import org.tron.common.utils.StringUtil;
2725
import org.tron.common.utils.Utils;
28-
import org.tron.common.utils.WalletUtil;
2926
import org.tron.core.Wallet;
3027
import stest.tron.wallet.common.client.Configuration;
3128
import stest.tron.wallet.common.client.Parameter;

‎framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/batchValidateSignContract/batchValidateSignContract004.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package stest.tron.wallet.dailybuild.tvmnewcommand.batchValidateSignContract;
22

3-
import static stest.tron.wallet.common.client.utils.PublicMethed.parametersString;
4-
53
import io.grpc.ManagedChannel;
64
import io.grpc.ManagedChannelBuilder;
75
import java.util.ArrayList;
@@ -26,7 +24,6 @@
2624
import org.tron.common.utils.ByteArray;
2725
import org.tron.common.utils.StringUtil;
2826
import org.tron.common.utils.Utils;
29-
import org.tron.common.utils.WalletUtil;
3027
import org.tron.core.Wallet;
3128
import org.tron.protos.Protocol;
3229
import org.tron.protos.Protocol.TransactionInfo;

‎framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/batchValidateSignContract/batchValidateSignContract005.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.tron.common.utils.ByteArray;
2323
import org.tron.common.utils.StringUtil;
2424
import org.tron.common.utils.Utils;
25-
import org.tron.common.utils.WalletUtil;
2625
import org.tron.core.Wallet;
2726
import stest.tron.wallet.common.client.Configuration;
2827
import stest.tron.wallet.common.client.Parameter;

‎framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/batchValidateSignContract/batchValidateSignContract006.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.tron.common.utils.ByteArray;
2424
import org.tron.common.utils.StringUtil;
2525
import org.tron.common.utils.Utils;
26-
import org.tron.common.utils.WalletUtil;
2726
import org.tron.core.Wallet;
2827
import org.tron.protos.Protocol;
2928
import org.tron.protos.Protocol.TransactionInfo;

‎framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/batchValidateSignContract/batchValidateSignContract007.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.tron.common.utils.ByteArray;
2424
import org.tron.common.utils.StringUtil;
2525
import org.tron.common.utils.Utils;
26-
import org.tron.common.utils.WalletUtil;
2726
import org.tron.core.Wallet;
2827
import org.tron.protos.Protocol;
2928
import org.tron.protos.Protocol.TransactionInfo;

‎framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/batchValidateSignContract/batchValidateSignContract010.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.tron.common.utils.ByteArray;
2222
import org.tron.common.utils.StringUtil;
2323
import org.tron.common.utils.Utils;
24-
import org.tron.common.utils.WalletUtil;
2524
import org.tron.core.Wallet;
2625
import stest.tron.wallet.common.client.Configuration;
2726
import stest.tron.wallet.common.client.Parameter;

‎framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/batchValidateSignContract/batchValidateSignContract011.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.tron.common.utils.ByteArray;
2323
import org.tron.common.utils.StringUtil;
2424
import org.tron.common.utils.Utils;
25-
import org.tron.common.utils.WalletUtil;
2625
import org.tron.core.Wallet;
2726
import org.tron.protos.Protocol;
2827
import org.tron.protos.Protocol.TransactionInfo;

‎framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/batchValidateSignContract/batchValidateSignContract012.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.tron.common.utils.ByteArray;
2323
import org.tron.common.utils.StringUtil;
2424
import org.tron.common.utils.Utils;
25-
import org.tron.common.utils.WalletUtil;
2625
import org.tron.core.Wallet;
2726
import org.tron.protos.Protocol.TransactionInfo;
2827
import stest.tron.wallet.common.client.Configuration;

0 commit comments

Comments
 (0)