Skip to content

Commit 440a8d8

Browse files
committed
use common methods to simplify code
1 parent ad3bb3b commit 440a8d8

File tree

6 files changed

+10
-24
lines changed

6 files changed

+10
-24
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
3535

3636
protected void doPost(HttpServletRequest request, HttpServletResponse response) {
3737
try {
38-
String account = request.getReader().lines()
39-
.collect(Collectors.joining(System.lineSeparator()));
40-
Util.checkBodySize(account);
41-
boolean visible = Util.getVisiblePost(account);
38+
PostParams params = PostParams.getPostParams(request);
4239
Account.Builder build = Account.newBuilder();
43-
JsonFormat.merge(account, build, visible);
44-
fillResponse(visible, build.getAddress(), response);
40+
JsonFormat.merge(params.getParams(), build, params.isVisible());
41+
fillResponse(params.isVisible(), build.getAddress(), response);
4542
} catch (Exception e) {
4643
Util.processError(e, response);
4744
}

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
3535

3636
protected void doPost(HttpServletRequest request, HttpServletResponse response) {
3737
try {
38-
String input = request.getReader().lines()
39-
.collect(Collectors.joining(System.lineSeparator()));
40-
Util.checkBodySize(input);
41-
boolean visible = Util.getVisiblePost(input);
42-
JSONObject jsonObject = JSONObject.parseObject(input);
38+
PostParams params = PostParams.getPostParams(request);
39+
JSONObject jsonObject = JSONObject.parseObject(params.getParams());
4340
String id = jsonObject.getString("value");
4441
AssetIssueContract reply = wallet.getAssetIssueById(id);
4542
if (reply != null) {
46-
response.getWriter().println(JsonFormat.printToString(reply, visible));
43+
response.getWriter().println(JsonFormat.printToString(reply, params.isVisible()));
4744
} else {
4845
response.getWriter().println("{}");
4946
}

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
3434

3535
protected void doPost(HttpServletRequest request, HttpServletResponse response) {
3636
try {
37-
String input = request.getReader().lines()
38-
.collect(Collectors.joining(System.lineSeparator()));
39-
Util.checkBodySize(input);
40-
boolean visible = Util.getVisiblePost(input);
41-
JSONObject jsonObject = JSON.parseObject(input);
37+
PostParams params = PostParams.getPostParams(request);
38+
JSONObject jsonObject = JSON.parseObject(params.getParams());
4239
String value = jsonObject.getString("value");
43-
fillResponse(visible, value, response);
40+
fillResponse(params.isVisible(), value, response);
4441
} catch (Exception e) {
4542
Util.processError(e, response);
4643
}

framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/validatemultisign/TestValidatemultisign001.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.ByteUtil;
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.Transaction;

framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/validatemultisign/TestValidatemultisign002.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.ByteUtil;
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.Transaction;

framework/src/test/java/stest/tron/wallet/dailybuild/tvmnewcommand/validatemultisign/TestValidatemultisign003.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import org.tron.common.utils.Sha256Hash;
2323
import org.tron.common.utils.StringUtil;
2424
import org.tron.common.utils.Utils;
25-
import org.tron.common.utils.WalletUtil;
26-
import org.tron.core.Wallet;
2725
import org.tron.protos.Protocol;
2826
import org.tron.protos.Protocol.Transaction;
2927
import org.tron.protos.Protocol.TransactionInfo;
@@ -168,8 +166,7 @@ public void test002validatemultisign() {
168166
Transaction transaction = PublicMethedForMutiSign.sendcoinGetTransaction(
169167
fromAddress, 1L, ownerAddress, ownerKey, blockingStubFull, ownerKeyString);
170168
byte[] hash = Sha256Hash.of(CommonParameter.getInstance()
171-
.isECKeyCryptoEngine(),transaction.getRawData().toByteArray()).getBytes();
172-
169+
.isECKeyCryptoEngine(), transaction.getRawData().toByteArray()).getBytes();
173170

174171
byte[] merged = ByteUtil.merge(ownerAddress, ByteArray.fromInt(0), hash);
175172
byte[] tosign = Sha256Hash.hash(CommonParameter.getInstance()

0 commit comments

Comments
 (0)