Skip to content

Commit 381a12f

Browse files
committed
optimize GetMerkleTreeVoucherInfoServlet api
1 parent 3c62ee7 commit 381a12f

File tree

4 files changed

+3
-35
lines changed

4 files changed

+3
-35
lines changed

common/src/main/java/org/tron/common/utils/DecodeUtil.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,4 @@ public static boolean addressValid(byte[] address) {
3232
return true;
3333
}
3434

35-
public static String createReadableString(byte[] bytes) {
36-
return ByteArray.toHexString(bytes);
37-
}
38-
3935
}

common/src/main/java/org/tron/common/utils/Utils.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,35 +46,12 @@ static String getIdShort(String Id) {
4646
return Id == null ? "<null>" : Id.substring(0, 8);
4747
}
4848

49-
static char[] getChars(byte[] bytes) {
50-
Charset cs = Charset.forName("UTF-8");
51-
ByteBuffer bb = ByteBuffer.allocate(bytes.length);
52-
bb.put(bytes);
53-
bb.flip();
54-
CharBuffer cb = cs.decode(bb);
55-
56-
return cb.array();
57-
}
58-
5949
static byte[] clone(byte[] value) {
6050
byte[] clone = new byte[value.length];
6151
System.arraycopy(value, 0, clone, 0, value.length);
6252
return clone;
6353
}
6454

65-
static String sizeToStr(long size) {
66-
if (size < 2 * (1L << 10)) {
67-
return size + "b";
68-
}
69-
if (size < 2 * (1L << 20)) {
70-
return String.format("%dKb", size / (1L << 10));
71-
}
72-
if (size < 2 * (1L << 30)) {
73-
return String.format("%dMb", size / (1L << 20));
74-
}
75-
return String.format("%dGb", size / (1L << 30));
76-
}
77-
7855
static String align(String s, char fillChar, int targetLen, boolean alignRight) {
7956
if (targetLen <= s.length()) {
8057
return s;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.tron.core.services.http;
22

33
import com.alibaba.fastjson.JSONObject;
4-
import java.util.stream.Collectors;
54
import javax.servlet.http.HttpServletRequest;
65
import javax.servlet.http.HttpServletResponse;
76
import lombok.extern.slf4j.Slf4j;

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.tron.core.services.http;
22

3-
import java.util.stream.Collectors;
43
import javax.servlet.http.HttpServletRequest;
54
import javax.servlet.http.HttpServletResponse;
65
import lombok.extern.slf4j.Slf4j;
@@ -24,15 +23,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2423

2524
protected void doPost(HttpServletRequest request, HttpServletResponse response) {
2625
try {
27-
String input = request.getReader().lines()
28-
.collect(Collectors.joining(System.lineSeparator()));
29-
Util.checkBodySize(input);
30-
boolean visible = Util.getVisiblePost(input);
26+
PostParams params = PostParams.getPostParams(request);
3127
OutputPointInfo.Builder build = OutputPointInfo.newBuilder();
32-
JsonFormat.merge(input, build);
28+
JsonFormat.merge(params.getParams(), build);
3329
IncrementalMerkleVoucherInfo reply = wallet.getMerkleTreeVoucherInfo(build.build());
3430
if (reply != null) {
35-
response.getWriter().println(JsonFormat.printToString(reply, visible));
31+
response.getWriter().println(JsonFormat.printToString(reply, params.isVisible()));
3632
} else {
3733
response.getWriter().println("{}");
3834
}

0 commit comments

Comments
 (0)