Skip to content

Commit b2f830f

Browse files
forfreedayliukai
forfreeday
authored and
liukai
committed
feat(test): remove stest
1 parent 7cbc471 commit b2f830f

555 files changed

Lines changed: 253 additions & 177099 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎framework/src/test/java/org/tron/common/config/args/ArgsTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import org.tron.core.Constant;
1111
import org.tron.core.config.args.Args;
1212

13+
14+
1315
public class ArgsTest {
1416

1517
private static final String dbPath = "output_arg_test";
@@ -43,4 +45,4 @@ public void testConfig() {
4345
Assert.assertEquals(rateLimiter.getHttpMap().size(), 1);
4446
Assert.assertEquals(rateLimiter.getRpcMap().size(), 0);
4547
}
46-
}
48+
}

‎framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.testng.Assert;
1010
import org.tron.common.BaseTest;
1111
import org.tron.common.utils.WalletUtil;
12+
import org.tron.common.utils.client.utils.DataWord;
1213
import org.tron.core.Constant;
1314
import org.tron.core.Wallet;
1415
import org.tron.core.config.args.Args;
@@ -20,7 +21,6 @@
2021
import org.tron.core.vm.repository.RepositoryImpl;
2122
import org.tron.protos.Protocol.AccountType;
2223
import org.tron.protos.Protocol.Transaction;
23-
import stest.tron.wallet.common.client.utils.DataWord;
2424

2525
@Slf4j
2626
public class RuntimeTransferComplexTest extends BaseTest {

‎framework/src/test/java/org/tron/common/runtime/TvmTestUtils.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
import lombok.extern.slf4j.Slf4j;
1111
import org.bouncycastle.util.encoders.Hex;
1212
import org.tron.common.crypto.Hash;
13+
import org.tron.common.utils.PublicMethod;
1314
import org.tron.common.utils.WalletUtil;
15+
import org.tron.common.utils.client.Parameter.CommonConstant;
16+
import org.tron.common.utils.client.WalletClient;
17+
import org.tron.common.utils.client.utils.AbiUtil;
1418
import org.tron.core.Wallet;
1519
import org.tron.core.capsule.BlockCapsule;
1620
import org.tron.core.capsule.TransactionCapsule;
@@ -23,15 +27,12 @@
2327
import org.tron.core.store.StoreFactory;
2428
import org.tron.core.vm.repository.Repository;
2529
import org.tron.core.vm.repository.RepositoryImpl;
30+
2631
import org.tron.protos.Protocol.Transaction;
2732
import org.tron.protos.Protocol.Transaction.Contract.ContractType;
2833
import org.tron.protos.contract.SmartContractOuterClass.CreateSmartContract;
2934
import org.tron.protos.contract.SmartContractOuterClass.SmartContract;
3035
import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract;
31-
import stest.tron.wallet.common.client.Parameter.CommonConstant;
32-
import stest.tron.wallet.common.client.WalletClient;
33-
import stest.tron.wallet.common.client.utils.AbiUtil;
34-
import stest.tron.wallet.common.client.utils.PublicMethed;
3536

3637

3738
/**
@@ -621,7 +622,7 @@ public static CreateSmartContract createSmartContract(byte[] owner, String contr
621622
String abiString, String code, long value, long consumeUserResourcePercent) {
622623
Wallet.setAddressPreFixByte(CommonConstant.ADD_PRE_FIX_BYTE_MAINNET);
623624

624-
SmartContract.ABI abi = PublicMethed.jsonStr2Abi(abiString);
625+
SmartContract.ABI abi = jsonStr2Abi(abiString);
625626
if (abi == null) {
626627
return null;
627628
}

‎framework/src/test/java/org/tron/common/runtime/vm/AllowTvmCompatibleEvmTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
import org.tron.common.runtime.TVMTestResult;
1414
import org.tron.common.runtime.TvmTestUtils;
1515
import org.tron.common.utils.WalletUtil;
16+
import org.tron.common.utils.client.utils.AbiUtil;
1617
import org.tron.core.exception.ContractExeException;
1718
import org.tron.core.exception.ContractValidateException;
1819
import org.tron.core.exception.ReceiptCheckErrException;
1920
import org.tron.core.exception.VMIllegalException;
2021
import org.tron.core.vm.config.ConfigLoader;
2122
import org.tron.core.vm.config.VMConfig;
23+
2224
import org.tron.protos.Protocol;
23-
import stest.tron.wallet.common.client.utils.AbiUtil;
2425

2526
@Slf4j
2627
public class AllowTvmCompatibleEvmTest extends VMTestBase {

‎framework/src/test/java/org/tron/common/runtime/vm/AllowTvmLondonTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
import org.tron.common.runtime.TVMTestResult;
1111
import org.tron.common.runtime.TvmTestUtils;
1212
import org.tron.common.utils.WalletUtil;
13+
import org.tron.common.utils.client.utils.AbiUtil;
1314
import org.tron.core.exception.ContractExeException;
1415
import org.tron.core.exception.ContractValidateException;
1516
import org.tron.core.exception.ReceiptCheckErrException;
1617
import org.tron.core.exception.VMIllegalException;
1718
import org.tron.core.vm.config.ConfigLoader;
1819
import org.tron.core.vm.config.VMConfig;
1920
import org.tron.protos.Protocol;
20-
import stest.tron.wallet.common.client.utils.AbiUtil;
2121

2222
@Slf4j
2323
public class AllowTvmLondonTest extends VMTestBase {

‎framework/src/test/java/org/tron/common/runtime/vm/BatchSendTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.tron.common.utils.ByteArray;
1616
import org.tron.common.utils.StringUtil;
1717
import org.tron.common.utils.Utils;
18+
import org.tron.common.utils.client.utils.AbiUtil;
1819
import org.tron.core.Constant;
1920
import org.tron.core.Wallet;
2021
import org.tron.core.capsule.AccountCapsule;
@@ -27,7 +28,6 @@
2728
import org.tron.core.vm.repository.RepositoryImpl;
2829
import org.tron.protos.Protocol.AccountType;
2930
import org.tron.protos.Protocol.Transaction;
30-
import stest.tron.wallet.common.client.utils.AbiUtil;
3131

3232
@Slf4j
3333
public class BatchSendTest extends BaseTest {

‎framework/src/test/java/org/tron/common/runtime/vm/BatchValidateSignContractTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
import lombok.extern.slf4j.Slf4j;
77
import org.apache.commons.lang3.tuple.Pair;
88
import org.bouncycastle.util.encoders.Hex;
9-
import org.junit.Ignore;
109
import org.junit.Test;
1110
import org.testng.Assert;
1211
import org.tron.common.crypto.ECKey;
1312
import org.tron.common.crypto.Hash;
1413
import org.tron.common.utils.StringUtil;
14+
import org.tron.common.utils.client.utils.AbiUtil;
1515
import org.tron.core.db.TransactionTrace;
1616
import org.tron.core.vm.PrecompiledContracts;
1717
import org.tron.core.vm.PrecompiledContracts.BatchValidateSign;
18-
import stest.tron.wallet.common.client.utils.AbiUtil;
18+
1919

2020
@Slf4j
2121
public class BatchValidateSignContractTest {
@@ -76,7 +76,7 @@ public void staticCallTest() {
7676
Assert.assertEquals(ret.getValue(), new byte[32]);
7777
System.gc(); // force triggering full gc to avoid timeout for next test
7878
}
79-
79+
8080
@Test
8181
public void correctionTest() {
8282
contract.setConstantCall(false);

‎framework/src/test/java/org/tron/common/runtime/vm/Create2Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import org.tron.common.runtime.TvmTestUtils;
1414
import org.tron.common.utils.ByteArray;
1515
import org.tron.common.utils.WalletUtil;
16+
import org.tron.common.utils.client.utils.AbiUtil;
17+
import org.tron.common.utils.client.utils.DataWord;
1618
import org.tron.core.Wallet;
1719
import org.tron.core.exception.ContractExeException;
1820
import org.tron.core.exception.ContractValidateException;
@@ -22,8 +24,6 @@
2224
import org.tron.core.services.NodeInfoService;
2325
import org.tron.core.services.jsonrpc.TronJsonRpcImpl;
2426
import org.tron.protos.Protocol.Transaction;
25-
import stest.tron.wallet.common.client.utils.AbiUtil;
26-
import stest.tron.wallet.common.client.utils.DataWord;
2727

2828
@Slf4j
2929
public class Create2Test extends VMTestBase {

‎framework/src/test/java/org/tron/common/runtime/vm/ExtCodeHashTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import org.tron.common.runtime.TVMTestResult;
1010
import org.tron.common.runtime.TvmTestUtils;
1111
import org.tron.common.utils.WalletUtil;
12+
import org.tron.common.utils.client.utils.AbiUtil;
1213
import org.tron.core.exception.ContractExeException;
1314
import org.tron.core.exception.ContractValidateException;
1415
import org.tron.core.exception.ReceiptCheckErrException;
1516
import org.tron.core.exception.VMIllegalException;
1617
import org.tron.protos.Protocol.Transaction;
17-
import stest.tron.wallet.common.client.utils.AbiUtil;
1818

1919
@Slf4j
2020
public class ExtCodeHashTest extends VMTestBase {

‎framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.tron.common.utils.FileUtil;
2727
import org.tron.common.utils.StringUtil;
2828
import org.tron.common.utils.WalletUtil;
29+
import org.tron.common.utils.client.utils.AbiUtil;
2930
import org.tron.core.Constant;
3031
import org.tron.core.Wallet;
3132
import org.tron.core.capsule.AccountCapsule;
@@ -46,7 +47,6 @@
4647
import org.tron.core.vm.repository.RepositoryImpl;
4748
import org.tron.protos.Protocol;
4849
import org.tron.protos.Protocol.Transaction.Result.contractResult;
49-
import stest.tron.wallet.common.client.utils.AbiUtil;
5050

5151
@Slf4j
5252
public class FreezeTest {

0 commit comments

Comments
 (0)