Skip to content

Commit d82fd88

Browse files
jiangyy0824jiangyy0824
authored
Merge pull request #312 from tronprotocol/revert-311-tron_developer
Revert "optimize import files."
2 parents cf2633e + 83fb36d commit d82fd88

27 files changed

+352
-143
lines changed

‎src/main/java/org/tron/common/crypto/ECKey.java‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,28 @@
1818

1919
package org.tron.common.crypto;
2020

21+
import static org.tron.common.utils.BIUtil.isLessThan;
22+
import static org.tron.common.utils.ByteUtil.bigIntegerToBytes;
23+
24+
import java.io.IOException;
25+
import java.io.Serializable;
26+
import java.math.BigInteger;
27+
import java.nio.charset.Charset;
28+
import java.security.InvalidKeyException;
29+
import java.security.KeyPair;
30+
import java.security.KeyPairGenerator;
31+
import java.security.PrivateKey;
32+
import java.security.Provider;
33+
import java.security.PublicKey;
34+
import java.security.SecureRandom;
35+
import java.security.Signature;
36+
import java.security.SignatureException;
37+
import java.security.interfaces.ECPrivateKey;
38+
import java.security.interfaces.ECPublicKey;
39+
import java.security.spec.InvalidKeySpecException;
40+
import java.util.Arrays;
41+
import javax.annotation.Nullable;
42+
import javax.crypto.KeyAgreement;
2143
import org.slf4j.Logger;
2244
import org.slf4j.LoggerFactory;
2345
import org.spongycastle.asn1.ASN1InputStream;
@@ -30,7 +52,11 @@
3052
import org.spongycastle.crypto.digests.SHA256Digest;
3153
import org.spongycastle.crypto.engines.AESFastEngine;
3254
import org.spongycastle.crypto.modes.SICBlockCipher;
33-
import org.spongycastle.crypto.params.*;
55+
import org.spongycastle.crypto.params.ECDomainParameters;
56+
import org.spongycastle.crypto.params.ECPrivateKeyParameters;
57+
import org.spongycastle.crypto.params.ECPublicKeyParameters;
58+
import org.spongycastle.crypto.params.KeyParameter;
59+
import org.spongycastle.crypto.params.ParametersWithIV;
3460
import org.spongycastle.crypto.signers.ECDSASigner;
3561
import org.spongycastle.crypto.signers.HMacDSAKCalculator;
3662
import org.spongycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
@@ -44,24 +70,13 @@
4470
import org.spongycastle.util.BigIntegers;
4571
import org.spongycastle.util.encoders.Base64;
4672
import org.spongycastle.util.encoders.Hex;
47-
import org.tron.common.crypto.jce.*;
73+
import org.tron.common.crypto.jce.ECKeyAgreement;
74+
import org.tron.common.crypto.jce.ECKeyFactory;
75+
import org.tron.common.crypto.jce.ECKeyPairGenerator;
76+
import org.tron.common.crypto.jce.ECSignatureFactory;
77+
import org.tron.common.crypto.jce.TronCastleProvider;
4878
import org.tron.common.utils.ByteUtil;
4979

50-
import javax.annotation.Nullable;
51-
import javax.crypto.KeyAgreement;
52-
import java.io.IOException;
53-
import java.io.Serializable;
54-
import java.math.BigInteger;
55-
import java.nio.charset.Charset;
56-
import java.security.*;
57-
import java.security.interfaces.ECPrivateKey;
58-
import java.security.interfaces.ECPublicKey;
59-
import java.security.spec.InvalidKeySpecException;
60-
import java.util.Arrays;
61-
62-
import static org.tron.common.utils.BIUtil.isLessThan;
63-
import static org.tron.common.utils.ByteUtil.bigIntegerToBytes;
64-
6580
public class ECKey implements Serializable {
6681

6782
/**

‎src/main/java/org/tron/common/crypto/Hash.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,17 @@
1818

1919
package org.tron.common.crypto;
2020

21-
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
23-
import org.tron.common.crypto.jce.TronCastleProvider;
24-
import org.tron.common.utils.ByteArray;
25-
import org.tron.walletserver.WalletApi;
21+
import static java.util.Arrays.copyOfRange;
2622

2723
import java.security.MessageDigest;
2824
import java.security.NoSuchAlgorithmException;
2925
import java.security.Provider;
3026
import java.security.Security;
31-
32-
import static java.util.Arrays.copyOfRange;
27+
import org.slf4j.Logger;
28+
import org.slf4j.LoggerFactory;
29+
import org.tron.common.crypto.jce.TronCastleProvider;
30+
import org.tron.walletserver.WalletApi;
31+
import org.tron.common.utils.ByteArray;
3332

3433
public class Hash {
3534

‎src/main/java/org/tron/common/crypto/Sha256Hash.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
* limitations under the License.
1818
*/
1919

20+
import static com.google.common.base.Preconditions.checkArgument;
21+
2022
import com.google.common.io.ByteStreams;
2123
import com.google.common.primitives.Ints;
2224
import com.google.common.primitives.Longs;
2325
import com.google.protobuf.ByteString;
24-
import org.tron.common.utils.ByteArray;
25-
2626
import java.io.File;
2727
import java.io.FileInputStream;
2828
import java.io.IOException;
@@ -31,8 +31,7 @@
3131
import java.security.MessageDigest;
3232
import java.security.NoSuchAlgorithmException;
3333
import java.util.Arrays;
34-
35-
import static com.google.common.base.Preconditions.checkArgument;
34+
import org.tron.common.utils.ByteArray;
3635

3736

3837
/**

‎src/main/java/org/tron/common/crypto/SymmEncoder.java‎

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

3-
import org.slf4j.Logger;
4-
import org.slf4j.LoggerFactory;
5-
63
import javax.crypto.Cipher;
74
import javax.crypto.SecretKey;
85
import javax.crypto.spec.SecretKeySpec;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
98

109
public class SymmEncoder {
1110

‎src/main/java/org/tron/common/utils/AbiUtil.java‎

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

33
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import org.apache.commons.lang3.StringUtils;
5-
import org.spongycastle.util.encoders.Hex;
6-
import org.tron.common.crypto.Hash;
7-
import org.tron.walletserver.WalletApi;
8-
94
import java.io.IOException;
105
import java.util.ArrayList;
116
import java.util.List;
127
import java.util.regex.Matcher;
138
import java.util.regex.Pattern;
9+
import org.apache.commons.lang3.StringUtils;
10+
import org.spongycastle.util.encoders.Hex;
11+
import org.tron.common.crypto.Hash;
12+
import org.tron.common.utils.ByteUtil;
13+
import org.tron.common.utils.DataWord;
14+
import org.tron.walletserver.WalletApi;
1415

1516
public class AbiUtil {
1617

‎src/main/java/org/tron/common/utils/ByteArrayWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
*/
1919

2020

21-
import org.spongycastle.util.encoders.Hex;
22-
2321
import java.io.Serializable;
2422
import java.util.Arrays;
23+
import org.spongycastle.util.encoders.Hex;
24+
import org.tron.common.utils.FastByteComparisons;
2525

2626

2727
public class ByteArrayWrapper implements Comparable<ByteArrayWrapper>, Serializable {

‎src/main/java/org/tron/common/utils/ByteUtil.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
* along with the ethereumJ library. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818
package org.tron.common.utils;
19-
20-
import org.spongycastle.util.encoders.Hex;
21-
2219
import java.io.ByteArrayOutputStream;
2320
import java.io.IOException;
2421
import java.math.BigInteger;
@@ -29,6 +26,9 @@
2926
import java.util.HashSet;
3027
import java.util.Set;
3128

29+
import org.spongycastle.util.encoders.Hex;
30+
import org.tron.common.utils.ByteArrayWrapper;
31+
3232

3333
public class ByteUtil {
3434

‎src/main/java/org/tron/common/utils/FileUtil.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,21 @@
1717
*/
1818
package org.tron.common.utils;
1919

20-
import java.io.*;
21-
import java.nio.file.*;
20+
import java.io.BufferedReader;
21+
import java.io.BufferedWriter;
22+
import java.io.ByteArrayOutputStream;
23+
import java.io.File;
24+
import java.io.FileInputStream;
25+
import java.io.FileNotFoundException;
26+
import java.io.FileOutputStream;
27+
import java.io.FileReader;
28+
import java.io.FileWriter;
29+
import java.io.IOException;
30+
import java.nio.file.FileVisitResult;
31+
import java.nio.file.FileVisitor;
32+
import java.nio.file.Files;
33+
import java.nio.file.Path;
34+
import java.nio.file.Paths;
2235
import java.nio.file.attribute.BasicFileAttributes;
2336
import java.util.ArrayList;
2437
import java.util.List;

‎src/main/java/org/tron/common/utils/TransactionUtils.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
package org.tron.common.utils;
1717

1818
import com.google.protobuf.ByteString;
19+
import java.security.SignatureException;
20+
import java.util.Arrays;
21+
import java.util.List;
22+
import java.util.Scanner;
1923
import org.slf4j.Logger;
2024
import org.slf4j.LoggerFactory;
2125
import org.tron.common.crypto.ECKey;
2226
import org.tron.common.crypto.ECKey.ECDSASignature;
2327
import org.tron.common.crypto.Sha256Hash;
2428
import org.tron.core.exception.CancelException;
2529
import org.tron.protos.Protocol.Transaction;
26-
27-
import java.security.SignatureException;
28-
import java.util.Arrays;
29-
import java.util.List;
30-
import java.util.Scanner;
30+
import org.tron.protos.Protocol.Transaction.Contract;
3131

3232
public class TransactionUtils {
3333

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

Lines changed: 72 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,91 @@
2020

2121
import com.beust.jcommander.Strings;
2222
import com.google.protobuf.ByteString;
23+
import java.io.Console;
24+
import java.io.IOException;
25+
import java.nio.ByteBuffer;
26+
import java.nio.CharBuffer;
27+
import java.nio.charset.Charset;
28+
import java.security.SecureRandom;
29+
import java.text.ParsePosition;
30+
import java.text.SimpleDateFormat;
31+
import java.util.Arrays;
32+
import java.util.Date;
33+
import java.util.List;
2334
import org.bouncycastle.util.encoders.Hex;
24-
import org.tron.api.GrpcAPI.*;
35+
import org.tron.api.GrpcAPI.AccountNetMessage;
36+
import org.tron.api.GrpcAPI.AccountResourceMessage;
37+
import org.tron.api.GrpcAPI.AssetIssueList;
38+
import org.tron.api.GrpcAPI.BlockExtention;
39+
import org.tron.api.GrpcAPI.BlockList;
40+
import org.tron.api.GrpcAPI.BlockListExtention;
41+
import org.tron.api.GrpcAPI.DelegatedResourceList;
42+
import org.tron.api.GrpcAPI.ExchangeList;
43+
import org.tron.api.GrpcAPI.ProposalList;
44+
import org.tron.api.GrpcAPI.TransactionApprovedList;
45+
import org.tron.api.GrpcAPI.TransactionExtention;
46+
import org.tron.api.GrpcAPI.TransactionList;
47+
import org.tron.api.GrpcAPI.TransactionListExtention;
48+
import org.tron.api.GrpcAPI.TransactionSignWeight;
49+
import org.tron.api.GrpcAPI.WitnessList;
2550
import org.tron.common.crypto.Sha256Hash;
2651
import org.tron.keystore.StringUtils;
27-
import org.tron.protos.Contract.*;
52+
import org.tron.protos.Contract.AccountCreateContract;
53+
import org.tron.protos.Contract.AccountPermissionUpdateContract;
54+
import org.tron.protos.Contract.AccountUpdateContract;
55+
import org.tron.protos.Contract.AssetIssueContract;
2856
import org.tron.protos.Contract.AssetIssueContract.FrozenSupply;
29-
import org.tron.protos.Protocol.*;
57+
import org.tron.protos.Contract.ClearABIContract;
58+
import org.tron.protos.Contract.CreateSmartContract;
59+
import org.tron.protos.Contract.ExchangeCreateContract;
60+
import org.tron.protos.Contract.ExchangeInjectContract;
61+
import org.tron.protos.Contract.ExchangeTransactionContract;
62+
import org.tron.protos.Contract.ExchangeWithdrawContract;
63+
import org.tron.protos.Contract.FreezeBalanceContract;
64+
import org.tron.protos.Contract.ParticipateAssetIssueContract;
65+
import org.tron.protos.Contract.ProposalApproveContract;
66+
import org.tron.protos.Contract.ProposalCreateContract;
67+
import org.tron.protos.Contract.ProposalDeleteContract;
68+
import org.tron.protos.Contract.SetAccountIdContract;
69+
import org.tron.protos.Contract.TransferAssetContract;
70+
import org.tron.protos.Contract.TransferContract;
71+
import org.tron.protos.Contract.TriggerSmartContract;
72+
import org.tron.protos.Contract.UnfreezeAssetContract;
73+
import org.tron.protos.Contract.UnfreezeBalanceContract;
74+
import org.tron.protos.Contract.UpdateAssetContract;
75+
import org.tron.protos.Contract.UpdateEnergyLimitContract;
76+
import org.tron.protos.Contract.UpdateSettingContract;
77+
import org.tron.protos.Contract.VoteAssetContract;
78+
import org.tron.protos.Contract.VoteWitnessContract;
79+
import org.tron.protos.Contract.WithdrawBalanceContract;
80+
import org.tron.protos.Contract.WitnessCreateContract;
81+
import org.tron.protos.Contract.WitnessUpdateContract;
82+
import org.tron.protos.Protocol.Account;
3083
import org.tron.protos.Protocol.Account.AccountResource;
3184
import org.tron.protos.Protocol.Account.Frozen;
85+
import org.tron.protos.Protocol.Block;
86+
import org.tron.protos.Protocol.BlockHeader;
87+
import org.tron.protos.Protocol.ChainParameters;
3288
import org.tron.protos.Protocol.ChainParameters.ChainParameter;
89+
import org.tron.protos.Protocol.DelegatedResource;
90+
import org.tron.protos.Protocol.DelegatedResourceAccountIndex;
91+
import org.tron.protos.Protocol.Exchange;
92+
import org.tron.protos.Protocol.InternalTransaction;
93+
import org.tron.protos.Protocol.Key;
94+
import org.tron.protos.Protocol.Permission;
95+
import org.tron.protos.Protocol.Proposal;
96+
import org.tron.protos.Protocol.ResourceReceipt;
97+
import org.tron.protos.Protocol.SmartContract;
98+
import org.tron.protos.Protocol.Transaction;
3399
import org.tron.protos.Protocol.Transaction.Contract;
34100
import org.tron.protos.Protocol.Transaction.Result;
101+
import org.tron.protos.Protocol.TransactionInfo;
35102
import org.tron.protos.Protocol.TransactionInfo.Log;
36103
import org.tron.protos.Protocol.TransactionInfo.code;
104+
import org.tron.protos.Protocol.Vote;
105+
import org.tron.protos.Protocol.Witness;
37106
import org.tron.walletserver.WalletApi;
38107

39-
import java.io.Console;
40-
import java.io.IOException;
41-
import java.nio.ByteBuffer;
42-
import java.nio.CharBuffer;
43-
import java.nio.charset.Charset;
44-
import java.security.SecureRandom;
45-
import java.text.ParsePosition;
46-
import java.text.SimpleDateFormat;
47-
import java.util.Arrays;
48-
import java.util.Date;
49-
import java.util.List;
50-
51108
public class Utils {
52109

53110
private static SecureRandom random = new SecureRandom();

0 commit comments

Comments
 (0)