Skip to content

Commit 9f472b7

Browse files
committed
remove unusefull code and optimized code
1 parent 2596793 commit 9f472b7

File tree

10 files changed

+8
-317
lines changed

10 files changed

+8
-317
lines changed

chainbase/src/main/java/org/tron/common/utils/Commons.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
@Slf4j(topic = "Commons")
2020
public class Commons {
2121

22-
public static final int ADDRESS_SIZE = 42;
2322
public static final int ASSET_ISSUE_COUNT_LIMIT_MAX = 1000;
2423

2524
public static byte[] clone(byte[] value) {

chainbase/src/main/java/org/tron/common/utils/Hash.java

Lines changed: 0 additions & 187 deletions
This file was deleted.

chainbase/src/main/java/org/tron/common/zksnark/JLibrustzcash.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.tron.common.utils.ByteArray;
5+
import org.tron.common.utils.ByteUtil;
56
import org.tron.common.utils.DBConfig;
67
import org.tron.common.zksnark.LibrustzcashParam.BindingSigParams;
78
import org.tron.common.zksnark.LibrustzcashParam.CheckOutputParams;
@@ -95,7 +96,7 @@ public static boolean librustzcashComputeNf(ComputeNfParams params) {
9596
*/
9697
public static byte[] librustzcashAskToAk(byte[] ask) throws ZksnarkException {
9798
if (!isOpenZen()) {
98-
return ByteArray.EMPTY_BYTE_ARRAY;
99+
return ByteUtil.EMPTY_BYTE_ARRAY;
99100
}
100101
LibrustzcashParam.valid32Params(ask);
101102
byte[] ak = new byte[32];
@@ -109,7 +110,7 @@ public static byte[] librustzcashAskToAk(byte[] ask) throws ZksnarkException {
109110
*/
110111
public static byte[] librustzcashNskToNk(byte[] nsk) throws ZksnarkException {
111112
if (!isOpenZen()) {
112-
return ByteArray.EMPTY_BYTE_ARRAY;
113+
return ByteUtil.EMPTY_BYTE_ARRAY;
113114
}
114115
LibrustzcashParam.valid32Params(nsk);
115116
byte[] nk = new byte[32];
@@ -124,7 +125,7 @@ public static byte[] librustzcashNskToNk(byte[] nsk) throws ZksnarkException {
124125
*/
125126
public static byte[] librustzcashSaplingGenerateR(byte[] r) throws ZksnarkException {
126127
if (!isOpenZen()) {
127-
return ByteArray.EMPTY_BYTE_ARRAY;
128+
return ByteUtil.EMPTY_BYTE_ARRAY;
128129
}
129130
LibrustzcashParam.valid32Params(r);
130131
INSTANCE.librustzcashSaplingGenerateR(r);

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ public static byte[] decode(String input) throws IllegalArgumentException {
106106
return copyOfRange(temp, j - zeroCount, temp.length);
107107
}
108108

109-
public static BigInteger decodeToBigInteger(String input) throws IllegalArgumentException {
110-
return new BigInteger(1, decode(input));
111-
}
112-
113109
//
114110
// number -> number / 58, returns number % 58
115111
//

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.tron.common.utils;
22

3+
import static org.tron.common.utils.ByteUtil.EMPTY_BYTE_ARRAY;
4+
35
import com.google.common.primitives.Ints;
46
import com.google.common.primitives.Longs;
57
import java.io.ByteArrayOutputStream;
@@ -33,8 +35,6 @@
3335
@Slf4j(topic = "utils")
3436
public class ByteArray {
3537

36-
public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
37-
3838
public static String toHexString(byte[] data) {
3939
return data == null ? "" : Hex.toHexString(data);
4040
}

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,6 @@
1111

1212
public class CollectionUtils {
1313

14-
public static <K, V> List<V> collectList(Collection<K> items, Function<K, V> collector) {
15-
List<V> collected = new ArrayList<>(items.size());
16-
for (K item : items) {
17-
collected.add(collector.apply(item));
18-
}
19-
return collected;
20-
}
21-
22-
public static <K, V> Set<V> collectSet(Collection<K> items, Function<K, V> collector) {
23-
Set<V> collected = new HashSet<>();
24-
for (K item : items) {
25-
collected.add(collector.apply(item));
26-
}
27-
return collected;
28-
}
29-
3014
public static <T> List<T> truncate(List<T> items, int limit) {
3115
if (limit > items.size()) {
3216
return new ArrayList<>(items);
@@ -65,24 +49,4 @@ public static <T> List<T> truncateRandom(List<T> items, int limit, int confirm)
6549
}
6650
return truncated;
6751
}
68-
69-
public static <T> List<T> selectList(Collection<T> items, Predicate<T> predicate) {
70-
List<T> selected = new ArrayList<>();
71-
for (T item : items) {
72-
if (predicate.test(item)) {
73-
selected.add(item);
74-
}
75-
}
76-
return selected;
77-
}
78-
79-
public static <T> Set<T> selectSet(Collection<T> items, Predicate<T> predicate) {
80-
Set<T> selected = new HashSet<>();
81-
for (T item : items) {
82-
if (predicate.test(item)) {
83-
selected.add(item);
84-
}
85-
}
86-
return selected;
87-
}
8852
}

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

Lines changed: 0 additions & 61 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
package org.tron.common.utils;
2020

21-
import static java.util.Arrays.copyOfRange;
2221
import static org.tron.common.utils.ByteUtil.EMPTY_BYTE_ARRAY;
2322
import static org.tron.common.utils.ByteUtil.isNullOrZeroArray;
2423
import static org.tron.common.utils.ByteUtil.isSingleZero;

0 commit comments

Comments
 (0)