Skip to content

Commit f02d6bf

Browse files
authored
test(case): remove useless code (#5679)
1 parent ce04da4 commit f02d6bf

File tree

5 files changed

+45
-22
lines changed

5 files changed

+45
-22
lines changed

framework/src/test/java/org/tron/core/db/ManagerTest.java

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -580,14 +580,24 @@ public void pushSwitchFork()
580580
TaposException, ReceiptCheckErrException, TooBigTransactionException,
581581
AccountResourceInsufficientException, EventBloomException {
582582

583-
String key = "f31db24bfbd1a2ef19beddca0a0fa37632eded9ac666a05d3bd925f01dde1f62";
584-
String key2 = "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4";
583+
String key = PublicMethod.getRandomPrivateKey();
584+
String key2 = PublicMethod.getRandomPrivateKey();
585585
byte[] privateKey = ByteArray.fromHexString(key);
586586
final ECKey ecKey = ECKey.fromPrivate(privateKey);
587587
byte[] address = ecKey.getAddress();
588+
589+
ByteString addressByte = ByteString.copyFrom(address);
590+
AccountCapsule accountCapsule =
591+
new AccountCapsule(Protocol.Account.newBuilder()
592+
.setAddress(addressByte).build());
593+
chainManager.getAccountStore()
594+
.put(addressByte.toByteArray(), accountCapsule);
595+
588596
WitnessCapsule sr1 = new WitnessCapsule(
589597
ByteString.copyFrom(address), "www.tron.net/first");
590598
sr1.setVoteCount(1000000000L);
599+
600+
591601
byte[] privateKey2 = ByteArray.fromHexString(key2);
592602
final ECKey ecKey2 = ECKey.fromPrivate(privateKey2);
593603
byte[] address2 = ecKey2.getAddress();
@@ -703,13 +713,23 @@ public void fork()
703713
Args.setParam(new String[]{"--witness"}, Constant.TEST_CONF);
704714
long size = chainManager.getBlockStore().size();
705715
// System.out.print("block store size:" + size + "\n");
706-
String key = "f31db24bfbd1a2ef19beddca0a0fa37632eded9ac666a05d3bd925f01dde1f62";
716+
String key = PublicMethod.getRandomPrivateKey();
707717
byte[] privateKey = ByteArray.fromHexString(key);
708718
final ECKey ecKey = ECKey.fromPrivate(privateKey);
709719
byte[] address = ecKey.getAddress();
720+
721+
ByteString addressByte = ByteString.copyFrom(address);
722+
AccountCapsule accountCapsule =
723+
new AccountCapsule(Protocol.Account.newBuilder()
724+
.setAddress(addressByte).build());
725+
chainManager.getAccountStore()
726+
.put(addressByte.toByteArray(), accountCapsule);
727+
728+
710729
WitnessCapsule witnessCapsule = new WitnessCapsule(ByteString.copyFrom(address));
711730
chainManager.getWitnessScheduleStore().saveActiveWitnesses(new ArrayList<>());
712731
chainManager.addWitness(ByteString.copyFrom(address));
732+
chainManager.getWitnessStore().put(address, witnessCapsule);
713733

714734
Block block = getSignedBlock(witnessCapsule.getAddress(), 1533529947843L, privateKey);
715735

@@ -822,14 +842,20 @@ public void doNotSwitch()
822842
Args.setParam(new String[]{"--witness"}, Constant.TEST_CONF);
823843
long size = chainManager.getBlockStore().size();
824844
System.out.print("block store size:" + size + "\n");
825-
String key = "f31db24bfbd1a2ef19beddca0a0fa37632eded9ac666a05d3bd925f01dde1f62";
845+
String key = PublicMethod.getRandomPrivateKey();
826846
byte[] privateKey = ByteArray.fromHexString(key);
827847
final ECKey ecKey = ECKey.fromPrivate(privateKey);
828848
byte[] address = ecKey.getAddress();
829-
849+
ByteString addressByte = ByteString.copyFrom(address);
850+
AccountCapsule accountCapsule =
851+
new AccountCapsule(Protocol.Account.newBuilder()
852+
.setAddress(addressByte).build());
853+
chainManager.getAccountStore()
854+
.put(addressByte.toByteArray(), accountCapsule);
830855
WitnessCapsule witnessCapsule = new WitnessCapsule(ByteString.copyFrom(address));
831856
chainManager.getWitnessScheduleStore().saveActiveWitnesses(new ArrayList<>());
832857
chainManager.addWitness(ByteString.copyFrom(address));
858+
chainManager.getWitnessStore().put(address, witnessCapsule);
833859

834860
Block block = getSignedBlock(witnessCapsule.getAddress(), 1533529947843L, privateKey);
835861
dbManager.pushBlock(new BlockCapsule(block));
@@ -928,14 +954,22 @@ public void switchBack()
928954
Args.setParam(new String[]{"--witness"}, Constant.TEST_CONF);
929955
long size = chainManager.getBlockStore().size();
930956
System.out.print("block store size:" + size + "\n");
931-
String key = "f31db24bfbd1a2ef19beddca0a0fa37632eded9ac666a05d3bd925f01dde1f62";
957+
String key = PublicMethod.getRandomPrivateKey();;
932958
byte[] privateKey = ByteArray.fromHexString(key);
933959
final ECKey ecKey = ECKey.fromPrivate(privateKey);
934960
byte[] address = ecKey.getAddress();
961+
962+
ByteString addressByte = ByteString.copyFrom(address);
963+
AccountCapsule accountCapsule =
964+
new AccountCapsule(Protocol.Account.newBuilder()
965+
.setAddress(addressByte).build());
966+
chainManager.getAccountStore()
967+
.put(addressByte.toByteArray(), accountCapsule);
968+
935969
WitnessCapsule witnessCapsule = new WitnessCapsule(ByteString.copyFrom(address));
936970
chainManager.getWitnessScheduleStore().saveActiveWitnesses(new ArrayList<>());
937971
chainManager.addWitness(ByteString.copyFrom(address));
938-
972+
chainManager.getWitnessStore().put(address, witnessCapsule);
939973
Block block = getSignedBlock(witnessCapsule.getAddress(), 1533529947843L, privateKey);
940974
dbManager.pushBlock(new BlockCapsule(block));
941975

framework/src/test/java/org/tron/core/db/TransactionStoreTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private VoteWitnessContract getVoteWitnessContract(String address, String votead
112112
public void getTransactionTest() throws BadItemException, ItemNotFoundException {
113113
final BlockStore blockStore = chainBaseManager.getBlockStore();
114114
final TransactionStore trxStore = chainBaseManager.getTransactionStore();
115-
String key = "f31db24bfbd1a2ef19beddca0a0fa37632eded9ac666a05d3bd925f01dde1f62";
115+
String key = PublicMethod.getRandomPrivateKey();;
116116

117117
BlockCapsule blockCapsule =
118118
new BlockCapsule(

framework/src/test/java/org/tron/core/zksnark/NoteEncDecryTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
public class NoteEncDecryTest extends BaseTest {
2424

2525
private static final String FROM_ADDRESS;
26-
private static final String ADDRESS_ONE_PRIVATE_KEY;
2726
private static final long OWNER_BALANCE = 100_000_000;
2827
private static final long FROM_AMOUNT = 110_000_000;
2928
private static final long tokenId = 1;
@@ -42,7 +41,6 @@ public class NoteEncDecryTest extends BaseTest {
4241
static {
4342
Args.setParam(new String[]{"--output-directory", dbPath()}, "config-localtest.conf");
4443
FROM_ADDRESS = Wallet.getAddressPreFixString() + "a7d8a35b260395c14aa456297662092ba3b76fc0";
45-
ADDRESS_ONE_PRIVATE_KEY = "7f7f701e94d4f1dd60ee5205e7ea8ee31121427210417b608a6b2e96433549a7";
4644
}
4745

4846
/**

framework/src/test/java/org/tron/core/zksnark/ShieldedReceiveTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.tron.common.crypto.ECKey;
2626
import org.tron.common.parameter.CommonParameter;
2727
import org.tron.common.utils.ByteArray;
28+
import org.tron.common.utils.PublicMethod;
2829
import org.tron.common.utils.Sha256Hash;
2930
import org.tron.common.utils.client.utils.TransactionUtils;
3031
import org.tron.common.zksnark.IncrementalMerkleTreeContainer;
@@ -124,8 +125,8 @@ public class ShieldedReceiveTest extends BaseTest {
124125

125126
static {
126127
Args.setParam(new String[]{"--output-directory", dbPath()}, "config-localtest.conf");
127-
FROM_ADDRESS = Wallet.getAddressPreFixString() + "a7d8a35b260395c14aa456297662092ba3b76fc0";
128-
ADDRESS_ONE_PRIVATE_KEY = "7f7f701e94d4f1dd60ee5205e7ea8ee31121427210417b608a6b2e96433549a7";
128+
ADDRESS_ONE_PRIVATE_KEY = PublicMethod.getRandomPrivateKey();
129+
FROM_ADDRESS = PublicMethod.getHexAddressByPrivateKey(ADDRESS_ONE_PRIVATE_KEY);;
129130
}
130131

131132
/**

framework/src/test/resources/config-localtest.conf

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,6 @@ genesis.block = {
188188
accountType = "AssetIssue"
189189
address = "TJCnKsPa7y5okkXvQAidZBzqx3QyQ6sxMW"
190190
balance = "25000000000000000"
191-
#priKey = D95611A9AF2A2A45359106222ED1AFED48853D9A44DEFF8DC7913F5CBA727366
192-
#password = 2VYRqa8qKkU1kQYiLtGv7UiFPZpE3v+Nx5E/XLpyc2Y=
193191
},
194192

195193
# the account of payment
@@ -198,8 +196,6 @@ genesis.block = {
198196
accountType = "AssetIssue"
199197
address = "TGehVcNhud84JDCGrNHKVz9jEAVKUpbuiv"
200198
balance = "10000000000000000"
201-
#priKey = cba92a516ea09f620a16ff7ee95ce0df1d56550a8babe9964981a7144c8a784a
202-
#password = y6kqUW6gn2IKFv9+6Vzg3x1WVQqLq+mWSYGnFEyKeEo=
203199
},
204200

205201
# the account of coin burn
@@ -208,8 +204,6 @@ genesis.block = {
208204
accountType = "AssetIssue"
209205
address = "THKrowiEfCe8evdbaBzDDvQjM5DGeB3s3F"
210206
balance = "-9223372036854775808"
211-
#priKey = 8E812436A0E3323166E1F0E8BA79E19E217B2C4A53C970D4CCA0CFB1078979DF
212-
#password = joEkNqDjMjFm4fDounnhniF7LEpTyXDUzKDPsQeJed8=
213207
}
214208
]
215209

@@ -218,27 +212,23 @@ genesis.block = {
218212
address: TN3zfjYUmMFK3ZsHSsrdJoNRtGkQmZLBLz
219213
url = "http://Test.org",
220214
voteCount = 106
221-
#priKey = f4df789d3210ac881cb900464dd30409453044d2777060a0c391cbdf4c6a4f57 6666
222215
},
223216
// {
224217
// address: TPrLL5ckUdMaPNgJYmGv23qtYjBE34aBf8
225218
// url = "http://Mercury.org",
226219
// voteCount = 105
227-
// #priKey = f5583fd20e13073900a513f333ed13db8c9e83e7e3cf37e74adacef96c5afeaa 7777
228220
// },
229221
// {
230222
// address: TEZBh76rouEQpB2zqYVopbRXGx7RfyWorT
231223
// #address: 27TfVERREG3FeWMHEAQ95tWHG4sb3ANn3Qe
232224
// url = "http://Venus.org",
233225
// voteCount = 104
234-
// #priKey = 9f5c5e48bf87cf92017313082e8cf0f58ccfce423097f0fcebf801695fc99bd4 8888
235226
// },
236227
// {
237228
// address: TN27wbfCLEN1gP2PZAxHgU3QZrntsLyxdj
238229
// #address: 27b8RUuyZnNPFNZGct2bZkNu9MnGWNAdH3Z
239230
// url = "http://Earth.org",
240231
// voteCount = 103
241-
// #priKey = 6781f44d9a2083b14fad1702b8e9ba82749162b795e2fc3f136192fc63f80de2 9999
242232
// },
243233
]
244234

0 commit comments

Comments
 (0)