From b9ad5c87c6085fdad36c792de08baac230318038 Mon Sep 17 00:00:00 2001 From: zhao Date: Thu, 26 Feb 2026 01:44:40 +0800 Subject: [PATCH 1/9] fix: resolve flaky unit tests in ApiUtilTest and BaseNetTest - ApiUtilTest: replace Base58 address decoding with raw hex bytes to remove dependency on CommonParameter singleton initialization - BaseNet: add null guards in destroy() to prevent NPE when P2P service fails to start due to port conflicts --- .../java/org/tron/core/jsonrpc/ApiUtilTest.java | 11 +++++++---- .../src/test/java/org/tron/core/net/BaseNet.java | 14 +++++++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/framework/src/test/java/org/tron/core/jsonrpc/ApiUtilTest.java b/framework/src/test/java/org/tron/core/jsonrpc/ApiUtilTest.java index 570e7ed3498..984bae8d81b 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/ApiUtilTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/ApiUtilTest.java @@ -1,6 +1,5 @@ package org.tron.core.jsonrpc; -import static org.tron.common.utils.Commons.decodeFromBase58Check; import static org.tron.keystore.Wallet.generateRandomBytes; import com.google.protobuf.ByteString; @@ -30,9 +29,13 @@ public void testGetBlockID() { @Test public void testTriggerCallContract() { - byte[] address = decodeFromBase58Check("TEPRbQxXQEpHpeEx8tK5xHVs7NWudAAZgu"); - //nile usdt - byte[] contractAddress = decodeFromBase58Check("TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf"); + // Use raw hex bytes to avoid dependency on CommonParameter initialization + // TEPRbQxXQEpHpeEx8tK5xHVs7NWudAAZgu + byte[] address = ByteArray.fromHexString( + "413074ff6d53db268d23bd6013ec5497c8b13400ff"); + // TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf (nile usdt) + byte[] contractAddress = ByteArray.fromHexString( + "41eca9bc828a3005b9a3b909f2cc5c2a54794de05f"); long callValue = 100; //transfer to address TVjsyZ7fYF3qLF6BQgPmTEZy1xrNNyVAAA with 10*10^6 byte[] data = ByteArray.fromHexString("a9059cbb000000000000000000000000d8dd39e2dea27a4000" diff --git a/framework/src/test/java/org/tron/core/net/BaseNet.java b/framework/src/test/java/org/tron/core/net/BaseNet.java index 65771bae952..a6137d95fe0 100644 --- a/framework/src/test/java/org/tron/core/net/BaseNet.java +++ b/framework/src/test/java/org/tron/core/net/BaseNet.java @@ -123,12 +123,16 @@ public static void init() throws Exception { @AfterClass public static void destroy() { - Collection peerConnections = ReflectUtils - .invokeMethod(tronNetDelegate, "getActivePeer"); - for (PeerConnection peer : peerConnections) { - peer.getChannel().close(); + if (tronNetDelegate != null) { + Collection peerConnections = ReflectUtils + .invokeMethod(tronNetDelegate, "getActivePeer"); + for (PeerConnection peer : peerConnections) { + peer.getChannel().close(); + } } Args.clearParam(); - context.destroy(); + if (context != null) { + context.destroy(); + } } } From 9386e257ec89ef0d9016137d7aa5a6ffe2761956 Mon Sep 17 00:00:00 2001 From: zhao Date: Thu, 26 Feb 2026 01:52:20 +0800 Subject: [PATCH 2/9] fix: use random port for P2P listener in BaseNetTest to avoid port conflicts --- framework/src/test/java/org/tron/core/net/BaseNet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/test/java/org/tron/core/net/BaseNet.java b/framework/src/test/java/org/tron/core/net/BaseNet.java index a6137d95fe0..a5c20724c94 100644 --- a/framework/src/test/java/org/tron/core/net/BaseNet.java +++ b/framework/src/test/java/org/tron/core/net/BaseNet.java @@ -44,7 +44,7 @@ public class BaseNet { public static final TemporaryFolder temporaryFolder = new TemporaryFolder(); private static String dbDirectory = "net-database"; private static String indexDirectory = "net-index"; - private static int port = 10000; + private static int port = PublicMethod.chooseRandomPort(); protected static TronApplicationContext context; From 76f0a7f1e37abdc1b5894e0ca485dcdcff2f8203 Mon Sep 17 00:00:00 2001 From: zhao Date: Thu, 26 Feb 2026 02:43:49 +0800 Subject: [PATCH 3/9] revert: restore ApiUtilTest.java to original version The root cause of the flaky test is DecodeUtil.addressPreFixByte being polluted by other tests using testnet config, not the test itself. The proper fix should be in Args.clearParam() to reset the address prefix byte. --- .../test/java/org/tron/core/jsonrpc/ApiUtilTest.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/framework/src/test/java/org/tron/core/jsonrpc/ApiUtilTest.java b/framework/src/test/java/org/tron/core/jsonrpc/ApiUtilTest.java index 984bae8d81b..570e7ed3498 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/ApiUtilTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/ApiUtilTest.java @@ -1,5 +1,6 @@ package org.tron.core.jsonrpc; +import static org.tron.common.utils.Commons.decodeFromBase58Check; import static org.tron.keystore.Wallet.generateRandomBytes; import com.google.protobuf.ByteString; @@ -29,13 +30,9 @@ public void testGetBlockID() { @Test public void testTriggerCallContract() { - // Use raw hex bytes to avoid dependency on CommonParameter initialization - // TEPRbQxXQEpHpeEx8tK5xHVs7NWudAAZgu - byte[] address = ByteArray.fromHexString( - "413074ff6d53db268d23bd6013ec5497c8b13400ff"); - // TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf (nile usdt) - byte[] contractAddress = ByteArray.fromHexString( - "41eca9bc828a3005b9a3b909f2cc5c2a54794de05f"); + byte[] address = decodeFromBase58Check("TEPRbQxXQEpHpeEx8tK5xHVs7NWudAAZgu"); + //nile usdt + byte[] contractAddress = decodeFromBase58Check("TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf"); long callValue = 100; //transfer to address TVjsyZ7fYF3qLF6BQgPmTEZy1xrNNyVAAA with 10*10^6 byte[] data = ByteArray.fromHexString("a9059cbb000000000000000000000000d8dd39e2dea27a4000" From 386400fc84b4dddeda2cbb3bf6544c6fe9ab3321 Mon Sep 17 00:00:00 2001 From: zhao Date: Thu, 26 Feb 2026 13:43:20 +0800 Subject: [PATCH 4/9] refactor: move TEST_CONF to test module and rename TESTNET_CONF to NET_CONF Move test-only constant TEST_CONF from production Constant.java to a new TestConstants class in framework/src/test. Rename TESTNET_CONF to NET_CONF for clarity since config.conf serves all network types. --- common/src/main/java/org/tron/core/Constant.java | 5 +---- .../main/java/org/tron/core/config/args/DynamicArgs.java | 4 ++-- framework/src/main/java/org/tron/program/FullNode.java | 2 +- .../src/main/java/org/tron/program/KeystoreFactory.java | 2 +- .../src/main/java/org/tron/program/SolidityNode.java | 2 +- .../src/test/java/org/tron/common/TestConstants.java | 6 ++++++ .../java/org/tron/common/backup/BackupManagerTest.java | 4 ++-- .../java/org/tron/common/backup/BackupServerTest.java | 4 ++-- .../test/java/org/tron/common/config/args/ArgsTest.java | 4 ++-- .../java/org/tron/common/runtime/InheritanceTest.java | 4 ++-- .../common/runtime/InternalTransactionComplexTest.java | 4 ++-- .../java/org/tron/common/runtime/ProgramResultTest.java | 4 ++-- .../java/org/tron/common/runtime/RuntimeImplTest.java | 4 ++-- .../tron/common/runtime/RuntimeTransferComplexTest.java | 4 ++-- .../java/org/tron/common/runtime/vm/BatchSendTest.java | 4 ++-- .../test/java/org/tron/common/runtime/vm/ChargeTest.java | 4 ++-- .../common/runtime/vm/EnergyWhenAssertStyleTest.java | 4 ++-- .../common/runtime/vm/EnergyWhenRequireStyleTest.java | 4 ++-- .../common/runtime/vm/EnergyWhenSendAndTransferTest.java | 4 ++-- .../common/runtime/vm/EnergyWhenTimeoutStyleTest.java | 4 ++-- .../test/java/org/tron/common/runtime/vm/FreezeTest.java | 4 ++-- .../java/org/tron/common/runtime/vm/FreezeV2Test.java | 4 ++-- .../common/runtime/vm/InternalTransactionCallTest.java | 4 ++-- .../java/org/tron/common/runtime/vm/OperationsTest.java | 3 ++- .../tron/common/runtime/vm/PrecompiledContractsTest.java | 4 ++-- .../java/org/tron/common/runtime/vm/RepositoryTest.java | 4 ++-- .../org/tron/common/runtime/vm/TimeBenchmarkTest.java | 4 ++-- .../tron/common/runtime/vm/TransferToAccountTest.java | 4 ++-- .../org/tron/common/runtime/vm/TransferTokenTest.java | 4 ++-- .../org/tron/common/runtime/vm/VMContractTestBase.java | 3 ++- .../test/java/org/tron/common/runtime/vm/VMTestBase.java | 4 ++-- .../common/runtime/vm/ValidateMultiSignContractTest.java | 4 ++-- .../test/java/org/tron/common/runtime/vm/VoteTest.java | 4 ++-- .../storage/leveldb/LevelDbDataSourceImplTest.java | 4 ++-- .../test/java/org/tron/core/BandwidthProcessorTest.java | 3 ++- framework/src/test/java/org/tron/core/BlockUtilTest.java | 3 ++- .../src/test/java/org/tron/core/EnergyProcessorTest.java | 3 ++- .../src/test/java/org/tron/core/ForkControllerTest.java | 3 ++- .../src/test/java/org/tron/core/ShieldWalletTest.java | 3 ++- framework/src/test/java/org/tron/core/WalletTest.java | 3 ++- .../actuator/AccountPermissionUpdateActuatorTest.java | 4 ++-- .../org/tron/core/actuator/ActuatorConstantTest.java | 4 ++-- .../java/org/tron/core/actuator/ActuatorFactoryTest.java | 4 ++-- .../org/tron/core/actuator/AssetIssueActuatorTest.java | 4 ++-- .../core/actuator/CancelAllUnfreezeV2ActuatorTest.java | 3 ++- .../tron/core/actuator/ClearABIContractActuatorTest.java | 4 ++-- .../tron/core/actuator/CreateAccountActuatorTest.java | 4 ++-- .../tron/core/actuator/DelegateResourceActuatorTest.java | 4 ++-- .../tron/core/actuator/ExchangeCreateActuatorTest.java | 4 ++-- .../tron/core/actuator/ExchangeInjectActuatorTest.java | 4 ++-- .../core/actuator/ExchangeTransactionActuatorTest.java | 4 ++-- .../tron/core/actuator/ExchangeWithdrawActuatorTest.java | 4 ++-- .../tron/core/actuator/FreezeBalanceActuatorTest.java | 3 ++- .../tron/core/actuator/FreezeBalanceV2ActuatorTest.java | 3 ++- .../core/actuator/MarketCancelOrderActuatorTest.java | 4 ++-- .../tron/core/actuator/MarketSellAssetActuatorTest.java | 4 ++-- .../core/actuator/ParticipateAssetIssueActuatorTest.java | 4 ++-- .../tron/core/actuator/ProposalApproveActuatorTest.java | 4 ++-- .../tron/core/actuator/ProposalCreateActuatorTest.java | 4 ++-- .../tron/core/actuator/ProposalDeleteActuatorTest.java | 4 ++-- .../org/tron/core/actuator/SetAccountIdActuatorTest.java | 4 ++-- .../tron/core/actuator/ShieldedTransferActuatorTest.java | 4 ++-- .../org/tron/core/actuator/TransferActuatorTest.java | 4 ++-- .../tron/core/actuator/TransferAssetActuatorTest.java | 4 ++-- .../core/actuator/UnDelegateResourceActuatorTest.java | 4 ++-- .../tron/core/actuator/UnfreezeAssetActuatorTest.java | 4 ++-- .../tron/core/actuator/UnfreezeBalanceActuatorTest.java | 4 ++-- .../core/actuator/UnfreezeBalanceV2ActuatorTest.java | 4 ++-- .../tron/core/actuator/UpdateAccountActuatorTest.java | 4 ++-- .../org/tron/core/actuator/UpdateAssetActuatorTest.java | 4 ++-- .../tron/core/actuator/UpdateBrokerageActuatorTest.java | 4 ++-- .../actuator/UpdateEnergyLimitContractActuatorTest.java | 4 ++-- .../core/actuator/UpdateSettingContractActuatorTest.java | 4 ++-- .../org/tron/core/actuator/VoteWitnessActuatorTest.java | 4 ++-- .../tron/core/actuator/WithdrawBalanceActuatorTest.java | 4 ++-- .../actuator/WithdrawExpireUnfreezeActuatorTest.java | 4 ++-- .../tron/core/actuator/WitnessCreateActuatorTest.java | 4 ++-- .../tron/core/actuator/WitnessUpdateActuatorTest.java | 4 ++-- .../org/tron/core/actuator/utils/ProposalUtilTest.java | 3 ++- .../tron/core/actuator/utils/TransactionUtilTest.java | 3 ++- .../tron/core/actuator/vm/ProgramTraceListenerTest.java | 4 ++-- .../java/org/tron/core/actuator/vm/ProgramTraceTest.java | 4 ++-- .../java/org/tron/core/capsule/AccountCapsuleTest.java | 4 ++-- .../java/org/tron/core/capsule/BlockCapsuleTest.java | 3 ++- .../java/org/tron/core/capsule/ExchangeCapsuleTest.java | 4 ++-- .../org/tron/core/capsule/TransactionCapsuleTest.java | 4 ++-- .../java/org/tron/core/capsule/VotesCapsuleTest.java | 4 ++-- .../java/org/tron/core/capsule/utils/AssetUtilTest.java | 4 ++-- .../tron/core/capsule/utils/ExchangeProcessorTest.java | 4 ++-- .../java/org/tron/core/config/ConfigurationTest.java | 6 +++--- .../test/java/org/tron/core/config/args/ArgsTest.java | 9 +++++---- .../java/org/tron/core/config/args/DynamicArgsTest.java | 5 +++-- .../java/org/tron/core/consensus/DposServiceTest.java | 4 ++-- .../src/test/java/org/tron/core/db/AbiStoreTest.java | 4 ++-- .../java/org/tron/core/db/AccountAssetStoreTest.java | 4 ++-- .../java/org/tron/core/db/AccountIdIndexStoreTest.java | 4 ++-- .../java/org/tron/core/db/AccountIndexStoreTest.java | 4 ++-- .../src/test/java/org/tron/core/db/AccountStoreTest.java | 4 ++-- .../java/org/tron/core/db/AccountTraceStoreTest.java | 4 ++-- .../test/java/org/tron/core/db/AssetIssueStoreTest.java | 4 ++-- .../java/org/tron/core/db/AssetIssueV2StoreTest.java | 4 ++-- .../java/org/tron/core/db/BalanceTraceStoreTest.java | 4 ++-- .../tron/core/db/BandwidthPriceHistoryLoaderTest.java | 4 ++-- .../test/java/org/tron/core/db/BlockIndexStoreTest.java | 4 ++-- .../src/test/java/org/tron/core/db/BlockStoreTest.java | 4 ++-- .../src/test/java/org/tron/core/db/CodeStoreTest.java | 4 ++-- .../test/java/org/tron/core/db/ContractStoreTest.java | 4 ++-- .../core/db/DelegatedResourceAccountIndexStoreTest.java | 4 ++-- .../org/tron/core/db/DelegatedResourceStoreTest.java | 4 ++-- .../test/java/org/tron/core/db/DelegationStoreTest.java | 4 ++-- .../org/tron/core/db/EnergyPriceHistoryLoaderTest.java | 4 ++-- .../test/java/org/tron/core/db/ExchangeStoreTest.java | 4 ++-- .../test/java/org/tron/core/db/ExchangeV2StoreTest.java | 4 ++-- .../org/tron/core/db/IncrementalMerkleTreeStoreTest.java | 4 ++-- .../test/java/org/tron/core/db/KhaosDatabaseTest.java | 4 ++-- .../src/test/java/org/tron/core/db/ManagerTest.java | 9 +++++---- .../java/org/tron/core/db/MarketAccountStoreTest.java | 4 ++-- .../test/java/org/tron/core/db/MarketOrderStoreTest.java | 4 ++-- .../tron/core/db/MarketPairPriceToOrderStoreTest.java | 4 ++-- .../org/tron/core/db/MarketPairToPriceStoreTest.java | 4 ++-- .../test/java/org/tron/core/db/NullifierStoreTest.java | 4 ++-- .../test/java/org/tron/core/db/ProposalStoreTest.java | 4 ++-- .../test/java/org/tron/core/db/RecentBlockStoreTest.java | 4 ++-- .../org/tron/core/db/RecentTransactionStoreTest.java | 4 ++-- .../java/org/tron/core/db/TransactionExpireTest.java | 4 ++-- .../java/org/tron/core/db/TransactionHistoryTest.java | 4 ++-- .../java/org/tron/core/db/TransactionRetStoreTest.java | 4 ++-- .../test/java/org/tron/core/db/TransactionStoreTest.java | 4 ++-- .../java/org/tron/core/db/TreeBlockIndexStoreTest.java | 4 ++-- .../src/test/java/org/tron/core/db/TronDatabaseTest.java | 4 ++-- .../test/java/org/tron/core/db/TxCacheDBInitTest.java | 4 ++-- .../src/test/java/org/tron/core/db/TxCacheDBTest.java | 4 ++-- .../src/test/java/org/tron/core/db/VotesStoreTest.java | 4 ++-- .../java/org/tron/core/db/WitnessScheduleStoreTest.java | 4 ++-- .../src/test/java/org/tron/core/db/WitnessStoreTest.java | 4 ++-- .../src/test/java/org/tron/core/db/ZKProofStoreTest.java | 4 ++-- .../src/test/java/org/tron/core/db2/ChainbaseTest.java | 4 ++-- .../test/java/org/tron/core/db2/CheckpointV2Test.java | 4 ++-- .../tron/core/db2/RevokingDbWithCacheNewValueTest.java | 4 ++-- .../test/java/org/tron/core/db2/SnapshotImplTest.java | 4 ++-- .../test/java/org/tron/core/db2/SnapshotManagerTest.java | 4 ++-- .../test/java/org/tron/core/db2/SnapshotRootTest.java | 4 ++-- .../test/java/org/tron/core/event/BlockEventGetTest.java | 4 ++-- .../test/java/org/tron/core/exception/TronErrorTest.java | 5 +++-- .../java/org/tron/core/jsonrpc/BuildTransactionTest.java | 4 ++-- .../java/org/tron/core/jsonrpc/JsonrpcServiceTest.java | 4 ++-- .../org/tron/core/jsonrpc/SectionBloomStoreTest.java | 4 ++-- .../java/org/tron/core/jsonrpc/WalletCursorTest.java | 4 ++-- .../org/tron/core/metrics/MetricsApiServiceTest.java | 6 +++--- .../metrics/prometheus/PrometheusApiServiceTest.java | 4 ++-- framework/src/test/java/org/tron/core/net/NodeTest.java | 4 ++-- .../java/org/tron/core/net/P2pEventHandlerImplTest.java | 4 ++-- .../test/java/org/tron/core/net/TronNetDelegateTest.java | 4 ++-- .../core/net/messagehandler/BlockMsgHandlerTest.java | 3 ++- .../core/net/messagehandler/InventoryMsgHandlerTest.java | 4 ++-- .../tron/core/net/messagehandler/MessageHandlerTest.java | 4 ++-- .../tron/core/net/messagehandler/PbftMsgHandlerTest.java | 4 ++-- .../net/messagehandler/SyncBlockChainMsgHandlerTest.java | 4 ++-- .../net/messagehandler/TransactionsMsgHandlerTest.java | 4 ++-- .../java/org/tron/core/net/peer/PeerStatusCheckTest.java | 4 ++-- .../java/org/tron/core/net/services/AdvServiceTest.java | 4 ++-- .../core/net/services/EffectiveCheckServiceTest.java | 4 ++-- .../org/tron/core/net/services/HandShakeServiceTest.java | 4 ++-- .../org/tron/core/net/services/RelayServiceTest.java | 4 ++-- .../tron/core/net/services/ResilienceServiceTest.java | 4 ++-- .../java/org/tron/core/net/services/SyncServiceTest.java | 4 ++-- .../src/test/java/org/tron/core/pbft/PbftApiTest.java | 4 ++-- .../java/org/tron/core/services/ComputeRewardTest.java | 4 ++-- .../java/org/tron/core/services/ProposalServiceTest.java | 4 ++-- .../java/org/tron/core/services/RpcApiServicesTest.java | 4 ++-- .../test/java/org/tron/core/services/WalletApiTest.java | 4 ++-- .../core/services/filter/HttpApiAccessFilterTest.java | 4 ++-- .../services/filter/LiteFnQueryGrpcInterceptorTest.java | 4 ++-- .../core/services/filter/LiteFnQueryHttpFilterTest.java | 4 ++-- .../services/filter/RpcApiAccessInterceptorTest.java | 4 ++-- .../org/tron/core/services/http/ClearABIServletTest.java | 4 ++-- .../core/services/http/CreateAccountServletTest.java | 4 ++-- .../core/services/http/CreateAssetIssueServletTest.java | 4 ++-- .../services/http/CreateSpendAuthSigServletTest.java | 4 ++-- .../core/services/http/CreateWitnessServletTest.java | 4 ++-- .../core/services/http/GetAccountByIdServletTest.java | 4 ++-- .../core/services/http/GetAssetIssueListServletTest.java | 4 ++-- .../services/http/GetBandwidthPricesServletTest.java | 4 ++-- .../tron/core/services/http/GetBlockByIdServletTest.java | 4 ++-- .../core/services/http/GetBlockByNumServletTest.java | 4 ++-- .../tron/core/services/http/GetBrokerageServletTest.java | 4 ++-- .../core/services/http/GetEnergyPricesServletTest.java | 4 ++-- .../core/services/http/GetMemoFeePricesServletTest.java | 4 ++-- .../tron/core/services/http/GetNowBlockServletTest.java | 4 ++-- .../tron/core/services/http/GetRewardServletTest.java | 4 ++-- .../http/GetTransactionInfoByBlockNumServletTest.java | 4 ++-- .../services/http/GetTransactionInfoByIdServletTest.java | 4 ++-- .../http/GetTransactionListFromPendingServletTest.java | 4 ++-- .../tron/core/services/http/ListNodesServletTest.java | 4 ++-- .../core/services/http/ListProposalsServletTest.java | 4 ++-- .../services/http/TriggerSmartContractServletTest.java | 4 ++-- .../core/services/http/UpdateAccountServletTest.java | 4 ++-- .../test/java/org/tron/core/services/http/UtilTest.java | 4 ++-- .../http/GetBandwidthPricesOnPBFTServletTest.java | 4 ++-- .../http/GetEnergyPricesOnPBFTServletTest.java | 4 ++-- .../http/GetBandwidthPricesOnSolidityServletTest.java | 4 ++-- .../http/GetEnergyPricesOnSolidityServletTest.java | 4 ++-- .../org/tron/core/services/jsonrpc/BlockResultTest.java | 4 ++-- .../tron/core/services/jsonrpc/BuildArgumentsTest.java | 4 ++-- .../tron/core/services/jsonrpc/CallArgumentsTest.java | 4 ++-- .../core/services/jsonrpc/TransactionReceiptTest.java | 4 ++-- .../core/services/jsonrpc/TransactionResultTest.java | 4 ++-- .../core/services/ratelimiter/GlobalRateLimiterTest.java | 2 +- .../tron/core/services/stop/ConditionallyStopTest.java | 4 ++-- .../org/tron/core/witness/ProposalControllerTest.java | 4 ++-- .../org/tron/core/witness/WitnessControllerTest.java | 4 ++-- .../java/org/tron/core/zksnark/MerkleContainerTest.java | 4 ++-- .../java/org/tron/program/AccountVoteWitnessTest.java | 4 ++-- .../src/test/java/org/tron/program/SolidityNodeTest.java | 4 ++-- .../src/test/java/org/tron/program/SupplementTest.java | 4 ++-- 215 files changed, 439 insertions(+), 417 deletions(-) create mode 100644 framework/src/test/java/org/tron/common/TestConstants.java diff --git a/common/src/main/java/org/tron/core/Constant.java b/common/src/main/java/org/tron/core/Constant.java index c5a8a02fb4e..4b8bed8fa28 100644 --- a/common/src/main/java/org/tron/core/Constant.java +++ b/common/src/main/java/org/tron/core/Constant.java @@ -3,10 +3,7 @@ public class Constant { //config for testnet, mainnet, beta - public static final String TESTNET_CONF = "config.conf"; - - //config for junit test - public static final String TEST_CONF = "config-test.conf"; + public static final String NET_CONF = "config.conf"; // locate in storageDbDirectory, store the db infos, // now only has the split block number diff --git a/framework/src/main/java/org/tron/core/config/args/DynamicArgs.java b/framework/src/main/java/org/tron/core/config/args/DynamicArgs.java index 557b8f1211b..db768583275 100644 --- a/framework/src/main/java/org/tron/core/config/args/DynamicArgs.java +++ b/framework/src/main/java/org/tron/core/config/args/DynamicArgs.java @@ -67,7 +67,7 @@ private File getConfigFile() { if (isNoneBlank(parameter.getShellConfFileName())) { confFilePath = parameter.getShellConfFileName(); } else { - confFilePath = Constant.TESTNET_CONF; + confFilePath = Constant.NET_CONF; } File confFile = new File(confFilePath); @@ -81,7 +81,7 @@ private File getConfigFile() { public void reload() { logger.debug("Reloading ... "); Config config = Configuration.getByFileName(parameter.getShellConfFileName(), - Constant.TESTNET_CONF); + Constant.NET_CONF); updateActiveNodes(config); diff --git a/framework/src/main/java/org/tron/program/FullNode.java b/framework/src/main/java/org/tron/program/FullNode.java index bd275de544c..8c25c67f5eb 100644 --- a/framework/src/main/java/org/tron/program/FullNode.java +++ b/framework/src/main/java/org/tron/program/FullNode.java @@ -22,7 +22,7 @@ public class FullNode { public static void main(String[] args) { ExitManager.initExceptionHandler(); logger.info("Full node running."); - Args.setParam(args, Constant.TESTNET_CONF); + Args.setParam(args, Constant.NET_CONF); CommonParameter parameter = Args.getInstance(); LogService.load(parameter.getLogbackPath()); diff --git a/framework/src/main/java/org/tron/program/KeystoreFactory.java b/framework/src/main/java/org/tron/program/KeystoreFactory.java index bfd2df22856..dfc4ced3ebc 100755 --- a/framework/src/main/java/org/tron/program/KeystoreFactory.java +++ b/framework/src/main/java/org/tron/program/KeystoreFactory.java @@ -23,7 +23,7 @@ public class KeystoreFactory { private static final String FilePath = "Wallet"; public static void main(String[] args) { - Args.setParam(args, Constant.TESTNET_CONF); + Args.setParam(args, Constant.NET_CONF); KeystoreFactory cli = new KeystoreFactory(); JCommander.newBuilder() diff --git a/framework/src/main/java/org/tron/program/SolidityNode.java b/framework/src/main/java/org/tron/program/SolidityNode.java index b774ab03aaa..659c48f85e9 100644 --- a/framework/src/main/java/org/tron/program/SolidityNode.java +++ b/framework/src/main/java/org/tron/program/SolidityNode.java @@ -58,7 +58,7 @@ public SolidityNode(Manager dbManager) { public static void main(String[] args) { ExitManager.initExceptionHandler(); logger.info("Solidity node is running."); - Args.setParam(args, Constant.TESTNET_CONF); + Args.setParam(args, Constant.NET_CONF); CommonParameter parameter = CommonParameter.getInstance(); logger.info("index switch is {}", diff --git a/framework/src/test/java/org/tron/common/TestConstants.java b/framework/src/test/java/org/tron/common/TestConstants.java new file mode 100644 index 00000000000..b7b8beb061c --- /dev/null +++ b/framework/src/test/java/org/tron/common/TestConstants.java @@ -0,0 +1,6 @@ +package org.tron.common; + +public class TestConstants { + + public static final String TEST_CONF = "config-test.conf"; +} diff --git a/framework/src/test/java/org/tron/common/backup/BackupManagerTest.java b/framework/src/test/java/org/tron/common/backup/BackupManagerTest.java index 9ace8f5b601..ced13b3f265 100644 --- a/framework/src/test/java/org/tron/common/backup/BackupManagerTest.java +++ b/framework/src/test/java/org/tron/common/backup/BackupManagerTest.java @@ -18,8 +18,8 @@ import org.tron.common.backup.socket.UdpEvent; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.PublicMethod; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class BackupManagerTest { @@ -30,7 +30,7 @@ public class BackupManagerTest { @Before public void setUp() throws Exception { - Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); CommonParameter.getInstance().setBackupPort(PublicMethod.chooseRandomPort()); manager = new BackupManager(); backupServer = new BackupServer(manager); diff --git a/framework/src/test/java/org/tron/common/backup/BackupServerTest.java b/framework/src/test/java/org/tron/common/backup/BackupServerTest.java index c40aca7e17a..3e742f9594c 100644 --- a/framework/src/test/java/org/tron/common/backup/BackupServerTest.java +++ b/framework/src/test/java/org/tron/common/backup/BackupServerTest.java @@ -10,8 +10,8 @@ import org.junit.rules.Timeout; import org.tron.common.backup.socket.BackupServer; import org.tron.common.parameter.CommonParameter; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class BackupServerTest { @@ -25,7 +25,7 @@ public class BackupServerTest { @Before public void setUp() throws Exception { - Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); CommonParameter.getInstance().setBackupPort(80); List members = new ArrayList<>(); members.add("127.0.0.2"); diff --git a/framework/src/test/java/org/tron/common/config/args/ArgsTest.java b/framework/src/test/java/org/tron/common/config/args/ArgsTest.java index 01a49f6df40..27b2806397e 100644 --- a/framework/src/test/java/org/tron/common/config/args/ArgsTest.java +++ b/framework/src/test/java/org/tron/common/config/args/ArgsTest.java @@ -11,8 +11,8 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.tron.common.parameter.RateLimiterInitialization; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class ArgsTest { @@ -23,7 +23,7 @@ public class ArgsTest { public void init() throws IOException { Args.setParam(new String[] {"--output-directory", temporaryFolder.newFolder().toString(), "--p2p-disable", "true", - "--debug"}, Constant.TEST_CONF); + "--debug"}, TestConstants.TEST_CONF); } @After diff --git a/framework/src/test/java/org/tron/common/runtime/InheritanceTest.java b/framework/src/test/java/org/tron/common/runtime/InheritanceTest.java index 4b57bc880d7..ba75555f2db 100644 --- a/framework/src/test/java/org/tron/common/runtime/InheritanceTest.java +++ b/framework/src/test/java/org/tron/common/runtime/InheritanceTest.java @@ -6,7 +6,6 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.ContractExeException; @@ -16,6 +15,7 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j public class InheritanceTest extends BaseTest { @@ -25,7 +25,7 @@ public class InheritanceTest extends BaseTest { private static boolean init; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java b/framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java index 172ef40afa7..584d2d94be1 100644 --- a/framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java +++ b/framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java @@ -7,7 +7,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.runtime.vm.DataWord; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.ContractExeException; @@ -17,6 +16,7 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j public class InternalTransactionComplexTest extends BaseTest { @@ -28,7 +28,7 @@ public class InternalTransactionComplexTest extends BaseTest { static { Args.setParam(new String[]{"--output-directory", dbPath(), "--debug", "--support-constant"}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java b/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java index a2e53dd8711..a0c044c97a5 100644 --- a/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java +++ b/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java @@ -14,7 +14,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.runtime.vm.DataWord; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.TransactionCapsule; @@ -32,6 +31,7 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; import org.tron.protos.Protocol.Transaction.Result.contractResult; +import org.tron.common.TestConstants; @Slf4j @@ -45,7 +45,7 @@ public class ProgramResultTest extends BaseTest { static { Args.setParam(new String[]{"--output-directory", dbPath(), "--debug", "--support-constant"}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; TRANSFER_TO = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/RuntimeImplTest.java b/framework/src/test/java/org/tron/common/runtime/RuntimeImplTest.java index 0b7721a325d..a57ae255647 100644 --- a/framework/src/test/java/org/tron/common/runtime/RuntimeImplTest.java +++ b/framework/src/test/java/org/tron/common/runtime/RuntimeImplTest.java @@ -9,7 +9,6 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.actuator.VMActuator; import org.tron.core.capsule.AccountCapsule; @@ -27,6 +26,7 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract; +import org.tron.common.TestConstants; @Slf4j @@ -40,7 +40,7 @@ public class RuntimeImplTest extends BaseTest { private final long creatorTotalBalance = 3_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); callerAddress = Hex .decode(Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"); creatorAddress = Hex diff --git a/framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java b/framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java index c9d61db9270..77cf557d421 100644 --- a/framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java +++ b/framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java @@ -10,7 +10,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.WalletUtil; import org.tron.common.utils.client.utils.DataWord; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.ContractExeException; @@ -21,6 +20,7 @@ import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; +import org.tron.common.TestConstants; @Slf4j public class RuntimeTransferComplexTest extends BaseTest { @@ -32,7 +32,7 @@ public class RuntimeTransferComplexTest extends BaseTest { private static boolean init; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; TRANSFER_TO = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/BatchSendTest.java b/framework/src/test/java/org/tron/common/runtime/vm/BatchSendTest.java index cf67ae4b087..91337e1b87d 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/BatchSendTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/BatchSendTest.java @@ -16,7 +16,6 @@ import org.tron.common.utils.StringUtil; import org.tron.common.utils.Utils; import org.tron.common.utils.client.utils.AbiUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; @@ -28,6 +27,7 @@ import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; +import org.tron.common.TestConstants; @Slf4j public class BatchSendTest extends BaseTest { @@ -39,7 +39,7 @@ public class BatchSendTest extends BaseTest { private static final AccountCapsule ownerCapsule; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; TRANSFER_TO = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; diff --git a/framework/src/test/java/org/tron/common/runtime/vm/ChargeTest.java b/framework/src/test/java/org/tron/common/runtime/vm/ChargeTest.java index c158b2e400f..7002572a6df 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/ChargeTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/ChargeTest.java @@ -8,7 +8,6 @@ import org.tron.common.BaseTest; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.ContractExeException; @@ -18,6 +17,7 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j public class ChargeTest extends BaseTest { @@ -27,7 +27,7 @@ public class ChargeTest extends BaseTest { private long totalBalance = 100_000_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenAssertStyleTest.java b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenAssertStyleTest.java index 8b985d4bb1d..df30acdbd31 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenAssertStyleTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenAssertStyleTest.java @@ -8,7 +8,6 @@ import org.tron.common.BaseTest; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.ContractExeException; @@ -21,6 +20,7 @@ import org.tron.core.vm.program.Program.PrecompiledContractException; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j @@ -32,7 +32,7 @@ public class EnergyWhenAssertStyleTest extends BaseTest { private long totalBalance = 30_000_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenRequireStyleTest.java b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenRequireStyleTest.java index 19231b225f1..686c4d65559 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenRequireStyleTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenRequireStyleTest.java @@ -8,7 +8,6 @@ import org.tron.common.BaseTest; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.ContractExeException; @@ -19,6 +18,7 @@ import org.tron.core.vm.program.Program.OutOfEnergyException; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j public class EnergyWhenRequireStyleTest extends BaseTest { @@ -28,7 +28,7 @@ public class EnergyWhenRequireStyleTest extends BaseTest { private long totalBalance = 30_000_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenSendAndTransferTest.java b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenSendAndTransferTest.java index 009b332324b..01c8766f1ce 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenSendAndTransferTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenSendAndTransferTest.java @@ -8,7 +8,6 @@ import org.tron.common.BaseTest; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.ContractExeException; @@ -18,6 +17,7 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j public class EnergyWhenSendAndTransferTest extends BaseTest { @@ -27,7 +27,7 @@ public class EnergyWhenSendAndTransferTest extends BaseTest { private long totalBalance = 30_000_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenTimeoutStyleTest.java b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenTimeoutStyleTest.java index 2559b43a020..511ae68e881 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenTimeoutStyleTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenTimeoutStyleTest.java @@ -8,7 +8,6 @@ import org.tron.common.BaseTest; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.ContractExeException; @@ -20,6 +19,7 @@ import org.tron.core.vm.program.Program.OutOfTimeException; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j public class EnergyWhenTimeoutStyleTest extends BaseTest { @@ -30,7 +30,7 @@ public class EnergyWhenTimeoutStyleTest extends BaseTest { static { Args.setParam(new String[]{"--output-directory", dbPath()}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java b/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java index e1459637e19..39af7089dca 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java @@ -27,7 +27,6 @@ import org.tron.common.utils.StringUtil; import org.tron.common.utils.WalletUtil; import org.tron.common.utils.client.utils.AbiUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.DelegatedResourceCapsule; @@ -47,6 +46,7 @@ import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol; import org.tron.protos.Protocol.Transaction.Result.contractResult; +import org.tron.common.TestConstants; @Slf4j public class FreezeTest { @@ -131,7 +131,7 @@ public class FreezeTest { @Before public void init() throws Exception { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); manager = context.getBean(Manager.class); owner = Hex.decode(Wallet.getAddressPreFixString() diff --git a/framework/src/test/java/org/tron/common/runtime/vm/FreezeV2Test.java b/framework/src/test/java/org/tron/common/runtime/vm/FreezeV2Test.java index 907398f163b..2e899496d46 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/FreezeV2Test.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/FreezeV2Test.java @@ -34,7 +34,6 @@ import org.tron.common.utils.WalletUtil; import org.tron.common.utils.client.utils.AbiUtil; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.actuator.UnfreezeBalanceV2Actuator; import org.tron.core.capsule.AccountCapsule; @@ -58,6 +57,7 @@ import org.tron.protos.Protocol; import org.tron.protos.Protocol.Transaction.Result.contractResult; import org.tron.protos.contract.Common; +import org.tron.common.TestConstants; @Slf4j public class FreezeV2Test { @@ -168,7 +168,7 @@ public class FreezeV2Test { @Before public void init() throws Exception { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); manager = context.getBean(Manager.class); owner = Hex.decode(Wallet.getAddressPreFixString() diff --git a/framework/src/test/java/org/tron/common/runtime/vm/InternalTransactionCallTest.java b/framework/src/test/java/org/tron/common/runtime/vm/InternalTransactionCallTest.java index 75a8f32186c..15beede0127 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/InternalTransactionCallTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/InternalTransactionCallTest.java @@ -14,7 +14,6 @@ import org.tron.common.application.TronApplicationContext; import org.tron.common.runtime.Runtime; import org.tron.common.runtime.TvmTestUtils; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; @@ -26,6 +25,7 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j public class InternalTransactionCallTest { @@ -47,7 +47,7 @@ public void init() throws IOException { Args.clearParam(); Args.setParam(new String[]{"--output-directory", temporaryFolder.newFolder().toString(), "--support-constant", "--debug"}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); AppT = ApplicationFactory.create(context); diff --git a/framework/src/test/java/org/tron/common/runtime/vm/OperationsTest.java b/framework/src/test/java/org/tron/common/runtime/vm/OperationsTest.java index 3315005b7d2..f2987096d4e 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/OperationsTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/OperationsTest.java @@ -33,6 +33,7 @@ import org.tron.core.vm.program.Program; import org.tron.core.vm.program.invoke.ProgramInvokeMockImpl; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j public class OperationsTest extends BaseTest { @@ -43,7 +44,7 @@ public class OperationsTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); CommonParameter.getInstance().setDebug(true); VMConfig.initAllowTvmTransferTrc10(1); VMConfig.initAllowTvmConstantinople(1); diff --git a/framework/src/test/java/org/tron/common/runtime/vm/PrecompiledContractsTest.java b/framework/src/test/java/org/tron/common/runtime/vm/PrecompiledContractsTest.java index dce2cc7d105..030b5be95f6 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/PrecompiledContractsTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/PrecompiledContractsTest.java @@ -21,7 +21,6 @@ import org.tron.common.utils.ByteUtil; import org.tron.common.utils.Commons; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.actuator.FreezeBalanceActuator; import org.tron.core.capsule.AccountCapsule; @@ -45,6 +44,7 @@ import org.tron.protos.Protocol.Proposal.State; import org.tron.protos.contract.BalanceContract.FreezeBalanceContract; import org.tron.protos.contract.Common; +import org.tron.common.TestConstants; @Slf4j public class PrecompiledContractsTest extends BaseTest { @@ -106,7 +106,7 @@ public class PrecompiledContractsTest extends BaseTest { private static final long latestTimestamp = 1_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; WITNESS_ADDRESS = Wallet.getAddressPreFixString() + WITNESS_ADDRESS_BASE; diff --git a/framework/src/test/java/org/tron/common/runtime/vm/RepositoryTest.java b/framework/src/test/java/org/tron/common/runtime/vm/RepositoryTest.java index 5c38ed90a3c..79cc96fe2db 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/RepositoryTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/RepositoryTest.java @@ -13,7 +13,6 @@ import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; import org.tron.common.utils.WalletUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.Parameter.ForkBlockVersionConsts; import org.tron.core.config.args.Args; @@ -26,6 +25,7 @@ import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; +import org.tron.common.TestConstants; @Slf4j public class RepositoryTest extends BaseTest { @@ -34,7 +34,7 @@ public class RepositoryTest extends BaseTest { private Repository rootRepository; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/TimeBenchmarkTest.java b/framework/src/test/java/org/tron/common/runtime/vm/TimeBenchmarkTest.java index 8104a689cfa..49fe6c735ee 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/TimeBenchmarkTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/TimeBenchmarkTest.java @@ -9,7 +9,6 @@ import org.tron.common.BaseTest; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.ContractExeException; @@ -19,6 +18,7 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j @Ignore @@ -29,7 +29,7 @@ public class TimeBenchmarkTest extends BaseTest { private long totalBalance = 30_000_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java b/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java index ede47555f3f..85516cfc65b 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java @@ -16,7 +16,6 @@ import org.tron.common.utils.Utils; import org.tron.common.utils.client.utils.AbiUtil; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.actuator.VMActuator; import org.tron.core.capsule.AccountCapsule; @@ -35,6 +34,7 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; +import org.tron.common.TestConstants; @Slf4j public class TransferToAccountTest extends BaseTest { @@ -54,7 +54,7 @@ public class TransferToAccountTest extends BaseTest { private static AccountCapsule ownerCapsule; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; TRANSFER_TO = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/TransferTokenTest.java b/framework/src/test/java/org/tron/common/runtime/vm/TransferTokenTest.java index 0509cad1dc7..efe612c8f0f 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/TransferTokenTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/TransferTokenTest.java @@ -10,7 +10,6 @@ import org.tron.common.runtime.Runtime; import org.tron.common.runtime.TvmTestUtils; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -24,6 +23,7 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; +import org.tron.common.TestConstants; @Slf4j public class TransferTokenTest extends BaseTest { @@ -44,7 +44,7 @@ public class TransferTokenTest extends BaseTest { static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; TRANSFER_TO = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/VMContractTestBase.java b/framework/src/test/java/org/tron/common/runtime/vm/VMContractTestBase.java index ee49bdca7f6..4c7457fad80 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/VMContractTestBase.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/VMContractTestBase.java @@ -24,6 +24,7 @@ import org.tron.core.vm.repository.Repository; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j public class VMContractTestBase { @@ -53,7 +54,7 @@ public class VMContractTestBase { @Before public void init() throws IOException { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); // TRdmP9bYvML7dGUX9Rbw2kZrE2TayPZmZX - 41abd4b9367799eaa3197fecb144eb71de1e049abc diff --git a/framework/src/test/java/org/tron/common/runtime/vm/VMTestBase.java b/framework/src/test/java/org/tron/common/runtime/vm/VMTestBase.java index 18209543f62..f300ee0cc19 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/VMTestBase.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/VMTestBase.java @@ -10,7 +10,6 @@ import org.junit.rules.TemporaryFolder; import org.tron.common.application.TronApplicationContext; import org.tron.common.runtime.Runtime; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; @@ -19,6 +18,7 @@ import org.tron.core.vm.repository.Repository; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j public class VMTestBase { @@ -35,7 +35,7 @@ public class VMTestBase { @Before public void init() throws IOException { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; manager = context.getBean(Manager.class); diff --git a/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java b/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java index a688f5f9a29..c539b37d3d6 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java @@ -20,7 +20,6 @@ import org.tron.common.utils.Sha256Hash; import org.tron.common.utils.StringUtil; import org.tron.common.utils.client.utils.AbiUtil; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.StoreFactory; @@ -28,6 +27,7 @@ import org.tron.core.vm.repository.Repository; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j @@ -37,7 +37,7 @@ public class ValidateMultiSignContractTest extends BaseTest { private static final byte[] longData; static { - Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); longData = new byte[1000000]; Arrays.fill(longData, (byte) 2); } diff --git a/framework/src/test/java/org/tron/common/runtime/vm/VoteTest.java b/framework/src/test/java/org/tron/common/runtime/vm/VoteTest.java index d6493ed8018..c2e8378215e 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/VoteTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/VoteTest.java @@ -34,7 +34,6 @@ import org.tron.common.utils.client.utils.AbiUtil; import org.tron.common.utils.client.utils.DataWord; import org.tron.consensus.dpos.MaintenanceManager; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionCapsule; @@ -50,6 +49,7 @@ import org.tron.core.vm.repository.Repository; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j public class VoteTest { @@ -278,7 +278,7 @@ private static Consumer getSmallerConsumer(long expected) { @Before public void init() throws Exception { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); CommonParameter.getInstance().setCheckFrozenTime(0); context = new TronApplicationContext(DefaultConfig.class); manager = context.getBean(Manager.class); diff --git a/framework/src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java b/framework/src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java index bf18b988f19..8730880186a 100644 --- a/framework/src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java +++ b/framework/src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java @@ -47,10 +47,10 @@ import org.tron.common.utils.ByteArray; import org.tron.common.utils.FileUtil; import org.tron.common.utils.PublicMethod; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.db2.common.WrappedByteArray; import org.tron.core.exception.TronError; +import org.tron.common.TestConstants; @Slf4j public class LevelDbDataSourceImplTest { @@ -84,7 +84,7 @@ public static void destroy() { @Before public void initDb() throws IOException { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); dataSourceTest = new LevelDbDataSourceImpl( Args.getInstance().getOutputDirectory() + File.separator, "test_levelDb"); } diff --git a/framework/src/test/java/org/tron/core/BandwidthProcessorTest.java b/framework/src/test/java/org/tron/core/BandwidthProcessorTest.java index 1faa70d59ee..2810ae96fe1 100755 --- a/framework/src/test/java/org/tron/core/BandwidthProcessorTest.java +++ b/framework/src/test/java/org/tron/core/BandwidthProcessorTest.java @@ -35,6 +35,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.TransferAssetContract; import org.tron.protos.contract.BalanceContract.TransferContract; +import org.tron.common.TestConstants; @Slf4j public class BandwidthProcessorTest extends BaseTest { @@ -56,7 +57,7 @@ public class BandwidthProcessorTest extends BaseTest { static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); ASSET_NAME = "test_token"; ASSET_NAME_V2 = "2"; OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; diff --git a/framework/src/test/java/org/tron/core/BlockUtilTest.java b/framework/src/test/java/org/tron/core/BlockUtilTest.java index b122c3082f7..ccf4215c342 100644 --- a/framework/src/test/java/org/tron/core/BlockUtilTest.java +++ b/framework/src/test/java/org/tron/core/BlockUtilTest.java @@ -29,13 +29,14 @@ import org.tron.protos.Protocol.Block; import org.tron.protos.Protocol.BlockHeader; import org.tron.protos.Protocol.BlockHeader.raw; +import org.tron.common.TestConstants; @Slf4j public class BlockUtilTest { @Before public void initConfiguration() { - Args.setParam(new String[]{}, Constant.TEST_CONF); + Args.setParam(new String[]{}, TestConstants.TEST_CONF); } @After diff --git a/framework/src/test/java/org/tron/core/EnergyProcessorTest.java b/framework/src/test/java/org/tron/core/EnergyProcessorTest.java index 1e9064cb998..85b52ed1d05 100755 --- a/framework/src/test/java/org/tron/core/EnergyProcessorTest.java +++ b/framework/src/test/java/org/tron/core/EnergyProcessorTest.java @@ -15,6 +15,7 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.Common; +import org.tron.common.TestConstants; @Slf4j public class EnergyProcessorTest extends BaseTest { @@ -24,7 +25,7 @@ public class EnergyProcessorTest extends BaseTest { private static final String USER_ADDRESS; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); ASSET_NAME = "test_token"; CONTRACT_PROVIDER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; diff --git a/framework/src/test/java/org/tron/core/ForkControllerTest.java b/framework/src/test/java/org/tron/core/ForkControllerTest.java index 0b43db3e534..52604b4824d 100644 --- a/framework/src/test/java/org/tron/core/ForkControllerTest.java +++ b/framework/src/test/java/org/tron/core/ForkControllerTest.java @@ -18,6 +18,7 @@ import org.tron.core.config.args.Args; import org.tron.core.store.DynamicPropertiesStore; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class ForkControllerTest { private static ChainBaseManager chainBaseManager; @@ -31,7 +32,7 @@ public class ForkControllerTest { @Before public void init() throws IOException { Args.setParam(new String[]{"-d", - temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); dynamicPropertiesStore = context.getBean(DynamicPropertiesStore.class); chainBaseManager = context.getBean(ChainBaseManager.class); diff --git a/framework/src/test/java/org/tron/core/ShieldWalletTest.java b/framework/src/test/java/org/tron/core/ShieldWalletTest.java index f8d5db1a44c..d07c59943a5 100644 --- a/framework/src/test/java/org/tron/core/ShieldWalletTest.java +++ b/framework/src/test/java/org/tron/core/ShieldWalletTest.java @@ -22,6 +22,7 @@ import org.tron.core.exception.ContractValidateException; import org.tron.core.services.http.JsonFormat; import org.tron.core.services.http.JsonFormat.ParseException; +import org.tron.common.TestConstants; public class ShieldWalletTest extends BaseTest { @@ -30,7 +31,7 @@ public class ShieldWalletTest extends BaseTest { private Wallet wallet; static { - Args.setParam(new String[] {"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[] {"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/WalletTest.java b/framework/src/test/java/org/tron/core/WalletTest.java index 831490fdca1..21c7c684816 100644 --- a/framework/src/test/java/org/tron/core/WalletTest.java +++ b/framework/src/test/java/org/tron/core/WalletTest.java @@ -91,6 +91,7 @@ import org.tron.protos.contract.BalanceContract.TransferContract; import org.tron.protos.contract.Common; import org.tron.protos.contract.SmartContractOuterClass; +import org.tron.common.TestConstants; @Slf4j @@ -142,7 +143,7 @@ public class WalletTest extends BaseTest { private static boolean init; static { - Args.setParam(new String[] {"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[] {"-d", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; RECEIVER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049150"; } diff --git a/framework/src/test/java/org/tron/core/actuator/AccountPermissionUpdateActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/AccountPermissionUpdateActuatorTest.java index 69bac08c3e6..0ddfef1dfef 100644 --- a/framework/src/test/java/org/tron/core/actuator/AccountPermissionUpdateActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/AccountPermissionUpdateActuatorTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -28,6 +27,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AccountContract.AccountCreateContract; import org.tron.protos.contract.AccountContract.AccountPermissionUpdateContract; +import org.tron.common.TestConstants; @Slf4j public class AccountPermissionUpdateActuatorTest extends BaseTest { @@ -52,7 +52,7 @@ public class AccountPermissionUpdateActuatorTest extends BaseTest { private static final String KEY_ADDRESS_INVALID = "bbbb"; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; WITNESS_ADDRESS = Wallet.getAddressPreFixString() + "8CFC572CC20CA18B636BDD93B4FB15EA84CC2B4E"; KEY_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; diff --git a/framework/src/test/java/org/tron/core/actuator/ActuatorConstantTest.java b/framework/src/test/java/org/tron/core/actuator/ActuatorConstantTest.java index b8c2bd4fef9..8cd22544ff1 100644 --- a/framework/src/test/java/org/tron/core/actuator/ActuatorConstantTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ActuatorConstantTest.java @@ -5,8 +5,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; @Slf4j(topic = "actuator") @@ -17,7 +17,7 @@ public class ActuatorConstantTest extends BaseTest { */ @BeforeClass public static void init() { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/actuator/ActuatorFactoryTest.java b/framework/src/test/java/org/tron/core/actuator/ActuatorFactoryTest.java index 8258fbf9a3e..94c2346cc79 100644 --- a/framework/src/test/java/org/tron/core/actuator/ActuatorFactoryTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ActuatorFactoryTest.java @@ -7,13 +7,13 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionCapsule; import org.tron.core.config.args.Args; import org.tron.protos.Protocol.AccountType; import org.tron.protos.contract.BalanceContract.TransferContract; +import org.tron.common.TestConstants; public class ActuatorFactoryTest extends BaseTest { @@ -27,7 +27,7 @@ public class ActuatorFactoryTest extends BaseTest { new String[] { "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/actuator/AssetIssueActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/AssetIssueActuatorTest.java index 77c24c28797..ac248341f1e 100755 --- a/framework/src/test/java/org/tron/core/actuator/AssetIssueActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/AssetIssueActuatorTest.java @@ -15,7 +15,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -29,6 +28,7 @@ import org.tron.protos.contract.AccountContract.AccountCreateContract; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract.FrozenSupply; +import org.tron.common.TestConstants; @Slf4j public class AssetIssueActuatorTest extends BaseTest { @@ -47,7 +47,7 @@ public class AssetIssueActuatorTest extends BaseTest { private static long endTime = 0; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049150"; OWNER_ADDRESS_SECOND = Wallet .getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; diff --git a/framework/src/test/java/org/tron/core/actuator/CancelAllUnfreezeV2ActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/CancelAllUnfreezeV2ActuatorTest.java index fc2dad88420..b73b9db0544 100644 --- a/framework/src/test/java/org/tron/core/actuator/CancelAllUnfreezeV2ActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/CancelAllUnfreezeV2ActuatorTest.java @@ -24,6 +24,7 @@ import org.tron.core.exception.ContractValidateException; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; +import org.tron.common.TestConstants; @Slf4j public class CancelAllUnfreezeV2ActuatorTest extends BaseTest { @@ -35,7 +36,7 @@ public class CancelAllUnfreezeV2ActuatorTest extends BaseTest { private static final long initBalance = 10_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; RECEIVER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049150"; OWNER_ACCOUNT_INVALID = diff --git a/framework/src/test/java/org/tron/core/actuator/ClearABIContractActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ClearABIContractActuatorTest.java index 3a23151f6bc..a47e40caeea 100644 --- a/framework/src/test/java/org/tron/core/actuator/ClearABIContractActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ClearABIContractActuatorTest.java @@ -12,7 +12,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.ContractCapsule; @@ -25,6 +24,7 @@ import org.tron.protos.contract.SmartContractOuterClass.ClearABIContract; import org.tron.protos.contract.SmartContractOuterClass.SmartContract; import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI; +import org.tron.common.TestConstants; @Slf4j public class ClearABIContractActuatorTest extends BaseTest { @@ -43,7 +43,7 @@ public class ClearABIContractActuatorTest extends BaseTest { private static final ABI TARGET_ABI = ABI.getDefaultInstance(); static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_NOTEXIST = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; diff --git a/framework/src/test/java/org/tron/core/actuator/CreateAccountActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/CreateAccountActuatorTest.java index f756f3dd087..1ada3f23e3e 100755 --- a/framework/src/test/java/org/tron/core/actuator/CreateAccountActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/CreateAccountActuatorTest.java @@ -11,7 +11,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -22,6 +21,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AccountContract.AccountCreateContract; import org.tron.protos.contract.AssetIssueContractOuterClass; +import org.tron.common.TestConstants; @Slf4j public class CreateAccountActuatorTest extends BaseTest { @@ -32,7 +32,7 @@ public class CreateAccountActuatorTest extends BaseTest { private static final String INVALID_ACCOUNT_ADDRESS; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/DelegateResourceActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/DelegateResourceActuatorTest.java index 95577f46e50..200dc11bf24 100644 --- a/framework/src/test/java/org/tron/core/actuator/DelegateResourceActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/DelegateResourceActuatorTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.DelegatedResourceAccountIndexCapsule; @@ -38,6 +37,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract; import org.tron.protos.contract.BalanceContract.DelegateResourceContract; +import org.tron.common.TestConstants; @Slf4j public class DelegateResourceActuatorTest extends BaseTest { @@ -49,7 +49,7 @@ public class DelegateResourceActuatorTest extends BaseTest { private static final long initBalance = 1000_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; RECEIVER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049150"; OWNER_ACCOUNT_INVALID = diff --git a/framework/src/test/java/org/tron/core/actuator/ExchangeCreateActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ExchangeCreateActuatorTest.java index 179ba56e7ed..9e14a39e372 100644 --- a/framework/src/test/java/org/tron/core/actuator/ExchangeCreateActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ExchangeCreateActuatorTest.java @@ -12,7 +12,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -27,6 +26,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.ExchangeContract.ExchangeCreateContract; +import org.tron.common.TestConstants; @Slf4j @@ -40,7 +40,7 @@ public class ExchangeCreateActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_NOACCOUNT; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/ExchangeInjectActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ExchangeInjectActuatorTest.java index 7aef11ed793..cf4b7ae68f8 100644 --- a/framework/src/test/java/org/tron/core/actuator/ExchangeInjectActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ExchangeInjectActuatorTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -28,6 +27,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.ExchangeContract.ExchangeInjectContract; +import org.tron.common.TestConstants; @Slf4j @@ -41,7 +41,7 @@ public class ExchangeInjectActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_NOACCOUNT; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/ExchangeTransactionActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ExchangeTransactionActuatorTest.java index d39706e0699..6105e71e8ec 100644 --- a/framework/src/test/java/org/tron/core/actuator/ExchangeTransactionActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ExchangeTransactionActuatorTest.java @@ -14,7 +14,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -29,6 +28,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.ExchangeContract.ExchangeTransactionContract; +import org.tron.common.TestConstants; @Slf4j @@ -42,7 +42,7 @@ public class ExchangeTransactionActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_NOACCOUNT; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/ExchangeWithdrawActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ExchangeWithdrawActuatorTest.java index 5c5536f873c..55c052bef7e 100644 --- a/framework/src/test/java/org/tron/core/actuator/ExchangeWithdrawActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ExchangeWithdrawActuatorTest.java @@ -14,7 +14,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -29,6 +28,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.ExchangeContract.ExchangeWithdrawContract; +import org.tron.common.TestConstants; @Slf4j @@ -42,7 +42,7 @@ public class ExchangeWithdrawActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_NOACCOUNT; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/FreezeBalanceActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/FreezeBalanceActuatorTest.java index 18eef50c36f..635bc216899 100644 --- a/framework/src/test/java/org/tron/core/actuator/FreezeBalanceActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/FreezeBalanceActuatorTest.java @@ -30,6 +30,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.FreezeBalanceContract; import org.tron.protos.contract.Common.ResourceCode; +import org.tron.common.TestConstants; @Slf4j public class FreezeBalanceActuatorTest extends BaseTest { @@ -41,7 +42,7 @@ public class FreezeBalanceActuatorTest extends BaseTest { private static final long initBalance = 10_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; RECEIVER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049150"; OWNER_ACCOUNT_INVALID = diff --git a/framework/src/test/java/org/tron/core/actuator/FreezeBalanceV2ActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/FreezeBalanceV2ActuatorTest.java index 86b0e3143ab..a72b3ecd08d 100644 --- a/framework/src/test/java/org/tron/core/actuator/FreezeBalanceV2ActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/FreezeBalanceV2ActuatorTest.java @@ -25,6 +25,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract; import org.tron.protos.contract.Common.ResourceCode; +import org.tron.common.TestConstants; @Slf4j public class FreezeBalanceV2ActuatorTest extends BaseTest { @@ -36,7 +37,7 @@ public class FreezeBalanceV2ActuatorTest extends BaseTest { private static final long initBalance = 10_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; RECEIVER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049150"; OWNER_ACCOUNT_INVALID = diff --git a/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java index b5c3427f529..76978c4e338 100644 --- a/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java @@ -10,7 +10,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -35,6 +34,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.MarketContract.MarketCancelOrderContract; import org.tron.protos.contract.MarketContract.MarketSellAssetContract; +import org.tron.common.TestConstants; @Slf4j @@ -51,7 +51,7 @@ public class MarketCancelOrderActuatorTest extends BaseTest { private static final String TRX = "_"; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java index 0e938cdb025..d1c5e268fe1 100644 --- a/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java @@ -13,7 +13,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -37,6 +36,7 @@ import org.tron.protos.Protocol.MarketPrice; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.MarketContract.MarketSellAssetContract; +import org.tron.common.TestConstants; @Slf4j @@ -53,7 +53,7 @@ public class MarketSellAssetActuatorTest extends BaseTest { private static final String TRX = "_"; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/ParticipateAssetIssueActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ParticipateAssetIssueActuatorTest.java index 88db0791b0a..75e69f6fbbe 100755 --- a/framework/src/test/java/org/tron/core/actuator/ParticipateAssetIssueActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ParticipateAssetIssueActuatorTest.java @@ -8,7 +8,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -21,6 +20,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.ParticipateAssetIssueContract; +import org.tron.common.TestConstants; public class ParticipateAssetIssueActuatorTest extends BaseTest { @@ -41,7 +41,7 @@ public class ParticipateAssetIssueActuatorTest extends BaseTest { private static long AMOUNT = TOTAL_SUPPLY - (1000L) / TRX_NUM * NUM; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1234"; TO_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; TO_ADDRESS_2 = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e048892"; diff --git a/framework/src/test/java/org/tron/core/actuator/ProposalApproveActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ProposalApproveActuatorTest.java index 2e8e78306a9..02741fda21d 100644 --- a/framework/src/test/java/org/tron/core/actuator/ProposalApproveActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ProposalApproveActuatorTest.java @@ -12,7 +12,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.ProposalCapsule; @@ -27,6 +26,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.ProposalContract; +import org.tron.common.TestConstants; @Slf4j public class ProposalApproveActuatorTest extends BaseTest { @@ -40,7 +40,7 @@ public class ProposalApproveActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_NOACCOUNT; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/ProposalCreateActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ProposalCreateActuatorTest.java index 7210fe8d074..74ff6b5fb45 100644 --- a/framework/src/test/java/org/tron/core/actuator/ProposalCreateActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ProposalCreateActuatorTest.java @@ -17,7 +17,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.ForkController; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.ProposalCapsule; @@ -31,6 +30,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.ProposalContract.ProposalCreateContract; +import org.tron.common.TestConstants; @Slf4j public class ProposalCreateActuatorTest extends BaseTest { @@ -44,7 +44,7 @@ public class ProposalCreateActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_NOACCOUNT; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/ProposalDeleteActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ProposalDeleteActuatorTest.java index dfd34cb620e..9a33ebb141f 100644 --- a/framework/src/test/java/org/tron/core/actuator/ProposalDeleteActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ProposalDeleteActuatorTest.java @@ -12,7 +12,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.ProposalCapsule; @@ -27,6 +26,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.ProposalContract; +import org.tron.common.TestConstants; @Slf4j public class ProposalDeleteActuatorTest extends BaseTest { @@ -40,7 +40,7 @@ public class ProposalDeleteActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_NOACCOUNT; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/SetAccountIdActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/SetAccountIdActuatorTest.java index e93d9ecf333..80bfa4335dd 100644 --- a/framework/src/test/java/org/tron/core/actuator/SetAccountIdActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/SetAccountIdActuatorTest.java @@ -8,7 +8,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -19,6 +18,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AccountContract.SetAccountIdContract; import org.tron.protos.contract.AssetIssueContractOuterClass; +import org.tron.common.TestConstants; @Slf4j public class SetAccountIdActuatorTest extends BaseTest { @@ -30,7 +30,7 @@ public class SetAccountIdActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_INVALID = "aaaa"; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; OWNER_ADDRESS_1 = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/core/actuator/ShieldedTransferActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ShieldedTransferActuatorTest.java index b71ba432018..461d895fbbe 100755 --- a/framework/src/test/java/org/tron/core/actuator/ShieldedTransferActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ShieldedTransferActuatorTest.java @@ -13,7 +13,6 @@ import org.tron.common.utils.client.utils.TransactionUtils; import org.tron.common.zksnark.IncrementalMerkleTreeContainer; import org.tron.common.zksnark.IncrementalMerkleVoucherContainer; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -41,6 +40,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.ShieldContract.PedersenHash; import org.tron.protos.contract.ShieldContract.ShieldedTransferContract; +import org.tron.common.TestConstants; @Slf4j public class ShieldedTransferActuatorTest extends BaseTest { @@ -68,7 +68,7 @@ public class ShieldedTransferActuatorTest extends BaseTest { private Wallet wallet; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); ADDRESS_ONE_PRIVATE_KEY = PublicMethod.getRandomPrivateKey(); PUBLIC_ADDRESS_ONE = PublicMethod.getHexAddressByPrivateKey(ADDRESS_ONE_PRIVATE_KEY); diff --git a/framework/src/test/java/org/tron/core/actuator/TransferActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/TransferActuatorTest.java index 12df9031ca8..9d117730076 100644 --- a/framework/src/test/java/org/tron/core/actuator/TransferActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/TransferActuatorTest.java @@ -14,7 +14,6 @@ import org.tron.common.BaseTest; import org.tron.common.runtime.TvmTestUtils; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -30,6 +29,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.TransferContract; +import org.tron.common.TestConstants; @Slf4j public class TransferActuatorTest extends BaseTest { @@ -46,7 +46,7 @@ public class TransferActuatorTest extends BaseTest { private static final String To_ACCOUNT_INVALID; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; TO_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ACCOUNT_INVALID = diff --git a/framework/src/test/java/org/tron/core/actuator/TransferAssetActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/TransferAssetActuatorTest.java index 8c936f16dc5..5c4e525ebad 100755 --- a/framework/src/test/java/org/tron/core/actuator/TransferAssetActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/TransferAssetActuatorTest.java @@ -28,7 +28,6 @@ import org.tron.common.BaseTest; import org.tron.common.runtime.TvmTestUtils; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -47,6 +46,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.TransferAssetContract; +import org.tron.common.TestConstants; @Slf4j public class TransferAssetActuatorTest extends BaseTest { @@ -72,7 +72,7 @@ public class TransferAssetActuatorTest extends BaseTest { private static final String URL = "https://tron.network"; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049150"; TO_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a146a"; NOT_EXIT_ADDRESS = Wallet.getAddressPreFixString() + "B56446E617E924805E4D6CA021D341FEF6E2013B"; diff --git a/framework/src/test/java/org/tron/core/actuator/UnDelegateResourceActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UnDelegateResourceActuatorTest.java index eea1a0bf9b7..5c6a26d8d95 100644 --- a/framework/src/test/java/org/tron/core/actuator/UnDelegateResourceActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UnDelegateResourceActuatorTest.java @@ -12,7 +12,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.DelegatedResourceAccountIndexCapsule; @@ -26,6 +25,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.UnDelegateResourceContract; import org.tron.protos.contract.Common.ResourceCode; +import org.tron.common.TestConstants; @Slf4j public class UnDelegateResourceActuatorTest extends BaseTest { @@ -38,7 +38,7 @@ public class UnDelegateResourceActuatorTest extends BaseTest { private static final long delegateBalance = 1_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; RECEIVER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049150"; OWNER_ACCOUNT_INVALID = diff --git a/framework/src/test/java/org/tron/core/actuator/UnfreezeAssetActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UnfreezeAssetActuatorTest.java index 7471e9ba20f..0c62af1253f 100644 --- a/framework/src/test/java/org/tron/core/actuator/UnfreezeAssetActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UnfreezeAssetActuatorTest.java @@ -9,7 +9,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -24,6 +23,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.UnfreezeAssetContract; +import org.tron.common.TestConstants; @Slf4j public class UnfreezeAssetActuatorTest extends BaseTest { @@ -36,7 +36,7 @@ public class UnfreezeAssetActuatorTest extends BaseTest { private static final String assetName = "testCoin"; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; OWNER_ACCOUNT_INVALID = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a3456"; diff --git a/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceActuatorTest.java index e9f1d934e5a..70e1da602ac 100644 --- a/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceActuatorTest.java @@ -12,7 +12,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.DelegatedResourceAccountIndexCapsule; @@ -28,6 +27,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.UnfreezeBalanceContract; import org.tron.protos.contract.Common.ResourceCode; +import org.tron.common.TestConstants; @Slf4j public class UnfreezeBalanceActuatorTest extends BaseTest { @@ -40,7 +40,7 @@ public class UnfreezeBalanceActuatorTest extends BaseTest { private static final long frozenBalance = 1_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; RECEIVER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049150"; OWNER_ACCOUNT_INVALID = diff --git a/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceV2ActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceV2ActuatorTest.java index 749052736e5..d53601bba0e 100644 --- a/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceV2ActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceV2ActuatorTest.java @@ -12,7 +12,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -26,6 +25,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract; import org.tron.protos.contract.Common.ResourceCode; +import org.tron.common.TestConstants; @Slf4j public class UnfreezeBalanceV2ActuatorTest extends BaseTest { @@ -38,7 +38,7 @@ public class UnfreezeBalanceV2ActuatorTest extends BaseTest { private static final long frozenBalance = 1_000_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; RECEIVER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049150"; OWNER_ACCOUNT_INVALID = diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateAccountActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateAccountActuatorTest.java index 0e385347836..a5ebed64701 100755 --- a/framework/src/test/java/org/tron/core/actuator/UpdateAccountActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateAccountActuatorTest.java @@ -10,7 +10,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -21,6 +20,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AccountContract.AccountUpdateContract; import org.tron.protos.contract.AssetIssueContractOuterClass; +import org.tron.common.TestConstants; @Slf4j public class UpdateAccountActuatorTest extends BaseTest { @@ -32,7 +32,7 @@ public class UpdateAccountActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_INVALID = "aaaa"; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; OWNER_ADDRESS_1 = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; } diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java index 3bdba2055af..c54b5bf52b3 100644 --- a/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java @@ -12,7 +12,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -24,6 +23,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.UpdateAssetContract; +import org.tron.common.TestConstants; @Slf4j public class UpdateAssetActuatorTest extends BaseTest { @@ -39,7 +39,7 @@ public class UpdateAssetActuatorTest extends BaseTest { private static final String URL = "tron-my.com"; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_NOTEXIST = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateBrokerageActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateBrokerageActuatorTest.java index efd090b4b3a..9e6fb291fe4 100644 --- a/framework/src/test/java/org/tron/core/actuator/UpdateBrokerageActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateBrokerageActuatorTest.java @@ -11,7 +11,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -24,6 +23,7 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.StorageContract.UpdateBrokerageContract; +import org.tron.common.TestConstants; @Slf4j(topic = "actuator") public class UpdateBrokerageActuatorTest extends BaseTest { @@ -34,7 +34,7 @@ public class UpdateBrokerageActuatorTest extends BaseTest { private static final int BROKEN_AGE = 10; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_NOTEXIST = Wallet.getAddressPreFixString() + "1234b9367799eaa3197fecb144eb71de1e049123"; diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateEnergyLimitContractActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateEnergyLimitContractActuatorTest.java index 60f52b541b9..af6b70cf563 100644 --- a/framework/src/test/java/org/tron/core/actuator/UpdateEnergyLimitContractActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateEnergyLimitContractActuatorTest.java @@ -15,7 +15,6 @@ import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.ContractCapsule; @@ -29,6 +28,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.SmartContractOuterClass.SmartContract; import org.tron.protos.contract.SmartContractOuterClass.UpdateEnergyLimitContract; +import org.tron.common.TestConstants; @Slf4j @@ -47,7 +47,7 @@ public class UpdateEnergyLimitContractActuatorTest extends BaseTest { private static String OWNER_ADDRESS_NOTEXIST; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); } /** diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateSettingContractActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateSettingContractActuatorTest.java index 213bbd6cb85..503241bfac5 100644 --- a/framework/src/test/java/org/tron/core/actuator/UpdateSettingContractActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateSettingContractActuatorTest.java @@ -11,7 +11,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.ContractCapsule; @@ -23,6 +22,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.SmartContractOuterClass.SmartContract; import org.tron.protos.contract.SmartContractOuterClass.UpdateSettingContract; +import org.tron.common.TestConstants; @Slf4j @@ -41,7 +41,7 @@ public class UpdateSettingContractActuatorTest extends BaseTest { private static final long INVALID_PERCENT = 200L; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_NOTEXIST = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; diff --git a/framework/src/test/java/org/tron/core/actuator/VoteWitnessActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/VoteWitnessActuatorTest.java index d7fef2ab2f5..4e53347b879 100644 --- a/framework/src/test/java/org/tron/core/actuator/VoteWitnessActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/VoteWitnessActuatorTest.java @@ -13,7 +13,6 @@ import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; import org.tron.consensus.dpos.MaintenanceManager; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.BlockCapsule; @@ -30,6 +29,7 @@ import org.tron.protos.contract.BalanceContract.FreezeBalanceContract; import org.tron.protos.contract.WitnessContract.VoteWitnessContract; import org.tron.protos.contract.WitnessContract.VoteWitnessContract.Vote; +import org.tron.common.TestConstants; @Slf4j public class VoteWitnessActuatorTest extends BaseTest { @@ -51,7 +51,7 @@ public class VoteWitnessActuatorTest extends BaseTest { private static boolean consensusStart; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); Args.getInstance().setConsensusLogicOptimization(1); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; WITNESS_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; diff --git a/framework/src/test/java/org/tron/core/actuator/WithdrawBalanceActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/WithdrawBalanceActuatorTest.java index 22a4acbb838..74c10a71926 100644 --- a/framework/src/test/java/org/tron/core/actuator/WithdrawBalanceActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/WithdrawBalanceActuatorTest.java @@ -12,7 +12,6 @@ import org.tron.common.args.Witness; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -25,6 +24,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.WithdrawBalanceContract; +import org.tron.common.TestConstants; @Slf4j public class WithdrawBalanceActuatorTest extends BaseTest { @@ -36,7 +36,7 @@ public class WithdrawBalanceActuatorTest extends BaseTest { private static final long allowance = 32_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; OWNER_ACCOUNT_INVALID = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a3456"; diff --git a/framework/src/test/java/org/tron/core/actuator/WithdrawExpireUnfreezeActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/WithdrawExpireUnfreezeActuatorTest.java index 34ac0d9bbeb..b4454f6f82b 100644 --- a/framework/src/test/java/org/tron/core/actuator/WithdrawExpireUnfreezeActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/WithdrawExpireUnfreezeActuatorTest.java @@ -14,7 +14,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -28,6 +27,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.WithdrawExpireUnfreezeContract; +import org.tron.common.TestConstants; @Slf4j public class WithdrawExpireUnfreezeActuatorTest extends BaseTest { @@ -39,7 +39,7 @@ public class WithdrawExpireUnfreezeActuatorTest extends BaseTest { private static final long allowance = 32_000_000L; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; OWNER_ACCOUNT_INVALID = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a3456"; diff --git a/framework/src/test/java/org/tron/core/actuator/WitnessCreateActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/WitnessCreateActuatorTest.java index 0809ed2993e..9adcad7cf96 100644 --- a/framework/src/test/java/org/tron/core/actuator/WitnessCreateActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/WitnessCreateActuatorTest.java @@ -10,7 +10,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -22,6 +21,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.WitnessContract.WitnessCreateContract; +import org.tron.common.TestConstants; @Slf4j public class WitnessCreateActuatorTest extends BaseTest { @@ -36,7 +36,7 @@ public class WitnessCreateActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_BALANCENOTSUFFIENT; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS_FIRST = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_SECOND = diff --git a/framework/src/test/java/org/tron/core/actuator/WitnessUpdateActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/WitnessUpdateActuatorTest.java index 6ad6e381c5e..bad4eacd11e 100644 --- a/framework/src/test/java/org/tron/core/actuator/WitnessUpdateActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/WitnessUpdateActuatorTest.java @@ -10,7 +10,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionResultCapsule; @@ -22,6 +21,7 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.WitnessContract.WitnessUpdateContract; +import org.tron.common.TestConstants; @Slf4j public class WitnessUpdateActuatorTest extends BaseTest { @@ -36,7 +36,7 @@ public class WitnessUpdateActuatorTest extends BaseTest { private static final String OWNER_ADDRESS_INVALID = "aaaa"; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; OWNER_ADDRESS_NOTEXIST = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; diff --git a/framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java b/framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java index e8a1e862f54..0ef5c88415b 100644 --- a/framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java +++ b/framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java @@ -26,6 +26,7 @@ import org.tron.core.utils.ProposalUtil; import org.tron.core.utils.ProposalUtil.ProposalType; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j(topic = "actuator") public class ProposalUtilTest extends BaseTest { @@ -44,7 +45,7 @@ public class ProposalUtilTest extends BaseTest { */ @BeforeClass public static void init() { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java b/framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java index 0eb69f8fd66..68856513739 100644 --- a/framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java +++ b/framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java @@ -37,6 +37,7 @@ import org.tron.protos.Protocol.Transaction; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.contract.BalanceContract.DelegateResourceContract; +import org.tron.common.TestConstants; @Slf4j(topic = "capsule") public class TransactionUtilTest extends BaseTest { @@ -48,7 +49,7 @@ public class TransactionUtilTest extends BaseTest { */ @BeforeClass public static void init() { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; } diff --git a/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceListenerTest.java b/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceListenerTest.java index 089711219f8..43bfd84724b 100644 --- a/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceListenerTest.java +++ b/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceListenerTest.java @@ -12,12 +12,12 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.tron.common.runtime.vm.DataWord; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.db.TransactionStoreTest; import org.tron.core.vm.trace.OpActions; import org.tron.core.vm.trace.OpActions.Action; import org.tron.core.vm.trace.ProgramTraceListener; +import org.tron.common.TestConstants; @Slf4j(topic = "VM") public class ProgramTraceListenerTest { @@ -34,7 +34,7 @@ public class ProgramTraceListenerTest { @BeforeClass public static void init() throws IOException { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); } diff --git a/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceTest.java b/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceTest.java index 46be28deed0..7fae13c1b97 100644 --- a/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceTest.java +++ b/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceTest.java @@ -10,11 +10,11 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.tron.common.runtime.vm.DataWord; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.vm.trace.Op; import org.tron.core.vm.trace.OpActions; import org.tron.core.vm.trace.ProgramTrace; +import org.tron.common.TestConstants; public class ProgramTraceTest { @@ -24,7 +24,7 @@ public class ProgramTraceTest { @BeforeClass public static void init() throws IOException { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); } @AfterClass diff --git a/framework/src/test/java/org/tron/core/capsule/AccountCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/AccountCapsuleTest.java index 7a217dfd787..6c6c114eb47 100644 --- a/framework/src/test/java/org/tron/core/capsule/AccountCapsuleTest.java +++ b/framework/src/test/java/org/tron/core/capsule/AccountCapsuleTest.java @@ -9,7 +9,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.protos.Protocol.AccountType; @@ -17,6 +16,7 @@ import org.tron.protos.Protocol.Permission; import org.tron.protos.Protocol.Vote; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; +import org.tron.common.TestConstants; public class AccountCapsuleTest extends BaseTest { @@ -36,7 +36,7 @@ public class AccountCapsuleTest extends BaseTest { static AccountCapsule accountCapsule; static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "a06a17a49648a8ad32055c06f60fa14ae46df91234"; } diff --git a/framework/src/test/java/org/tron/core/capsule/BlockCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/BlockCapsuleTest.java index 3c86d893895..c45dc0183d3 100644 --- a/framework/src/test/java/org/tron/core/capsule/BlockCapsuleTest.java +++ b/framework/src/test/java/org/tron/core/capsule/BlockCapsuleTest.java @@ -22,6 +22,7 @@ import org.tron.core.exception.BadItemException; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.contract.BalanceContract.TransferContract; +import org.tron.common.TestConstants; @Slf4j public class BlockCapsuleTest { @@ -41,7 +42,7 @@ public class BlockCapsuleTest { @BeforeClass public static void init() throws IOException { Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); } @AfterClass diff --git a/framework/src/test/java/org/tron/core/capsule/ExchangeCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/ExchangeCapsuleTest.java index 5fcd259d738..40323e984b1 100644 --- a/framework/src/test/java/org/tron/core/capsule/ExchangeCapsuleTest.java +++ b/framework/src/test/java/org/tron/core/capsule/ExchangeCapsuleTest.java @@ -7,15 +7,15 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; +import org.tron.common.TestConstants; @Slf4j public class ExchangeCapsuleTest extends BaseTest { static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); } /** diff --git a/framework/src/test/java/org/tron/core/capsule/TransactionCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/TransactionCapsuleTest.java index 7065608f188..4c0186ae296 100644 --- a/framework/src/test/java/org/tron/core/capsule/TransactionCapsuleTest.java +++ b/framework/src/test/java/org/tron/core/capsule/TransactionCapsuleTest.java @@ -12,7 +12,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.protos.Protocol.AccountType; @@ -21,6 +20,7 @@ import org.tron.protos.Protocol.Transaction.Result; import org.tron.protos.Protocol.Transaction.Result.contractResult; import org.tron.protos.Protocol.Transaction.raw; +import org.tron.common.TestConstants; @Slf4j public class TransactionCapsuleTest extends BaseTest { @@ -29,7 +29,7 @@ public class TransactionCapsuleTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "03702350064AD5C1A8AA6B4D74B051199CFF8EA7"; } diff --git a/framework/src/test/java/org/tron/core/capsule/VotesCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/VotesCapsuleTest.java index 64bb660ab9a..baebc58a4bb 100644 --- a/framework/src/test/java/org/tron/core/capsule/VotesCapsuleTest.java +++ b/framework/src/test/java/org/tron/core/capsule/VotesCapsuleTest.java @@ -12,11 +12,11 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.tron.common.utils.StringUtil; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.db.TransactionStoreTest; import org.tron.protos.Protocol.Vote; +import org.tron.common.TestConstants; @Slf4j @@ -35,7 +35,7 @@ public class VotesCapsuleTest { @BeforeClass public static void init() throws IOException { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); } diff --git a/framework/src/test/java/org/tron/core/capsule/utils/AssetUtilTest.java b/framework/src/test/java/org/tron/core/capsule/utils/AssetUtilTest.java index b966b26a299..e9f99d4707f 100644 --- a/framework/src/test/java/org/tron/core/capsule/utils/AssetUtilTest.java +++ b/framework/src/test/java/org/tron/core/capsule/utils/AssetUtilTest.java @@ -11,20 +11,20 @@ import org.tron.api.GrpcAPI.AssetIssueList; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; import org.tron.core.config.args.Args; import org.tron.core.db.BandwidthProcessor; import org.tron.protos.Protocol; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; +import org.tron.common.TestConstants; @Slf4j public class AssetUtilTest extends BaseTest { static { - Args.setParam(new String[] {"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[] {"-d", dbPath()}, TestConstants.TEST_CONF); } public static byte[] randomBytes(int length) { diff --git a/framework/src/test/java/org/tron/core/capsule/utils/ExchangeProcessorTest.java b/framework/src/test/java/org/tron/core/capsule/utils/ExchangeProcessorTest.java index 717c62b01a8..fa713325f6d 100644 --- a/framework/src/test/java/org/tron/core/capsule/utils/ExchangeProcessorTest.java +++ b/framework/src/test/java/org/tron/core/capsule/utils/ExchangeProcessorTest.java @@ -5,9 +5,9 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.ExchangeProcessor; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; @Slf4j public class ExchangeProcessorTest extends BaseTest { @@ -15,7 +15,7 @@ public class ExchangeProcessorTest extends BaseTest { private static ExchangeProcessor processor; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); } /** diff --git a/framework/src/test/java/org/tron/core/config/ConfigurationTest.java b/framework/src/test/java/org/tron/core/config/ConfigurationTest.java index f3ca2da5312..ce0c0396663 100644 --- a/framework/src/test/java/org/tron/core/config/ConfigurationTest.java +++ b/framework/src/test/java/org/tron/core/config/ConfigurationTest.java @@ -33,8 +33,8 @@ import org.junit.Test; import org.tron.common.crypto.ECKey; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; +import org.tron.common.TestConstants; @Slf4j public class ConfigurationTest { @@ -77,7 +77,7 @@ public void getShouldNotFindConfiguration() { @Test public void getShouldReturnConfiguration() { - Config config = Configuration.getByFileName(Constant.TEST_CONF, Constant.TEST_CONF); + Config config = Configuration.getByFileName(TestConstants.TEST_CONF, TestConstants.TEST_CONF); assertTrue(config.hasPath("storage")); assertTrue(config.hasPath("seed.node")); assertTrue(config.hasPath("genesis.block")); @@ -85,7 +85,7 @@ public void getShouldReturnConfiguration() { @Test public void getConfigurationWhenOnlyConfFileName() { - URL res = getClass().getClassLoader().getResource(Constant.TEST_CONF); + URL res = getClass().getClassLoader().getResource(TestConstants.TEST_CONF); Config config = Configuration.getByFileName("", res.getPath()); assertTrue(config.hasPath("storage")); assertTrue(config.hasPath("seed.node")); diff --git a/framework/src/test/java/org/tron/core/config/args/ArgsTest.java b/framework/src/test/java/org/tron/core/config/args/ArgsTest.java index 4bb8e7e4909..0035ed1afa1 100644 --- a/framework/src/test/java/org/tron/core/config/args/ArgsTest.java +++ b/framework/src/test/java/org/tron/core/config/args/ArgsTest.java @@ -39,6 +39,7 @@ import org.tron.common.utils.PublicMethod; import org.tron.core.Constant; import org.tron.core.config.Configuration; +import org.tron.common.TestConstants; @Slf4j public class ArgsTest { @@ -57,7 +58,7 @@ public void destroy() { @Test public void get() { - Args.setParam(new String[] {"-c", Constant.TEST_CONF}, Constant.TESTNET_CONF); + Args.setParam(new String[] {"-c", TestConstants.TEST_CONF}, Constant.NET_CONF); CommonParameter parameter = Args.getInstance(); @@ -132,13 +133,13 @@ public void get() { @Test public void testIpFromLibP2p() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { - Args.setParam(new String[] {}, Constant.TEST_CONF); + Args.setParam(new String[] {}, TestConstants.TEST_CONF); CommonParameter parameter = Args.getInstance(); String configuredExternalIp = parameter.getNodeExternalIp(); Assert.assertEquals("46.168.1.1", configuredExternalIp); - Config config = Configuration.getByFileName(null, Constant.TEST_CONF); + Config config = Configuration.getByFileName(null, TestConstants.TEST_CONF); Config config3 = config.withoutPath(Constant.NODE_DISCOVERY_EXTERNAL_IP); CommonParameter.getInstance().setNodeExternalIp(null); @@ -153,7 +154,7 @@ public void testIpFromLibP2p() @Test public void testOldRewardOpt() { thrown.expect(IllegalArgumentException.class); - Args.setParam(new String[] {"-c", "args-test.conf"}, Constant.TESTNET_CONF); + Args.setParam(new String[] {"-c", "args-test.conf"}, Constant.NET_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/config/args/DynamicArgsTest.java b/framework/src/test/java/org/tron/core/config/args/DynamicArgsTest.java index 2a3af9c440e..c591aec4bcb 100644 --- a/framework/src/test/java/org/tron/core/config/args/DynamicArgsTest.java +++ b/framework/src/test/java/org/tron/core/config/args/DynamicArgsTest.java @@ -15,6 +15,7 @@ import org.tron.core.config.DefaultConfig; import org.tron.core.net.TronNetService; import org.tron.p2p.P2pConfig; +import org.tron.common.TestConstants; public class DynamicArgsTest { protected TronApplicationContext context; @@ -25,7 +26,7 @@ public class DynamicArgsTest { @Before public void init() throws IOException { Args.setParam(new String[]{"--output-directory", temporaryFolder.newFolder().toString()}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); dynamicArgs = context.getBean(DynamicArgs.class); @@ -48,7 +49,7 @@ public void start() { TronNetService tronNetService = context.getBean(TronNetService.class); ReflectUtils.setFieldValue(tronNetService, "p2pConfig", new P2pConfig()); - File config = new File(Constant.TESTNET_CONF); + File config = new File(Constant.NET_CONF); if (!config.exists()) { try { config.createNewFile(); diff --git a/framework/src/test/java/org/tron/core/consensus/DposServiceTest.java b/framework/src/test/java/org/tron/core/consensus/DposServiceTest.java index dc6802d71d5..3c8b898e247 100644 --- a/framework/src/test/java/org/tron/core/consensus/DposServiceTest.java +++ b/framework/src/test/java/org/tron/core/consensus/DposServiceTest.java @@ -12,12 +12,12 @@ import org.tron.consensus.ConsensusDelegate; import org.tron.consensus.dpos.DposService; import org.tron.consensus.dpos.DposSlot; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.DynamicPropertiesStore; import org.tron.p2p.utils.NetUtil; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class DposServiceTest { DposService service = new DposService(); @@ -60,7 +60,7 @@ public void testValidBlockTime() throws Exception { @Test public void testValidSlot() throws Exception { - Args.setParam(new String[] {}, Constant.TEST_CONF); + Args.setParam(new String[] {}, TestConstants.TEST_CONF); long headTime = 1724036757000L; ByteString witness = ByteString.copyFrom(NetUtil.getNodeId()); ByteString witness2 = ByteString.copyFrom(NetUtil.getNodeId()); diff --git a/framework/src/test/java/org/tron/core/db/AbiStoreTest.java b/framework/src/test/java/org/tron/core/db/AbiStoreTest.java index 0cb134c50ce..b9d1b40fcf0 100644 --- a/framework/src/test/java/org/tron/core/db/AbiStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AbiStoreTest.java @@ -10,7 +10,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.AbiCapsule; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; @@ -18,6 +17,7 @@ import org.tron.core.store.AccountIndexStore; import org.tron.protos.Protocol.AccountType; import org.tron.protos.contract.SmartContractOuterClass; +import org.tron.common.TestConstants; public class AbiStoreTest extends BaseTest { @@ -36,7 +36,7 @@ public class AbiStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/AccountAssetStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountAssetStoreTest.java index 48c24d98af1..e098f834afb 100644 --- a/framework/src/test/java/org/tron/core/db/AccountAssetStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountAssetStoreTest.java @@ -11,7 +11,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -20,6 +19,7 @@ import org.tron.core.store.AccountStore; import org.tron.protos.Protocol; import org.tron.protos.contract.AssetIssueContractOuterClass; +import org.tron.common.TestConstants; public class AccountAssetStoreTest extends BaseTest { @@ -48,7 +48,7 @@ public class AccountAssetStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath(), }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java index 9033e90481c..24c1eecee11 100644 --- a/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java @@ -8,12 +8,12 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.AccountIdIndexStore; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; public class AccountIdIndexStoreTest extends BaseTest { @@ -35,7 +35,7 @@ public class AccountIdIndexStoreTest extends BaseTest { static { Args.setParam(new String[]{"--output-directory", dbPath()}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); } @BeforeClass diff --git a/framework/src/test/java/org/tron/core/db/AccountIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountIndexStoreTest.java index a4dc848b749..4b1a80b433d 100755 --- a/framework/src/test/java/org/tron/core/db/AccountIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountIndexStoreTest.java @@ -7,11 +7,11 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.AccountIndexStore; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; public class AccountIndexStoreTest extends BaseTest { @@ -29,7 +29,7 @@ public class AccountIndexStoreTest extends BaseTest { "--storage-db-directory", dbDirectory, "--storage-index-directory", indexDirectory }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/AccountStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountStoreTest.java index 9249a3358dc..50ffc4c9d8d 100755 --- a/framework/src/test/java/org/tron/core/db/AccountStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountStoreTest.java @@ -11,7 +11,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.core.db2.ISession; @@ -19,6 +18,7 @@ import org.tron.core.store.AssetIssueStore; import org.tron.core.store.DynamicPropertiesStore; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; public class AccountStoreTest extends BaseTest { @@ -42,7 +42,7 @@ public class AccountStoreTest extends BaseTest { "--storage-db-directory", dbDirectory, "--storage-index-directory", indexDirectory }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/AccountTraceStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountTraceStoreTest.java index 5a6d44a8c7c..bf73afd9c14 100644 --- a/framework/src/test/java/org/tron/core/db/AccountTraceStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountTraceStoreTest.java @@ -10,7 +10,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AccountTraceCapsule; import org.tron.core.config.args.Args; @@ -19,6 +18,7 @@ import org.tron.core.store.AccountIndexStore; import org.tron.core.store.AccountTraceStore; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; public class AccountTraceStoreTest extends BaseTest { @@ -31,7 +31,7 @@ public class AccountTraceStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/AssetIssueStoreTest.java b/framework/src/test/java/org/tron/core/db/AssetIssueStoreTest.java index 34a4a8507d6..d40e34d86fd 100644 --- a/framework/src/test/java/org/tron/core/db/AssetIssueStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AssetIssueStoreTest.java @@ -7,11 +7,11 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.AssetIssueCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.AssetIssueStore; import org.tron.protos.contract.AssetIssueContractOuterClass; +import org.tron.common.TestConstants; public class AssetIssueStoreTest extends BaseTest { @@ -30,7 +30,7 @@ public class AssetIssueStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath(), }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/AssetIssueV2StoreTest.java b/framework/src/test/java/org/tron/core/db/AssetIssueV2StoreTest.java index e92027e3a28..46bb2d3bd0f 100644 --- a/framework/src/test/java/org/tron/core/db/AssetIssueV2StoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AssetIssueV2StoreTest.java @@ -6,11 +6,11 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.AssetIssueCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.AssetIssueV2Store; import org.tron.protos.contract.AssetIssueContractOuterClass; +import org.tron.common.TestConstants; public class AssetIssueV2StoreTest extends BaseTest { @@ -20,7 +20,7 @@ public class AssetIssueV2StoreTest extends BaseTest { new String[]{ "--output-directory", dbPath(), }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/BalanceTraceStoreTest.java b/framework/src/test/java/org/tron/core/db/BalanceTraceStoreTest.java index 82547a997da..53a4340e067 100644 --- a/framework/src/test/java/org/tron/core/db/BalanceTraceStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/BalanceTraceStoreTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.BlockBalanceTraceCapsule; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.TransactionCapsule; @@ -21,6 +20,7 @@ import org.tron.core.store.BalanceTraceStore; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; +import org.tron.common.TestConstants; public class BalanceTraceStoreTest extends BaseTest { @@ -49,7 +49,7 @@ public class BalanceTraceStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/BandwidthPriceHistoryLoaderTest.java b/framework/src/test/java/org/tron/core/db/BandwidthPriceHistoryLoaderTest.java index 298b9f40235..5e3c2cea657 100644 --- a/framework/src/test/java/org/tron/core/db/BandwidthPriceHistoryLoaderTest.java +++ b/framework/src/test/java/org/tron/core/db/BandwidthPriceHistoryLoaderTest.java @@ -23,13 +23,13 @@ import org.junit.rules.TemporaryFolder; import org.tron.common.application.TronApplicationContext; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.capsule.ProposalCapsule; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; import org.tron.core.db.api.BandwidthPriceHistoryLoader; import org.tron.protos.Protocol.Proposal; import org.tron.protos.Protocol.Proposal.State; +import org.tron.common.TestConstants; @Slf4j @@ -51,7 +51,7 @@ public class BandwidthPriceHistoryLoaderTest { @Before public void init() throws IOException { Args.setParam(new String[] {"--output-directory", - temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); chainBaseManager = context.getBean(ChainBaseManager.class); } diff --git a/framework/src/test/java/org/tron/core/db/BlockIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/BlockIndexStoreTest.java index a5600b34b26..9777fdfbe2d 100644 --- a/framework/src/test/java/org/tron/core/db/BlockIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/BlockIndexStoreTest.java @@ -7,11 +7,11 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; +import org.tron.common.TestConstants; public class BlockIndexStoreTest extends BaseTest { @@ -23,7 +23,7 @@ public class BlockIndexStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/BlockStoreTest.java b/framework/src/test/java/org/tron/core/db/BlockStoreTest.java index 937a102193f..6a6fe3f97a7 100644 --- a/framework/src/test/java/org/tron/core/db/BlockStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/BlockStoreTest.java @@ -7,11 +7,11 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.BadItemException; import org.tron.core.exception.ItemNotFoundException; +import org.tron.common.TestConstants; @Slf4j @@ -22,7 +22,7 @@ public class BlockStoreTest extends BaseTest { static { Args.setParam(new String[]{"--output-directory", dbPath()}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); } private BlockCapsule getBlockCapsule(long number) { diff --git a/framework/src/test/java/org/tron/core/db/CodeStoreTest.java b/framework/src/test/java/org/tron/core/db/CodeStoreTest.java index 59bfba2236a..228da1a5cf3 100644 --- a/framework/src/test/java/org/tron/core/db/CodeStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/CodeStoreTest.java @@ -10,10 +10,10 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.CodeCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.CodeStore; +import org.tron.common.TestConstants; public class CodeStoreTest extends BaseTest { @@ -46,7 +46,7 @@ public class CodeStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/ContractStoreTest.java b/framework/src/test/java/org/tron/core/db/ContractStoreTest.java index 391a2013636..2b18379ac84 100644 --- a/framework/src/test/java/org/tron/core/db/ContractStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/ContractStoreTest.java @@ -7,12 +7,12 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.ContractCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.ContractStore; import org.tron.protos.contract.SmartContractOuterClass; +import org.tron.common.TestConstants; public class ContractStoreTest extends BaseTest { @@ -26,7 +26,7 @@ public class ContractStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath(), }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/DelegatedResourceAccountIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/DelegatedResourceAccountIndexStoreTest.java index fd5932603e3..438b9d59eed 100644 --- a/framework/src/test/java/org/tron/core/db/DelegatedResourceAccountIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/DelegatedResourceAccountIndexStoreTest.java @@ -9,10 +9,10 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.DecodeUtil; -import org.tron.core.Constant; import org.tron.core.capsule.DelegatedResourceAccountIndexCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.DelegatedResourceAccountIndexStore; +import org.tron.common.TestConstants; public class DelegatedResourceAccountIndexStoreTest extends BaseTest { @@ -31,7 +31,7 @@ public class DelegatedResourceAccountIndexStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/DelegatedResourceStoreTest.java b/framework/src/test/java/org/tron/core/db/DelegatedResourceStoreTest.java index 905ef0384f1..ba70ef203ea 100644 --- a/framework/src/test/java/org/tron/core/db/DelegatedResourceStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/DelegatedResourceStoreTest.java @@ -7,10 +7,10 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.DelegatedResourceCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.DelegatedResourceStore; +import org.tron.common.TestConstants; public class DelegatedResourceStoreTest extends BaseTest { private static final long BALANCE = 1_000_000; @@ -27,7 +27,7 @@ public class DelegatedResourceStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath(), }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/DelegationStoreTest.java b/framework/src/test/java/org/tron/core/db/DelegationStoreTest.java index 10e70a0a83b..1a945d2115b 100644 --- a/framework/src/test/java/org/tron/core/db/DelegationStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/DelegationStoreTest.java @@ -7,10 +7,10 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.DelegationStore; +import org.tron.common.TestConstants; public class DelegationStoreTest extends BaseTest { @@ -27,7 +27,7 @@ public class DelegationStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath(), }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/EnergyPriceHistoryLoaderTest.java b/framework/src/test/java/org/tron/core/db/EnergyPriceHistoryLoaderTest.java index 995d9e01ecb..5c480e14b1d 100644 --- a/framework/src/test/java/org/tron/core/db/EnergyPriceHistoryLoaderTest.java +++ b/framework/src/test/java/org/tron/core/db/EnergyPriceHistoryLoaderTest.java @@ -14,13 +14,13 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.ProposalCapsule; import org.tron.core.config.args.Args; import org.tron.core.db.api.EnergyPriceHistoryLoader; import org.tron.core.store.ProposalStore; import org.tron.protos.Protocol.Proposal; import org.tron.protos.Protocol.Proposal.State; +import org.tron.common.TestConstants; @Slf4j @@ -36,7 +36,7 @@ public class EnergyPriceHistoryLoaderTest extends BaseTest { private static long price5 = 140L; static { - Args.setParam(new String[] {"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[] {"--output-directory", dbPath()}, TestConstants.TEST_CONF); } public void initDB() { diff --git a/framework/src/test/java/org/tron/core/db/ExchangeStoreTest.java b/framework/src/test/java/org/tron/core/db/ExchangeStoreTest.java index 685c137422c..09a72a93304 100644 --- a/framework/src/test/java/org/tron/core/db/ExchangeStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/ExchangeStoreTest.java @@ -7,12 +7,12 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.ExchangeCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.ExchangeStore; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class ExchangeStoreTest extends BaseTest { @@ -26,7 +26,7 @@ public class ExchangeStoreTest extends BaseTest { new String[] { "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/ExchangeV2StoreTest.java b/framework/src/test/java/org/tron/core/db/ExchangeV2StoreTest.java index 97c5f599b6e..c3a0e342cd0 100644 --- a/framework/src/test/java/org/tron/core/db/ExchangeV2StoreTest.java +++ b/framework/src/test/java/org/tron/core/db/ExchangeV2StoreTest.java @@ -5,12 +5,12 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.ExchangeCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.ExchangeV2Store; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class ExchangeV2StoreTest extends BaseTest { @@ -22,7 +22,7 @@ public class ExchangeV2StoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/IncrementalMerkleTreeStoreTest.java b/framework/src/test/java/org/tron/core/db/IncrementalMerkleTreeStoreTest.java index 643f86d3fe5..206eef86c83 100644 --- a/framework/src/test/java/org/tron/core/db/IncrementalMerkleTreeStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/IncrementalMerkleTreeStoreTest.java @@ -5,10 +5,10 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.IncrementalMerkleTreeCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.IncrementalMerkleTreeStore; +import org.tron.common.TestConstants; public class IncrementalMerkleTreeStoreTest extends BaseTest { @@ -22,7 +22,7 @@ public class IncrementalMerkleTreeStoreTest extends BaseTest { new String[] { "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/KhaosDatabaseTest.java b/framework/src/test/java/org/tron/core/db/KhaosDatabaseTest.java index 72214c6743e..e6f388e6cbd 100644 --- a/framework/src/test/java/org/tron/core/db/KhaosDatabaseTest.java +++ b/framework/src/test/java/org/tron/core/db/KhaosDatabaseTest.java @@ -14,7 +14,6 @@ import org.tron.common.utils.ByteArray; import org.tron.common.utils.Pair; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.BadNumberBlockException; @@ -23,6 +22,7 @@ import org.tron.protos.Protocol.Block; import org.tron.protos.Protocol.BlockHeader; import org.tron.protos.Protocol.BlockHeader.raw; +import org.tron.common.TestConstants; @Slf4j public class KhaosDatabaseTest extends BaseTest { @@ -31,7 +31,7 @@ public class KhaosDatabaseTest extends BaseTest { private KhaosDatabase khaosDatabase; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); } diff --git a/framework/src/test/java/org/tron/core/db/ManagerTest.java b/framework/src/test/java/org/tron/core/db/ManagerTest.java index db219377b74..caaee6bea81 100755 --- a/framework/src/test/java/org/tron/core/db/ManagerTest.java +++ b/framework/src/test/java/org/tron/core/db/ManagerTest.java @@ -100,6 +100,7 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.TransferContract; import org.tron.protos.contract.ShieldContract; +import org.tron.common.TestConstants; @Slf4j @@ -123,7 +124,7 @@ public class ManagerTest extends BlockGenerate { @Before public void init() throws IOException { Args.setParam(new String[]{"-d", - temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); Args.getInstance().setNodeListenPort(10000 + port.incrementAndGet()); context = new TronApplicationContext(DefaultConfig.class); @@ -723,7 +724,7 @@ public void fork() BadBlockException, TaposException, BadNumberBlockException, NonCommonBlockException, ReceiptCheckErrException, VMIllegalException, TooBigTransactionResultException, ZksnarkException, EventBloomException { - Args.setParam(new String[]{}, Constant.TEST_CONF); + Args.setParam(new String[]{}, TestConstants.TEST_CONF); long size = chainManager.getBlockStore().size(); // System.out.print("block store size:" + size + "\n"); String key = PublicMethod.getRandomPrivateKey(); @@ -870,7 +871,7 @@ public void doNotSwitch() TaposException, BadNumberBlockException, NonCommonBlockException, ReceiptCheckErrException, VMIllegalException, TooBigTransactionResultException, ZksnarkException, EventBloomException { - Args.setParam(new String[]{}, Constant.TEST_CONF); + Args.setParam(new String[]{}, TestConstants.TEST_CONF); long size = chainManager.getBlockStore().size(); System.out.print("block store size:" + size + "\n"); String key = PublicMethod.getRandomPrivateKey(); @@ -982,7 +983,7 @@ public void switchBack() BadBlockException, TaposException, BadNumberBlockException, NonCommonBlockException, ReceiptCheckErrException, VMIllegalException, TooBigTransactionResultException, ZksnarkException, EventBloomException { - Args.setParam(new String[]{}, Constant.TEST_CONF); + Args.setParam(new String[]{}, TestConstants.TEST_CONF); long size = chainManager.getBlockStore().size(); System.out.print("block store size:" + size + "\n"); String key = PublicMethod.getRandomPrivateKey();; diff --git a/framework/src/test/java/org/tron/core/db/MarketAccountStoreTest.java b/framework/src/test/java/org/tron/core/db/MarketAccountStoreTest.java index ed94a64175d..54f15a8e77f 100644 --- a/framework/src/test/java/org/tron/core/db/MarketAccountStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/MarketAccountStoreTest.java @@ -5,11 +5,11 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.MarketAccountOrderCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.MarketAccountStore; +import org.tron.common.TestConstants; public class MarketAccountStoreTest extends BaseTest { @@ -21,7 +21,7 @@ public class MarketAccountStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/MarketOrderStoreTest.java b/framework/src/test/java/org/tron/core/db/MarketOrderStoreTest.java index 1cfdb20da97..3a919b8eb2f 100644 --- a/framework/src/test/java/org/tron/core/db/MarketOrderStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/MarketOrderStoreTest.java @@ -5,12 +5,12 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.MarketOrderCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.MarketOrderStore; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class MarketOrderStoreTest extends BaseTest { @@ -22,7 +22,7 @@ public class MarketOrderStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/MarketPairPriceToOrderStoreTest.java b/framework/src/test/java/org/tron/core/db/MarketPairPriceToOrderStoreTest.java index d74229fb216..295b6d721da 100755 --- a/framework/src/test/java/org/tron/core/db/MarketPairPriceToOrderStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/MarketPairPriceToOrderStoreTest.java @@ -12,7 +12,6 @@ import org.tron.common.utils.ByteArray; import org.tron.common.utils.ByteUtil; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.capsule.MarketOrderIdListCapsule; import org.tron.core.capsule.utils.MarketUtils; import org.tron.core.config.args.Args; @@ -21,12 +20,13 @@ import org.tron.core.store.MarketPairToPriceStore; import org.tron.protos.Protocol.MarketOrderPair; import org.tron.protos.Protocol.MarketPrice; +import org.tron.common.TestConstants; @Slf4j public class MarketPairPriceToOrderStoreTest extends BaseTest { static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @After diff --git a/framework/src/test/java/org/tron/core/db/MarketPairToPriceStoreTest.java b/framework/src/test/java/org/tron/core/db/MarketPairToPriceStoreTest.java index adf315bb92e..37c31e5931b 100644 --- a/framework/src/test/java/org/tron/core/db/MarketPairToPriceStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/MarketPairToPriceStoreTest.java @@ -7,11 +7,11 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.MarketPairPriceToOrderStore; import org.tron.core.store.MarketPairToPriceStore; +import org.tron.common.TestConstants; public class MarketPairToPriceStoreTest extends BaseTest { @@ -26,7 +26,7 @@ public class MarketPairToPriceStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/NullifierStoreTest.java b/framework/src/test/java/org/tron/core/db/NullifierStoreTest.java index 6070182a5c1..e3fc44f6bec 100644 --- a/framework/src/test/java/org/tron/core/db/NullifierStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/NullifierStoreTest.java @@ -7,11 +7,11 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.NullifierStore; +import org.tron.common.TestConstants; public class NullifierStoreTest extends BaseTest { @@ -27,7 +27,7 @@ public class NullifierStoreTest extends BaseTest { static { Args.setParam(new String[]{"--output-directory", dbPath()}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); } @BeforeClass diff --git a/framework/src/test/java/org/tron/core/db/ProposalStoreTest.java b/framework/src/test/java/org/tron/core/db/ProposalStoreTest.java index b08402d33a0..df816c9375a 100644 --- a/framework/src/test/java/org/tron/core/db/ProposalStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/ProposalStoreTest.java @@ -10,12 +10,12 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.ProposalCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.ProposalStore; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class ProposalStoreTest extends BaseTest { @@ -27,7 +27,7 @@ public class ProposalStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/RecentBlockStoreTest.java b/framework/src/test/java/org/tron/core/db/RecentBlockStoreTest.java index 7856fe337a5..1edb611be00 100644 --- a/framework/src/test/java/org/tron/core/db/RecentBlockStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/RecentBlockStoreTest.java @@ -7,11 +7,11 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; +import org.tron.common.TestConstants; public class RecentBlockStoreTest extends BaseTest { @@ -23,7 +23,7 @@ public class RecentBlockStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/RecentTransactionStoreTest.java b/framework/src/test/java/org/tron/core/db/RecentTransactionStoreTest.java index 20447dfc6a1..d915ab997b3 100644 --- a/framework/src/test/java/org/tron/core/db/RecentTransactionStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/RecentTransactionStoreTest.java @@ -7,13 +7,13 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.BytesCapsule; import org.tron.core.capsule.TransactionCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; +import org.tron.common.TestConstants; public class RecentTransactionStoreTest extends BaseTest { @@ -25,7 +25,7 @@ public class RecentTransactionStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/TransactionExpireTest.java b/framework/src/test/java/org/tron/core/db/TransactionExpireTest.java index 420b54525e4..1f15366b47b 100644 --- a/framework/src/test/java/org/tron/core/db/TransactionExpireTest.java +++ b/framework/src/test/java/org/tron/core/db/TransactionExpireTest.java @@ -19,7 +19,6 @@ import org.tron.common.utils.LocalWitnesses; import org.tron.common.utils.PublicMethod; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.BlockCapsule; @@ -30,6 +29,7 @@ import org.tron.protos.Protocol.Transaction; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.contract.BalanceContract.TransferContract; +import org.tron.common.TestConstants; @Slf4j public class TransactionExpireTest { @@ -44,7 +44,7 @@ public class TransactionExpireTest { @Before public void init() throws IOException { Args.setParam(new String[] {"--output-directory", - temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); CommonParameter.PARAMETER.setMinEffectiveConnection(0); CommonParameter.getInstance().setP2pDisable(true); diff --git a/framework/src/test/java/org/tron/core/db/TransactionHistoryTest.java b/framework/src/test/java/org/tron/core/db/TransactionHistoryTest.java index c5c249b6f70..59c02cdec8b 100644 --- a/framework/src/test/java/org/tron/core/db/TransactionHistoryTest.java +++ b/framework/src/test/java/org/tron/core/db/TransactionHistoryTest.java @@ -7,11 +7,11 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.TransactionInfoCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.BadItemException; import org.tron.core.store.TransactionHistoryStore; +import org.tron.common.TestConstants; public class TransactionHistoryTest extends BaseTest { @@ -30,7 +30,7 @@ public class TransactionHistoryTest extends BaseTest { "--storage-db-directory", dbDirectory, "--storage-index-directory", indexDirectory }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/TransactionRetStoreTest.java b/framework/src/test/java/org/tron/core/db/TransactionRetStoreTest.java index b8aebe00aac..f47b8ad08d2 100644 --- a/framework/src/test/java/org/tron/core/db/TransactionRetStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/TransactionRetStoreTest.java @@ -7,7 +7,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.TransactionCapsule; import org.tron.core.capsule.TransactionInfoCapsule; import org.tron.core.capsule.TransactionRetCapsule; @@ -15,6 +14,7 @@ import org.tron.core.exception.BadItemException; import org.tron.core.store.TransactionRetStore; import org.tron.protos.Protocol.Transaction; +import org.tron.common.TestConstants; public class TransactionRetStoreTest extends BaseTest { @@ -34,7 +34,7 @@ public class TransactionRetStoreTest extends BaseTest { static { Args.setParam(new String[]{"--output-directory", dbPath(), "--storage-db-directory", dbDirectory, - "--storage-index-directory", indexDirectory}, Constant.TEST_CONF); + "--storage-index-directory", indexDirectory}, TestConstants.TEST_CONF); } @BeforeClass diff --git a/framework/src/test/java/org/tron/core/db/TransactionStoreTest.java b/framework/src/test/java/org/tron/core/db/TransactionStoreTest.java index 21d34fb7a69..896b9151494 100644 --- a/framework/src/test/java/org/tron/core/db/TransactionStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/TransactionStoreTest.java @@ -11,7 +11,6 @@ import org.tron.common.utils.ByteArray; import org.tron.common.utils.PublicMethod; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.BlockCapsule; @@ -26,6 +25,7 @@ import org.tron.protos.contract.WitnessContract.VoteWitnessContract; import org.tron.protos.contract.WitnessContract.VoteWitnessContract.Vote; import org.tron.protos.contract.WitnessContract.WitnessCreateContract; +import org.tron.common.TestConstants; public class TransactionStoreTest extends BaseTest { @@ -50,7 +50,7 @@ public class TransactionStoreTest extends BaseTest { */ @BeforeClass public static void init() { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); } /** diff --git a/framework/src/test/java/org/tron/core/db/TreeBlockIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/TreeBlockIndexStoreTest.java index 19d1329e580..92fa9b90592 100644 --- a/framework/src/test/java/org/tron/core/db/TreeBlockIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/TreeBlockIndexStoreTest.java @@ -5,11 +5,11 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.TreeBlockIndexStore; +import org.tron.common.TestConstants; public class TreeBlockIndexStoreTest extends BaseTest { @@ -21,7 +21,7 @@ public class TreeBlockIndexStoreTest extends BaseTest { new String[]{ "--output-directory", dbPath() }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/db/TronDatabaseTest.java b/framework/src/test/java/org/tron/core/db/TronDatabaseTest.java index f38f55df64d..25918ab87a0 100644 --- a/framework/src/test/java/org/tron/core/db/TronDatabaseTest.java +++ b/framework/src/test/java/org/tron/core/db/TronDatabaseTest.java @@ -11,10 +11,10 @@ import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.rocksdb.RocksDB; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.exception.BadItemException; import org.tron.core.exception.ItemNotFoundException; +import org.tron.common.TestConstants; public class TronDatabaseTest extends TronDatabase { @@ -27,7 +27,7 @@ public class TronDatabaseTest extends TronDatabase { @BeforeClass public static void initArgs() throws IOException { - Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); } @AfterClass diff --git a/framework/src/test/java/org/tron/core/db/TxCacheDBInitTest.java b/framework/src/test/java/org/tron/core/db/TxCacheDBInitTest.java index b976cf5f2da..7056b35c09c 100644 --- a/framework/src/test/java/org/tron/core/db/TxCacheDBInitTest.java +++ b/framework/src/test/java/org/tron/core/db/TxCacheDBInitTest.java @@ -11,12 +11,12 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; import org.tron.core.store.DynamicPropertiesStore; import org.tron.keystore.Wallet; +import org.tron.common.TestConstants; @Slf4j public class TxCacheDBInitTest { @@ -40,7 +40,7 @@ public static void destroy() { @BeforeClass public static void init() throws IOException { Args.setParam(new String[]{"--output-directory", temporaryFolder.newFolder().toString(), - "--p2p-disable", "true"}, Constant.TEST_CONF); + "--p2p-disable", "true"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); } diff --git a/framework/src/test/java/org/tron/core/db/TxCacheDBTest.java b/framework/src/test/java/org/tron/core/db/TxCacheDBTest.java index 4d223e726ca..0194aa618d5 100644 --- a/framework/src/test/java/org/tron/core/db/TxCacheDBTest.java +++ b/framework/src/test/java/org/tron/core/db/TxCacheDBTest.java @@ -5,10 +5,10 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.keystore.Wallet; +import org.tron.common.TestConstants; public class TxCacheDBTest extends BaseTest { @@ -20,7 +20,7 @@ public static void init() { String dbDirectory = "db_TransactionCache_test"; String indexDirectory = "index_TransactionCache_test"; Args.setParam(new String[]{"--output-directory", dbPath(), "--storage-db-directory", - dbDirectory, "--storage-index-directory", indexDirectory}, Constant.TEST_CONF); + dbDirectory, "--storage-index-directory", indexDirectory}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/db/VotesStoreTest.java b/framework/src/test/java/org/tron/core/db/VotesStoreTest.java index 48d4d1324db..81edc1fd501 100755 --- a/framework/src/test/java/org/tron/core/db/VotesStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/VotesStoreTest.java @@ -8,18 +8,18 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.VotesCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.VotesStore; import org.tron.protos.Protocol.Vote; +import org.tron.common.TestConstants; @Slf4j public class VotesStoreTest extends BaseTest { static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Resource diff --git a/framework/src/test/java/org/tron/core/db/WitnessScheduleStoreTest.java b/framework/src/test/java/org/tron/core/db/WitnessScheduleStoreTest.java index 7588b1c7add..aa1de420068 100644 --- a/framework/src/test/java/org/tron/core/db/WitnessScheduleStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/WitnessScheduleStoreTest.java @@ -10,9 +10,9 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.store.WitnessScheduleStore; +import org.tron.common.TestConstants; public class WitnessScheduleStoreTest extends BaseTest { @@ -31,7 +31,7 @@ public class WitnessScheduleStoreTest extends BaseTest { static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Before diff --git a/framework/src/test/java/org/tron/core/db/WitnessStoreTest.java b/framework/src/test/java/org/tron/core/db/WitnessStoreTest.java index d141a5fd790..fd01cab7333 100755 --- a/framework/src/test/java/org/tron/core/db/WitnessStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/WitnessStoreTest.java @@ -9,16 +9,16 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.WitnessCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.WitnessStore; +import org.tron.common.TestConstants; @Slf4j public class WitnessStoreTest extends BaseTest { static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Resource diff --git a/framework/src/test/java/org/tron/core/db/ZKProofStoreTest.java b/framework/src/test/java/org/tron/core/db/ZKProofStoreTest.java index a8aa07c4342..88bd186d6f2 100644 --- a/framework/src/test/java/org/tron/core/db/ZKProofStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/ZKProofStoreTest.java @@ -5,18 +5,18 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.TransactionCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.ZKProofStore; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; +import org.tron.common.TestConstants; public class ZKProofStoreTest extends BaseTest { static { Args.setParam(new String[]{"--output-directory", dbPath()}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); } @Autowired diff --git a/framework/src/test/java/org/tron/core/db2/ChainbaseTest.java b/framework/src/test/java/org/tron/core/db2/ChainbaseTest.java index ee9813be633..aeed04bb2d4 100644 --- a/framework/src/test/java/org/tron/core/db2/ChainbaseTest.java +++ b/framework/src/test/java/org/tron/core/db2/ChainbaseTest.java @@ -14,13 +14,13 @@ import org.tron.common.storage.leveldb.LevelDbDataSourceImpl; import org.tron.common.storage.rocksdb.RocksDbDataSourceImpl; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.db.common.DbSourceInter; import org.tron.core.db2.common.LevelDB; import org.tron.core.db2.core.Chainbase; import org.tron.core.db2.core.Snapshot; import org.tron.core.db2.core.SnapshotRoot; +import org.tron.common.TestConstants; @Slf4j public class ChainbaseTest { @@ -69,7 +69,7 @@ public static void destroy() { public void initDb() throws IOException { RocksDB.loadLibrary(); Args.setParam(new String[] {"--output-directory", - temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/db2/CheckpointV2Test.java b/framework/src/test/java/org/tron/core/db2/CheckpointV2Test.java index dff2d376fd5..e257f11a831 100644 --- a/framework/src/test/java/org/tron/core/db2/CheckpointV2Test.java +++ b/framework/src/test/java/org/tron/core/db2/CheckpointV2Test.java @@ -19,13 +19,13 @@ import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.FileUtil; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; import org.tron.core.db2.RevokingDbWithCacheNewValueTest.TestRevokingTronStore; import org.tron.core.db2.core.Chainbase; import org.tron.core.db2.core.SnapshotManager; +import org.tron.common.TestConstants; @Slf4j public class CheckpointV2Test { @@ -38,7 +38,7 @@ public class CheckpointV2Test { @Before public void init() { Args.setParam(new String[]{"-d", "output_SnapshotManager_test"}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); Args.getInstance().getStorage().setCheckpointVersion(2); Args.getInstance().getStorage().setCheckpointSync(true); context = new TronApplicationContext(DefaultConfig.class); diff --git a/framework/src/test/java/org/tron/core/db2/RevokingDbWithCacheNewValueTest.java b/framework/src/test/java/org/tron/core/db2/RevokingDbWithCacheNewValueTest.java index 2290df86978..c1d050bf1c4 100644 --- a/framework/src/test/java/org/tron/core/db2/RevokingDbWithCacheNewValueTest.java +++ b/framework/src/test/java/org/tron/core/db2/RevokingDbWithCacheNewValueTest.java @@ -18,7 +18,6 @@ import org.tron.common.utils.ByteArray; import org.tron.common.utils.FileUtil; import org.tron.common.utils.SessionOptional; -import org.tron.core.Constant; import org.tron.core.capsule.utils.MarketUtils; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; @@ -26,6 +25,7 @@ import org.tron.core.db2.SnapshotRootTest.ProtoCapsuleTest; import org.tron.core.db2.core.SnapshotManager; import org.tron.core.exception.RevokingStoreIllegalStateException; +import org.tron.common.TestConstants; @Slf4j public class RevokingDbWithCacheNewValueTest { @@ -41,7 +41,7 @@ public class RevokingDbWithCacheNewValueTest { public void init() { databasePath = "output_revokingStore_test_" + RandomStringUtils.randomAlphanumeric(10); Args.setParam(new String[]{"-d", databasePath}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); appT = ApplicationFactory.create(context); } diff --git a/framework/src/test/java/org/tron/core/db2/SnapshotImplTest.java b/framework/src/test/java/org/tron/core/db2/SnapshotImplTest.java index aab6f656b1f..b533dafe8c6 100644 --- a/framework/src/test/java/org/tron/core/db2/SnapshotImplTest.java +++ b/framework/src/test/java/org/tron/core/db2/SnapshotImplTest.java @@ -13,13 +13,13 @@ import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.FileUtil; -import org.tron.core.Constant; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; import org.tron.core.db2.core.Snapshot; import org.tron.core.db2.core.SnapshotImpl; import org.tron.core.db2.core.SnapshotManager; import org.tron.core.db2.core.SnapshotRoot; +import org.tron.common.TestConstants; public class SnapshotImplTest { private RevokingDbWithCacheNewValueTest.TestRevokingTronStore tronDatabase; @@ -29,7 +29,7 @@ public class SnapshotImplTest { @Before public void init() { - Args.setParam(new String[]{"-d", "output_revokingStore_test"}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", "output_revokingStore_test"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); appT = ApplicationFactory.create(context); diff --git a/framework/src/test/java/org/tron/core/db2/SnapshotManagerTest.java b/framework/src/test/java/org/tron/core/db2/SnapshotManagerTest.java index 134dc99e51c..fb143711f1b 100644 --- a/framework/src/test/java/org/tron/core/db2/SnapshotManagerTest.java +++ b/framework/src/test/java/org/tron/core/db2/SnapshotManagerTest.java @@ -21,7 +21,6 @@ import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.FileUtil; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; @@ -32,6 +31,7 @@ import org.tron.core.exception.BadItemException; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.exception.TronError; +import org.tron.common.TestConstants; @Slf4j public class SnapshotManagerTest { @@ -45,7 +45,7 @@ public class SnapshotManagerTest { @Before public void init() { Args.setParam(new String[]{"-d", "output_SnapshotManager_test"}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); appT = ApplicationFactory.create(context); revokingDatabase = context.getBean(SnapshotManager.class); diff --git a/framework/src/test/java/org/tron/core/db2/SnapshotRootTest.java b/framework/src/test/java/org/tron/core/db2/SnapshotRootTest.java index 70b4d9eff30..fce015bc6d9 100644 --- a/framework/src/test/java/org/tron/core/db2/SnapshotRootTest.java +++ b/framework/src/test/java/org/tron/core/db2/SnapshotRootTest.java @@ -21,7 +21,6 @@ import org.tron.common.cache.CacheStrategies; import org.tron.common.utils.FileUtil; import org.tron.common.utils.SessionOptional; -import org.tron.core.Constant; import org.tron.core.capsule.ProtoCapsule; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; @@ -30,6 +29,7 @@ import org.tron.core.db2.core.SnapshotManager; import org.tron.core.db2.core.SnapshotRoot; import org.tron.core.exception.ItemNotFoundException; +import org.tron.common.TestConstants; public class SnapshotRootTest { @@ -49,7 +49,7 @@ public class SnapshotRootTest { @Before public void init() { - Args.setParam(new String[]{"-d", "output_revokingStore_test"}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", "output_revokingStore_test"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); appT = ApplicationFactory.create(context); } diff --git a/framework/src/test/java/org/tron/core/event/BlockEventGetTest.java b/framework/src/test/java/org/tron/core/event/BlockEventGetTest.java index b6835cfcf82..a57f24d2ae5 100644 --- a/framework/src/test/java/org/tron/core/event/BlockEventGetTest.java +++ b/framework/src/test/java/org/tron/core/event/BlockEventGetTest.java @@ -29,7 +29,6 @@ import org.tron.common.utils.ReflectUtils; import org.tron.common.utils.Sha256Hash; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.TransactionRetCapsule; @@ -45,6 +44,7 @@ import org.tron.core.store.DynamicPropertiesStore; import org.tron.core.store.TransactionRetStore; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j public class BlockEventGetTest extends BlockGenerate { @@ -78,7 +78,7 @@ protected void initDbPath() throws IOException { public void before() throws IOException { initDbPath(); logger.info("Full node running."); - Args.setParam(new String[] {"-d", dbPath}, Constant.TEST_CONF); + Args.setParam(new String[] {"-d", dbPath}, TestConstants.TEST_CONF); Args.getInstance().setNodeListenPort(10000 + port.incrementAndGet()); context = new TronApplicationContext(DefaultConfig.class); diff --git a/framework/src/test/java/org/tron/core/exception/TronErrorTest.java b/framework/src/test/java/org/tron/core/exception/TronErrorTest.java index b4c3dc4b07f..876e9b1af6f 100644 --- a/framework/src/test/java/org/tron/core/exception/TronErrorTest.java +++ b/framework/src/test/java/org/tron/core/exception/TronErrorTest.java @@ -31,6 +31,7 @@ import org.tron.core.services.http.GetBlockServlet; import org.tron.core.services.http.RateLimiterServlet; import org.tron.core.zen.ZksnarkInitService; +import org.tron.common.TestConstants; @RunWith(MockitoJUnitRunner.class) public class TronErrorTest { @@ -81,14 +82,14 @@ public void LogLoadTest() throws IOException { @Test public void witnessInitTest() { TronError thrown = assertThrows(TronError.class, () -> { - Args.setParam(new String[]{"--witness"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--witness"}, TestConstants.TEST_CONF); }); assertEquals(TronError.ErrCode.WITNESS_INIT, thrown.getErrCode()); } @Test public void rateLimiterServletInitTest() { - Args.setParam(new String[]{}, Constant.TEST_CONF); + Args.setParam(new String[]{}, TestConstants.TEST_CONF); RateLimiterInitialization rateLimiter = new RateLimiterInitialization(); Args.getInstance().setRateLimiterInitialization(rateLimiter); Map item = new HashMap<>(); diff --git a/framework/src/test/java/org/tron/core/jsonrpc/BuildTransactionTest.java b/framework/src/test/java/org/tron/core/jsonrpc/BuildTransactionTest.java index 578d5869e31..a9ef7f78656 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/BuildTransactionTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/BuildTransactionTest.java @@ -8,7 +8,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.ContractCapsule; @@ -17,6 +16,7 @@ import org.tron.protos.Protocol; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.contract.SmartContractOuterClass.SmartContract; +import org.tron.common.TestConstants; @Slf4j public class BuildTransactionTest extends BaseTest { @@ -32,7 +32,7 @@ public class BuildTransactionTest extends BaseTest { private Wallet wallet; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; diff --git a/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java b/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java index 0f2214c5c9c..7221ab602a2 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java @@ -28,7 +28,6 @@ import org.tron.common.utils.ByteArray; import org.tron.common.utils.PublicMethod; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.BlockCapsule; @@ -48,6 +47,7 @@ import org.tron.protos.Protocol; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.contract.BalanceContract.TransferContract; +import org.tron.common.TestConstants; @Slf4j @@ -79,7 +79,7 @@ public class JsonrpcServiceTest extends BaseTest { private JsonRpcServiceOnSolidity jsonRpcServiceOnSolidity; static { - Args.setParam(new String[] {"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[] {"--output-directory", dbPath()}, TestConstants.TEST_CONF); CommonParameter.getInstance().setJsonRpcHttpFullNodeEnable(true); CommonParameter.getInstance().setJsonRpcHttpFullNodePort(PublicMethod.chooseRandomPort()); CommonParameter.getInstance().setJsonRpcHttpPBFTNodeEnable(true); diff --git a/framework/src/test/java/org/tron/core/jsonrpc/SectionBloomStoreTest.java b/framework/src/test/java/org/tron/core/jsonrpc/SectionBloomStoreTest.java index 111370bfffd..c21b835e236 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/SectionBloomStoreTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/SectionBloomStoreTest.java @@ -12,7 +12,6 @@ import org.tron.common.runtime.vm.DataWord; import org.tron.common.runtime.vm.LogInfo; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.TransactionRetCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.EventBloomException; @@ -22,6 +21,7 @@ import org.tron.core.store.SectionBloomStore; import org.tron.protos.Protocol.TransactionInfo; import org.tron.protos.Protocol.TransactionInfo.Log; +import org.tron.common.TestConstants; public class SectionBloomStoreTest extends BaseTest { @@ -29,7 +29,7 @@ public class SectionBloomStoreTest extends BaseTest { SectionBloomStore sectionBloomStore; static { - Args.setParam(new String[] {"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[] {"--output-directory", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java b/framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java index d460440184c..ea48c5074b1 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java @@ -8,7 +8,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; @@ -18,6 +17,7 @@ import org.tron.core.services.jsonrpc.TronJsonRpcImpl.RequestSource; import org.tron.core.services.jsonrpc.types.BuildArguments; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j public class WalletCursorTest extends BaseTest { @@ -30,7 +30,7 @@ public class WalletCursorTest extends BaseTest { private static boolean init; static { - Args.setParam(new String[]{"--output-directory", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF); OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc"; diff --git a/framework/src/test/java/org/tron/core/metrics/MetricsApiServiceTest.java b/framework/src/test/java/org/tron/core/metrics/MetricsApiServiceTest.java index e36029c6141..a6fdb0b66f8 100644 --- a/framework/src/test/java/org/tron/core/metrics/MetricsApiServiceTest.java +++ b/framework/src/test/java/org/tron/core/metrics/MetricsApiServiceTest.java @@ -12,12 +12,12 @@ import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; import org.tron.common.parameter.CommonParameter; -import org.tron.core.Constant; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; import org.tron.core.services.RpcApiService; import org.tron.program.Version; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j public class MetricsApiServiceTest { @@ -37,14 +37,14 @@ public class MetricsApiServiceTest { public void init() throws IOException { String dbPath = temporaryFolder.newFolder().toString(); Args.setParam(new String[]{"--output-directory", dbPath, "--debug"}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); Args.setParam( new String[]{ "--output-directory", dbPath, "--storage-db-directory", dbDirectory, "--storage-index-directory", indexDirectory }, - Constant.TEST_CONF + TestConstants.TEST_CONF ); CommonParameter parameter = Args.getInstance(); parameter.setNodeListenPort(port); diff --git a/framework/src/test/java/org/tron/core/metrics/prometheus/PrometheusApiServiceTest.java b/framework/src/test/java/org/tron/core/metrics/prometheus/PrometheusApiServiceTest.java index 195e4749209..5ed0653f083 100644 --- a/framework/src/test/java/org/tron/core/metrics/prometheus/PrometheusApiServiceTest.java +++ b/framework/src/test/java/org/tron/core/metrics/prometheus/PrometheusApiServiceTest.java @@ -27,7 +27,6 @@ import org.tron.common.utils.Utils; import org.tron.consensus.dpos.DposSlot; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.WitnessCapsule; @@ -35,6 +34,7 @@ import org.tron.core.consensus.ConsensusService; import org.tron.core.net.TronNetDelegate; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j(topic = "metric") public class PrometheusApiServiceTest extends BaseTest { @@ -55,7 +55,7 @@ public class PrometheusApiServiceTest extends BaseTest { private ChainBaseManager chainManager; static { - Args.setParam(new String[] {"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[] {"-d", dbPath()}, TestConstants.TEST_CONF); Args.getInstance().setNodeListenPort(10000 + port.incrementAndGet()); initParameter(Args.getInstance()); Metrics.init(); diff --git a/framework/src/test/java/org/tron/core/net/NodeTest.java b/framework/src/test/java/org/tron/core/net/NodeTest.java index 5f0e2c38b2b..edf1cc162db 100644 --- a/framework/src/test/java/org/tron/core/net/NodeTest.java +++ b/framework/src/test/java/org/tron/core/net/NodeTest.java @@ -12,7 +12,6 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; -import org.tron.core.Constant; import org.tron.core.config.Configuration; import org.tron.core.config.args.Args; import org.tron.p2p.discover.Node; @@ -20,6 +19,7 @@ import org.tron.p2p.dns.update.PublishConfig; import org.tron.p2p.utils.NetUtil; import org.tron.protos.Discover.Endpoint; +import org.tron.common.TestConstants; @Slf4j public class NodeTest { @@ -79,7 +79,7 @@ public void testEndpointFromNode() { @Test public void testPublishConfig() { - Config config = Configuration.getByFileName(Constant.TEST_CONF, Constant.TEST_CONF); + Config config = Configuration.getByFileName(TestConstants.TEST_CONF, TestConstants.TEST_CONF); PublishConfig publishConfig = new PublishConfig(); Assert.assertFalse(publishConfig.isDnsPublishEnable()); diff --git a/framework/src/test/java/org/tron/core/net/P2pEventHandlerImplTest.java b/framework/src/test/java/org/tron/core/net/P2pEventHandlerImplTest.java index e0c816a537a..c34377aab28 100644 --- a/framework/src/test/java/org/tron/core/net/P2pEventHandlerImplTest.java +++ b/framework/src/test/java/org/tron/core/net/P2pEventHandlerImplTest.java @@ -25,7 +25,7 @@ public class P2pEventHandlerImplTest { @Test public void testProcessInventoryMessage() throws Exception { String[] a = new String[0]; - Args.setParam(a, Constant.TESTNET_CONF); + Args.setParam(a, Constant.NET_CONF); CommonParameter parameter = CommonParameter.getInstance(); parameter.setMaxTps(10); @@ -115,7 +115,7 @@ public void testProcessInventoryMessage() throws Exception { @Test public void testUpdateLastInteractiveTime() throws Exception { String[] a = new String[0]; - Args.setParam(a, Constant.TESTNET_CONF); + Args.setParam(a, Constant.NET_CONF); PeerConnection peer = new PeerConnection(); P2pEventHandlerImpl p2pEventHandler = new P2pEventHandlerImpl(); diff --git a/framework/src/test/java/org/tron/core/net/TronNetDelegateTest.java b/framework/src/test/java/org/tron/core/net/TronNetDelegateTest.java index 6550766d702..c23284d8151 100644 --- a/framework/src/test/java/org/tron/core/net/TronNetDelegateTest.java +++ b/framework/src/test/java/org/tron/core/net/TronNetDelegateTest.java @@ -9,15 +9,15 @@ import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.Sha256Hash; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class TronNetDelegateTest { @Test public void test() throws Exception { - Args.setParam(new String[] {}, Constant.TEST_CONF); + Args.setParam(new String[] {}, TestConstants.TEST_CONF); CommonParameter parameter = Args.getInstance(); Args.logConfig(); parameter.setUnsolidifiedBlockCheck(true); diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/BlockMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/BlockMsgHandlerTest.java index 48e7d730520..0b49f3e3f28 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/BlockMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/BlockMsgHandlerTest.java @@ -34,6 +34,7 @@ import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol.Inventory.InventoryType; import org.tron.protos.Protocol.Transaction; +import org.tron.common.TestConstants; @Slf4j public class BlockMsgHandlerTest extends BaseTest { @@ -49,7 +50,7 @@ public class BlockMsgHandlerTest extends BaseTest { @BeforeClass public static void init() { Args.setParam(new String[] {"--output-directory", dbPath(), "--debug"}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); } @Before diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/InventoryMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/InventoryMsgHandlerTest.java index 0864c872bc3..045314da9b0 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/InventoryMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/InventoryMsgHandlerTest.java @@ -8,20 +8,20 @@ import java.util.ArrayList; import org.junit.Test; import org.mockito.Mockito; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.net.TronNetDelegate; import org.tron.core.net.message.adv.InventoryMessage; import org.tron.core.net.peer.PeerConnection; import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol.Inventory.InventoryType; +import org.tron.common.TestConstants; public class InventoryMsgHandlerTest { @Test public void testProcessMessage() throws Exception { InventoryMsgHandler handler = new InventoryMsgHandler(); - Args.setParam(new String[] {}, Constant.TEST_CONF); + Args.setParam(new String[] {}, TestConstants.TEST_CONF); Args.logConfig(); InventoryMessage msg = new InventoryMessage(new ArrayList<>(), InventoryType.TRX); diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/MessageHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/MessageHandlerTest.java index 7ff29b54bb7..aad32d373c5 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/MessageHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/MessageHandlerTest.java @@ -20,7 +20,6 @@ import org.tron.common.utils.ReflectUtils; import org.tron.common.utils.Sha256Hash; import org.tron.consensus.pbft.message.PbftMessage; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; @@ -32,6 +31,7 @@ import org.tron.p2p.P2pConfig; import org.tron.p2p.base.Parameter; import org.tron.p2p.connection.Channel; +import org.tron.common.TestConstants; public class MessageHandlerTest { @@ -47,7 +47,7 @@ public class MessageHandlerTest { @BeforeClass public static void init() throws Exception { Args.setParam(new String[] {"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); p2pEventHandler = context.getBean(P2pEventHandlerImpl.class); ctx = (ApplicationContext) ReflectUtils.getFieldObject(p2pEventHandler, "ctx"); diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/PbftMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/PbftMsgHandlerTest.java index 8b9d1969cfc..7a1e9883a84 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/PbftMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/PbftMsgHandlerTest.java @@ -24,7 +24,6 @@ import org.tron.common.utils.Sha256Hash; import org.tron.consensus.base.Param; import org.tron.consensus.pbft.message.PbftMessage; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; @@ -39,6 +38,7 @@ import org.tron.p2p.base.Parameter; import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class PbftMsgHandlerTest { @@ -50,7 +50,7 @@ public class PbftMsgHandlerTest { @BeforeClass public static void init() { Args.setParam(new String[] {"--output-directory", dbPath, "--debug"}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); TronNetService tronNetService = context.getBean(TronNetService.class); diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/SyncBlockChainMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/SyncBlockChainMsgHandlerTest.java index e654e1c9cc2..87074ebcc44 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/SyncBlockChainMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/SyncBlockChainMsgHandlerTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.tron.common.application.TronApplicationContext; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.BlockCapsule.BlockId; import org.tron.core.config.DefaultConfig; @@ -23,6 +22,7 @@ import org.tron.core.net.message.sync.SyncBlockChainMessage; import org.tron.core.net.peer.PeerConnection; import org.tron.p2p.connection.Channel; +import org.tron.common.TestConstants; public class SyncBlockChainMsgHandlerTest { @@ -35,7 +35,7 @@ public class SyncBlockChainMsgHandlerTest { @Before public void init() throws Exception { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); handler = context.getBean(SyncBlockChainMsgHandler.class); peer = context.getBean(PeerConnection.class); diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java index 54e5f78d85a..a5274e226d1 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java @@ -19,7 +19,6 @@ import org.tron.common.BaseTest; import org.tron.common.runtime.TvmTestUtils; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.net.TronNetDelegate; import org.tron.core.net.message.adv.TransactionMessage; @@ -29,12 +28,13 @@ import org.tron.core.net.service.adv.AdvService; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; +import org.tron.common.TestConstants; public class TransactionsMsgHandlerTest extends BaseTest { @BeforeClass public static void init() { Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); } diff --git a/framework/src/test/java/org/tron/core/net/peer/PeerStatusCheckTest.java b/framework/src/test/java/org/tron/core/net/peer/PeerStatusCheckTest.java index 53e678c7ca4..09c9b468aeb 100644 --- a/framework/src/test/java/org/tron/core/net/peer/PeerStatusCheckTest.java +++ b/framework/src/test/java/org/tron/core/net/peer/PeerStatusCheckTest.java @@ -15,12 +15,12 @@ import org.mockito.Mockito; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ReflectUtils; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule.BlockId; import org.tron.core.config.DefaultConfig; import org.tron.core.config.Parameter.NetConstants; import org.tron.core.config.args.Args; import org.tron.p2p.connection.Channel; +import org.tron.common.TestConstants; public class PeerStatusCheckTest { @@ -33,7 +33,7 @@ public class PeerStatusCheckTest { @Before public void init() throws IOException { Args.setParam(new String[] {"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); service = context.getBean(PeerStatusCheck.class); } diff --git a/framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java b/framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java index 04a6315f522..ae4f7f62a30 100644 --- a/framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java @@ -17,7 +17,6 @@ import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ReflectUtils; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; @@ -31,6 +30,7 @@ import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol; import org.tron.protos.Protocol.Inventory.InventoryType; +import org.tron.common.TestConstants; public class AdvServiceTest { private static TronApplicationContext context; @@ -44,7 +44,7 @@ public class AdvServiceTest { @BeforeClass public static void init() throws IOException { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); service = context.getBean(AdvService.class); p2pEventHandler = context.getBean(P2pEventHandlerImpl.class); diff --git a/framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java b/framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java index 9104b087d26..e051c6b0fd4 100644 --- a/framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java @@ -11,12 +11,12 @@ import org.junit.rules.TemporaryFolder; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ReflectUtils; -import org.tron.core.Constant; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; import org.tron.core.net.TronNetService; import org.tron.core.net.service.effective.EffectiveCheckService; import org.tron.p2p.P2pConfig; +import org.tron.common.TestConstants; public class EffectiveCheckServiceTest { @@ -29,7 +29,7 @@ public class EffectiveCheckServiceTest { @Before public void init() throws IOException { Args.setParam(new String[] {"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); service = context.getBean(EffectiveCheckService.class); } diff --git a/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java b/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java index f4fabce5d64..06d83193f25 100644 --- a/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java @@ -25,7 +25,6 @@ import org.tron.common.utils.ReflectUtils; import org.tron.common.utils.Sha256Hash; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; @@ -43,6 +42,7 @@ import org.tron.protos.Discover.Endpoint; import org.tron.protos.Protocol; import org.tron.protos.Protocol.HelloMessage.Builder; +import org.tron.common.TestConstants; public class HandShakeServiceTest { @@ -56,7 +56,7 @@ public class HandShakeServiceTest { @BeforeClass public static void init() throws Exception { Args.setParam(new String[] {"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); p2pEventHandler = context.getBean(P2pEventHandlerImpl.class); ctx = (ApplicationContext) ReflectUtils.getFieldObject(p2pEventHandler, "ctx"); diff --git a/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java b/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java index 5e22e538e80..208c64cf223 100644 --- a/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java @@ -23,7 +23,6 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ReflectUtils; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.WitnessCapsule; import org.tron.core.config.args.Args; @@ -38,6 +37,7 @@ import org.tron.p2p.discover.Node; import org.tron.p2p.utils.NetUtil; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j(topic = "net") public class RelayServiceTest extends BaseTest { @@ -55,7 +55,7 @@ public class RelayServiceTest extends BaseTest { @BeforeClass public static void init() { Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, - Constant.TEST_CONF); + TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/net/services/ResilienceServiceTest.java b/framework/src/test/java/org/tron/core/net/services/ResilienceServiceTest.java index ce723e5c991..7c5c14f58dd 100644 --- a/framework/src/test/java/org/tron/core/net/services/ResilienceServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/ResilienceServiceTest.java @@ -18,13 +18,13 @@ import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ReflectUtils; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; import org.tron.core.net.peer.PeerConnection; import org.tron.core.net.peer.PeerManager; import org.tron.core.net.service.effective.ResilienceService; import org.tron.p2p.connection.Channel; +import org.tron.common.TestConstants; public class ResilienceServiceTest { @@ -38,7 +38,7 @@ public class ResilienceServiceTest { @Before public void init() throws IOException { Args.setParam(new String[] {"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); chainBaseManager = context.getBean(ChainBaseManager.class); service = context.getBean(ResilienceService.class); diff --git a/framework/src/test/java/org/tron/core/net/services/SyncServiceTest.java b/framework/src/test/java/org/tron/core/net/services/SyncServiceTest.java index c2883fb349d..7b7058b9bbf 100644 --- a/framework/src/test/java/org/tron/core/net/services/SyncServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/SyncServiceTest.java @@ -19,7 +19,6 @@ import org.springframework.context.ApplicationContext; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ReflectUtils; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; @@ -31,6 +30,7 @@ import org.tron.core.net.service.sync.SyncService; import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class SyncServiceTest { protected TronApplicationContext context; @@ -52,7 +52,7 @@ public SyncServiceTest() { @Before public void init() throws Exception { Args.setParam(new String[]{"--output-directory", - temporaryFolder.newFolder().toString(), "--debug"}, Constant.TEST_CONF); + temporaryFolder.newFolder().toString(), "--debug"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); service = context.getBean(SyncService.class); p2pEventHandler = context.getBean(P2pEventHandlerImpl.class); diff --git a/framework/src/test/java/org/tron/core/pbft/PbftApiTest.java b/framework/src/test/java/org/tron/core/pbft/PbftApiTest.java index 3d5096a5702..ddb4e6575b2 100755 --- a/framework/src/test/java/org/tron/core/pbft/PbftApiTest.java +++ b/framework/src/test/java/org/tron/core/pbft/PbftApiTest.java @@ -22,13 +22,13 @@ import org.tron.common.utils.Sha256Hash; import org.tron.common.utils.Utils; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.args.Args; import org.tron.core.db.CommonDataBase; import org.tron.core.db2.ISession; import org.tron.core.services.interfaceOnPBFT.http.PBFT.HttpApiOnPBFTService; import org.tron.core.store.DynamicPropertiesStore; +import org.tron.common.TestConstants; @Slf4j public class PbftApiTest extends BaseTest { @@ -37,7 +37,7 @@ public class PbftApiTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); CommonParameter.getInstance().setPBFTHttpEnable(true); CommonParameter.getInstance().setPBFTHttpPort(PublicMethod.chooseRandomPort()); } diff --git a/framework/src/test/java/org/tron/core/services/ComputeRewardTest.java b/framework/src/test/java/org/tron/core/services/ComputeRewardTest.java index c2caafd393c..449cab4ef73 100644 --- a/framework/src/test/java/org/tron/core/services/ComputeRewardTest.java +++ b/framework/src/test/java/org/tron/core/services/ComputeRewardTest.java @@ -23,7 +23,6 @@ import org.tron.common.es.ExecutorServiceManager; import org.tron.common.utils.ByteArray; import org.tron.common.utils.ReflectUtils; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.BytesCapsule; import org.tron.core.capsule.WitnessCapsule; @@ -38,6 +37,7 @@ import org.tron.core.store.RewardViStore; import org.tron.core.store.WitnessStore; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class ComputeRewardTest { @@ -126,7 +126,7 @@ public void destroy() { @Before public void init() throws IOException { Args.setParam(new String[]{"--output-directory", temporaryFolder.newFolder().toString(), - "--p2p-disable", "true"}, Constant.TEST_CONF); + "--p2p-disable", "true"}, TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); propertiesStore = context.getBean(DynamicPropertiesStore.class); delegationStore = context.getBean(DelegationStore.class); diff --git a/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java b/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java index 300a38a0916..4c8f13daa30 100644 --- a/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java +++ b/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java @@ -13,12 +13,12 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.capsule.ProposalCapsule; import org.tron.core.config.args.Args; import org.tron.core.consensus.ProposalService; import org.tron.core.utils.ProposalUtil.ProposalType; import org.tron.protos.Protocol.Proposal; +import org.tron.common.TestConstants; @Slf4j public class ProposalServiceTest extends BaseTest { @@ -27,7 +27,7 @@ public class ProposalServiceTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } diff --git a/framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java b/framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java index 3ae090d3caf..7fb1ba4a50a 100644 --- a/framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java +++ b/framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java @@ -52,7 +52,6 @@ import org.tron.common.utils.ByteArray; import org.tron.common.utils.PublicMethod; import org.tron.common.utils.Sha256Hash; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.BlockCapsule; @@ -108,6 +107,7 @@ import org.tron.protos.contract.WitnessContract.VoteWitnessContract; import org.tron.protos.contract.WitnessContract.WitnessCreateContract; import org.tron.protos.contract.WitnessContract.WitnessUpdateContract; +import org.tron.common.TestConstants; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class RpcApiServicesTest { @@ -132,7 +132,7 @@ public class RpcApiServicesTest { @BeforeClass public static void init() throws IOException { - Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); String OWNER_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc"; getInstance().setRpcEnable(true); diff --git a/framework/src/test/java/org/tron/core/services/WalletApiTest.java b/framework/src/test/java/org/tron/core/services/WalletApiTest.java index 8890d4bfd9e..68ba6cfbd88 100644 --- a/framework/src/test/java/org/tron/core/services/WalletApiTest.java +++ b/framework/src/test/java/org/tron/core/services/WalletApiTest.java @@ -15,9 +15,9 @@ import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.PublicMethod; -import org.tron.core.Constant; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; @Slf4j @@ -33,7 +33,7 @@ public class WalletApiTest { @BeforeClass public static void init() throws IOException { Args.setParam(new String[]{ "-d", temporaryFolder.newFolder().toString(), - "--p2p-disable", "true"}, Constant.TEST_CONF); + "--p2p-disable", "true"}, TestConstants.TEST_CONF); Args.getInstance().setRpcPort(PublicMethod.chooseRandomPort()); Args.getInstance().setRpcEnable(true); context = new TronApplicationContext(DefaultConfig.class); diff --git a/framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java b/framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java index 420d890aa48..2c546409fec 100644 --- a/framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java +++ b/framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java @@ -18,11 +18,11 @@ import org.tron.common.BaseTest; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.PublicMethod; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.services.http.FullNodeHttpApiService; import org.tron.core.services.interfaceOnPBFT.http.PBFT.HttpApiOnPBFTService; import org.tron.core.services.interfaceOnSolidity.http.solidity.HttpApiOnSolidityService; +import org.tron.common.TestConstants; public class HttpApiAccessFilterTest extends BaseTest { @@ -37,7 +37,7 @@ public class HttpApiAccessFilterTest extends BaseTest { private static final CloseableHttpClient httpClient = HttpClients.createDefault(); static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); Args.getInstance().setFullNodeAllowShieldedTransactionArgs(false); Args.getInstance().setFullNodeHttpEnable(true); Args.getInstance().setFullNodeHttpPort(PublicMethod.chooseRandomPort()); diff --git a/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java b/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java index 84869ea0750..5c62efe1dd8 100644 --- a/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java +++ b/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java @@ -22,12 +22,12 @@ import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.PublicMethod; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; import org.tron.core.services.RpcApiService; import org.tron.core.services.interfaceOnPBFT.RpcApiServiceOnPBFT; import org.tron.core.services.interfaceOnSolidity.RpcApiServiceOnSolidity; +import org.tron.common.TestConstants; @Slf4j public class LiteFnQueryGrpcInterceptorTest { @@ -54,7 +54,7 @@ public class LiteFnQueryGrpcInterceptorTest { */ @BeforeClass public static void init() throws IOException { - Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); Args.getInstance().setRpcEnable(true); Args.getInstance().setRpcPort(PublicMethod.chooseRandomPort()); Args.getInstance().setRpcSolidityEnable(true); diff --git a/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryHttpFilterTest.java b/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryHttpFilterTest.java index 0f0bdf1eb1f..4b1a91106f7 100644 --- a/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryHttpFilterTest.java +++ b/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryHttpFilterTest.java @@ -19,8 +19,8 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.PublicMethod; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; @Slf4j public class LiteFnQueryHttpFilterTest extends BaseTest { @@ -30,7 +30,7 @@ public class LiteFnQueryHttpFilterTest extends BaseTest { private final CloseableHttpClient httpClient = HttpClients.createDefault(); static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); Args.getInstance().setFullNodeAllowShieldedTransactionArgs(false); Args.getInstance().setRpcEnable(false); Args.getInstance().setRpcSolidityEnable(false); diff --git a/framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java b/framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java index 900ca304e7d..12fab79cedc 100644 --- a/framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java +++ b/framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java @@ -32,13 +32,13 @@ import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.PublicMethod; -import org.tron.core.Constant; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; import org.tron.core.services.RpcApiService; import org.tron.core.services.interfaceOnPBFT.RpcApiServiceOnPBFT; import org.tron.core.services.interfaceOnSolidity.RpcApiServiceOnSolidity; import org.tron.protos.Protocol.Transaction; +import org.tron.common.TestConstants; @Slf4j public class RpcApiAccessInterceptorTest { @@ -55,7 +55,7 @@ public class RpcApiAccessInterceptorTest { */ @BeforeClass public static void init() throws IOException { - Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, Constant.TEST_CONF); + Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); Args.getInstance().setRpcEnable(true); Args.getInstance().setRpcPort(PublicMethod.chooseRandomPort()); Args.getInstance().setRpcSolidityEnable(true); diff --git a/framework/src/test/java/org/tron/core/services/http/ClearABIServletTest.java b/framework/src/test/java/org/tron/core/services/http/ClearABIServletTest.java index a3a051ec6c9..89bc6fc59bd 100644 --- a/framework/src/test/java/org/tron/core/services/http/ClearABIServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/ClearABIServletTest.java @@ -19,10 +19,10 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.ContractCapsule; import org.tron.core.config.args.Args; import org.tron.protos.contract.SmartContractOuterClass; +import org.tron.common.TestConstants; public class ClearABIServletTest extends BaseTest { @@ -30,7 +30,7 @@ public class ClearABIServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/CreateAccountServletTest.java b/framework/src/test/java/org/tron/core/services/http/CreateAccountServletTest.java index bbc00ce81f0..c72bde13d4e 100644 --- a/framework/src/test/java/org/tron/core/services/http/CreateAccountServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/CreateAccountServletTest.java @@ -18,10 +18,10 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class CreateAccountServletTest extends BaseTest { @@ -30,7 +30,7 @@ public class CreateAccountServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/CreateAssetIssueServletTest.java b/framework/src/test/java/org/tron/core/services/http/CreateAssetIssueServletTest.java index 4c70eb9252c..413b585e58f 100644 --- a/framework/src/test/java/org/tron/core/services/http/CreateAssetIssueServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/CreateAssetIssueServletTest.java @@ -18,10 +18,10 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class CreateAssetIssueServletTest extends BaseTest { @@ -29,7 +29,7 @@ public class CreateAssetIssueServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/CreateSpendAuthSigServletTest.java b/framework/src/test/java/org/tron/core/services/http/CreateSpendAuthSigServletTest.java index 301e4472e69..dc6e8a5df05 100644 --- a/framework/src/test/java/org/tron/core/services/http/CreateSpendAuthSigServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/CreateSpendAuthSigServletTest.java @@ -13,8 +13,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class CreateSpendAuthSigServletTest extends BaseTest { @@ -22,7 +22,7 @@ public class CreateSpendAuthSigServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/CreateWitnessServletTest.java b/framework/src/test/java/org/tron/core/services/http/CreateWitnessServletTest.java index 6cd6e9e2482..b745dbaa966 100644 --- a/framework/src/test/java/org/tron/core/services/http/CreateWitnessServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/CreateWitnessServletTest.java @@ -20,11 +20,11 @@ import org.tron.common.crypto.ECKey; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Utils; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.WitnessCapsule; import org.tron.core.config.args.Args; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class CreateWitnessServletTest extends BaseTest { @@ -35,7 +35,7 @@ public class CreateWitnessServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/GetAccountByIdServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetAccountByIdServletTest.java index 38c23a971ff..64922ef7aa8 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetAccountByIdServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetAccountByIdServletTest.java @@ -8,8 +8,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetAccountByIdServletTest extends BaseTest { @@ -17,7 +17,7 @@ public class GetAccountByIdServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/GetAssetIssueListServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetAssetIssueListServletTest.java index 71a2d4fa5d5..f3b80559dc2 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetAssetIssueListServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetAssetIssueListServletTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetAssetIssueListServletTest extends BaseTest { @@ -22,7 +22,7 @@ public class GetAssetIssueListServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/GetBandwidthPricesServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetBandwidthPricesServletTest.java index 40ef8ad068f..0c8348101eb 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetBandwidthPricesServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetBandwidthPricesServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetBandwidthPricesServletTest extends BaseTest { @@ -24,7 +24,7 @@ public class GetBandwidthPricesServletTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/services/http/GetBlockByIdServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetBlockByIdServletTest.java index 8b213e12640..fbac7884bab 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetBlockByIdServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetBlockByIdServletTest.java @@ -12,8 +12,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetBlockByIdServletTest extends BaseTest { @@ -24,7 +24,7 @@ public class GetBlockByIdServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/GetBlockByNumServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetBlockByNumServletTest.java index 5ff84c54dbe..c3039f6dd6d 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetBlockByNumServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetBlockByNumServletTest.java @@ -13,8 +13,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetBlockByNumServletTest extends BaseTest { @@ -25,7 +25,7 @@ public class GetBlockByNumServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/GetBrokerageServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetBrokerageServletTest.java index ffe8cc6c22e..966005c0961 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetBrokerageServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetBrokerageServletTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetBrokerageServletTest extends BaseTest { @@ -22,7 +22,7 @@ public class GetBrokerageServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/GetEnergyPricesServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetEnergyPricesServletTest.java index 34e93c557f5..9e76cdf8492 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetEnergyPricesServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetEnergyPricesServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetEnergyPricesServletTest extends BaseTest { @@ -24,7 +24,7 @@ public class GetEnergyPricesServletTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/services/http/GetMemoFeePricesServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetMemoFeePricesServletTest.java index a954f4f4f8f..f3438b3fc6e 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetMemoFeePricesServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetMemoFeePricesServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetMemoFeePricesServletTest extends BaseTest { @@ -24,7 +24,7 @@ public class GetMemoFeePricesServletTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"-d",dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d",dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/services/http/GetNowBlockServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetNowBlockServletTest.java index 3ee3d5a7052..655ed6c4af1 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetNowBlockServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetNowBlockServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetNowBlockServletTest extends BaseTest { @@ -26,7 +26,7 @@ public class GetNowBlockServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/GetRewardServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetRewardServletTest.java index 404e154a4c3..cc48cd97292 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetRewardServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetRewardServletTest.java @@ -18,11 +18,11 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; import org.tron.common.utils.FileUtil; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.db.Manager; import org.tron.core.service.MortgageService; import org.tron.core.store.DelegationStore; +import org.tron.common.TestConstants; @Slf4j public class GetRewardServletTest extends BaseTest { @@ -43,7 +43,7 @@ public class GetRewardServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByBlockNumServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByBlockNumServletTest.java index 0a1a2e4ac5a..dfab71fa140 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByBlockNumServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByBlockNumServletTest.java @@ -17,12 +17,12 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.capsule.TransactionInfoCapsule; import org.tron.core.capsule.TransactionRetCapsule; import org.tron.core.config.args.Args; import org.tron.core.db.TransactionStoreTest; +import org.tron.common.TestConstants; public class GetTransactionInfoByBlockNumServletTest extends BaseTest { @@ -35,7 +35,7 @@ public class GetTransactionInfoByBlockNumServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByIdServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByIdServletTest.java index 900c41c7df8..786b537db28 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByIdServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByIdServletTest.java @@ -17,7 +17,6 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.TransactionCapsule; @@ -29,6 +28,7 @@ import org.tron.core.store.TransactionRetStore; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; +import org.tron.common.TestConstants; public class GetTransactionInfoByIdServletTest extends BaseTest { @@ -50,7 +50,7 @@ public class GetTransactionInfoByIdServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/GetTransactionListFromPendingServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetTransactionListFromPendingServletTest.java index 614d520280d..07692dfd387 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetTransactionListFromPendingServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetTransactionListFromPendingServletTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetTransactionListFromPendingServletTest extends BaseTest { @@ -23,7 +23,7 @@ public class GetTransactionListFromPendingServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/ListNodesServletTest.java b/framework/src/test/java/org/tron/core/services/http/ListNodesServletTest.java index 1f491ca11db..ab24f333e3d 100644 --- a/framework/src/test/java/org/tron/core/services/http/ListNodesServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/ListNodesServletTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class ListNodesServletTest extends BaseTest { @@ -22,7 +22,7 @@ public class ListNodesServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/ListProposalsServletTest.java b/framework/src/test/java/org/tron/core/services/http/ListProposalsServletTest.java index aa3a1817a3e..f6d7b0eb1ff 100644 --- a/framework/src/test/java/org/tron/core/services/http/ListProposalsServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/ListProposalsServletTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class ListProposalsServletTest extends BaseTest { @@ -22,7 +22,7 @@ public class ListProposalsServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/TriggerSmartContractServletTest.java b/framework/src/test/java/org/tron/core/services/http/TriggerSmartContractServletTest.java index c6fa5da76e4..b00115b180c 100644 --- a/framework/src/test/java/org/tron/core/services/http/TriggerSmartContractServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/TriggerSmartContractServletTest.java @@ -12,7 +12,6 @@ import org.tron.common.utils.ByteArray; import org.tron.common.utils.PublicMethod; import org.tron.common.utils.client.utils.HttpMethed; -import org.tron.core.Constant; import org.tron.core.capsule.ContractCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.StoreFactory; @@ -20,6 +19,7 @@ import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol; import org.tron.protos.contract.SmartContractOuterClass; +import org.tron.common.TestConstants; @Slf4j public class TriggerSmartContractServletTest extends BaseTest { @@ -31,7 +31,7 @@ public class TriggerSmartContractServletTest extends BaseTest { @BeforeClass public static void init() throws Exception { Args.setParam( - new String[]{"--output-directory", dbPath(), "--debug"}, Constant.TEST_CONF); + new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); Args.getInstance().needSyncCheck = false; Args.getInstance().setFullNodeHttpEnable(true); Args.getInstance().setFullNodeHttpPort(PublicMethod.chooseRandomPort()); diff --git a/framework/src/test/java/org/tron/core/services/http/UpdateAccountServletTest.java b/framework/src/test/java/org/tron/core/services/http/UpdateAccountServletTest.java index e5064e2013b..ce45d45aefa 100644 --- a/framework/src/test/java/org/tron/core/services/http/UpdateAccountServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/UpdateAccountServletTest.java @@ -9,8 +9,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class UpdateAccountServletTest extends BaseTest { @@ -18,7 +18,7 @@ public class UpdateAccountServletTest extends BaseTest { Args.setParam( new String[]{ "--output-directory", dbPath(), - }, Constant.TEST_CONF + }, TestConstants.TEST_CONF ); } diff --git a/framework/src/test/java/org/tron/core/services/http/UtilTest.java b/framework/src/test/java/org/tron/core/services/http/UtilTest.java index 5d9d8092b22..083f4550dc0 100644 --- a/framework/src/test/java/org/tron/core/services/http/UtilTest.java +++ b/framework/src/test/java/org/tron/core/services/http/UtilTest.java @@ -9,13 +9,13 @@ import org.tron.api.GrpcAPI.TransactionSignWeight; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.core.utils.TransactionUtil; import org.tron.protos.Protocol; import org.tron.protos.Protocol.Transaction; +import org.tron.common.TestConstants; public class UtilTest extends BaseTest { @@ -28,7 +28,7 @@ public class UtilTest extends BaseTest { static { OWNER_ADDRESS = Wallet.getAddressPreFixString() + "c076305e35aea1fe45a772fcaaab8a36e87bdb55"; - Args.setParam(new String[] {"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[] {"-d", dbPath()}, TestConstants.TEST_CONF); } @Before diff --git a/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServletTest.java b/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServletTest.java index a8e07b743c5..e5c903f559e 100644 --- a/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServletTest.java +++ b/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetBandwidthPricesOnPBFTServletTest extends BaseTest { @@ -24,7 +24,7 @@ public class GetBandwidthPricesOnPBFTServletTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServletTest.java b/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServletTest.java index 8785618bdbe..af6f0be9ad9 100644 --- a/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServletTest.java +++ b/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetEnergyPricesOnPBFTServletTest extends BaseTest { @@ -24,7 +24,7 @@ public class GetEnergyPricesOnPBFTServletTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServletTest.java b/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServletTest.java index 4b1ace08970..617d4e5c494 100644 --- a/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServletTest.java +++ b/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetBandwidthPricesOnSolidityServletTest extends BaseTest { @@ -24,7 +24,7 @@ public class GetBandwidthPricesOnSolidityServletTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetEnergyPricesOnSolidityServletTest.java b/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetEnergyPricesOnSolidityServletTest.java index 6a26f9bc861..2d2570d23d2 100644 --- a/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetEnergyPricesOnSolidityServletTest.java +++ b/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetEnergyPricesOnSolidityServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class GetEnergyPricesOnSolidityServletTest extends BaseTest { @@ -24,7 +24,7 @@ public class GetEnergyPricesOnSolidityServletTest extends BaseTest { @BeforeClass public static void init() { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/services/jsonrpc/BlockResultTest.java b/framework/src/test/java/org/tron/core/services/jsonrpc/BlockResultTest.java index 2cd619a499a..aa96dfae8ff 100644 --- a/framework/src/test/java/org/tron/core/services/jsonrpc/BlockResultTest.java +++ b/framework/src/test/java/org/tron/core/services/jsonrpc/BlockResultTest.java @@ -6,12 +6,12 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.args.Args; import org.tron.core.services.jsonrpc.types.BlockResult; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class BlockResultTest extends BaseTest { @@ -19,7 +19,7 @@ public class BlockResultTest extends BaseTest { private Wallet wallet; static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/services/jsonrpc/BuildArgumentsTest.java b/framework/src/test/java/org/tron/core/services/jsonrpc/BuildArgumentsTest.java index f9e264c515f..d4b40b90501 100644 --- a/framework/src/test/java/org/tron/core/services/jsonrpc/BuildArgumentsTest.java +++ b/framework/src/test/java/org/tron/core/services/jsonrpc/BuildArgumentsTest.java @@ -5,7 +5,6 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.JsonRpcInvalidParamsException; @@ -13,6 +12,7 @@ import org.tron.core.services.jsonrpc.types.BuildArguments; import org.tron.core.services.jsonrpc.types.CallArguments; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class BuildArgumentsTest extends BaseTest { @@ -22,7 +22,7 @@ public class BuildArgumentsTest extends BaseTest { private BuildArguments buildArguments; static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Before diff --git a/framework/src/test/java/org/tron/core/services/jsonrpc/CallArgumentsTest.java b/framework/src/test/java/org/tron/core/services/jsonrpc/CallArgumentsTest.java index 19dd76e5e07..11ebadb4b66 100644 --- a/framework/src/test/java/org/tron/core/services/jsonrpc/CallArgumentsTest.java +++ b/framework/src/test/java/org/tron/core/services/jsonrpc/CallArgumentsTest.java @@ -5,13 +5,13 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.JsonRpcInvalidParamsException; import org.tron.core.exception.JsonRpcInvalidRequestException; import org.tron.core.services.jsonrpc.types.CallArguments; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class CallArgumentsTest extends BaseTest { @@ -21,7 +21,7 @@ public class CallArgumentsTest extends BaseTest { private CallArguments callArguments; static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Before diff --git a/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionReceiptTest.java b/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionReceiptTest.java index f10526e30a4..96592d2a6cc 100644 --- a/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionReceiptTest.java +++ b/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionReceiptTest.java @@ -6,13 +6,13 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.TransactionRetCapsule; import org.tron.core.config.args.Args; import org.tron.core.services.jsonrpc.types.TransactionReceipt; import org.tron.core.store.TransactionRetStore; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class TransactionReceiptTest extends BaseTest { @@ -23,7 +23,7 @@ public class TransactionReceiptTest extends BaseTest { private TransactionRetStore transactionRetStore; static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionResultTest.java b/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionResultTest.java index a71441c73b4..7e44b84b941 100644 --- a/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionResultTest.java +++ b/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionResultTest.java @@ -6,12 +6,12 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.args.Args; import org.tron.core.services.jsonrpc.types.TransactionResult; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; public class TransactionResultTest extends BaseTest { @@ -19,7 +19,7 @@ public class TransactionResultTest extends BaseTest { private Wallet wallet; static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/services/ratelimiter/GlobalRateLimiterTest.java b/framework/src/test/java/org/tron/core/services/ratelimiter/GlobalRateLimiterTest.java index b2f4915df1e..5f98239fba1 100644 --- a/framework/src/test/java/org/tron/core/services/ratelimiter/GlobalRateLimiterTest.java +++ b/framework/src/test/java/org/tron/core/services/ratelimiter/GlobalRateLimiterTest.java @@ -12,7 +12,7 @@ public class GlobalRateLimiterTest { @Test public void testAcquire() throws Exception { String[] a = new String[0]; - Args.setParam(a, Constant.TESTNET_CONF); + Args.setParam(a, Constant.NET_CONF); RuntimeData runtimeData = new RuntimeData(null); Field field = runtimeData.getClass().getDeclaredField("address"); field.setAccessible(true); diff --git a/framework/src/test/java/org/tron/core/services/stop/ConditionallyStopTest.java b/framework/src/test/java/org/tron/core/services/stop/ConditionallyStopTest.java index b417b27b380..15ab1a04fad 100644 --- a/framework/src/test/java/org/tron/core/services/stop/ConditionallyStopTest.java +++ b/framework/src/test/java/org/tron/core/services/stop/ConditionallyStopTest.java @@ -32,7 +32,6 @@ import org.tron.common.utils.Utils; import org.tron.consensus.dpos.DposSlot; import org.tron.core.ChainBaseManager; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.WitnessCapsule; @@ -43,6 +42,7 @@ import org.tron.core.db.Manager; import org.tron.core.net.TronNetDelegate; import org.tron.protos.Protocol; +import org.tron.common.TestConstants; @Slf4j public abstract class ConditionallyStopTest extends BlockGenerate { @@ -82,7 +82,7 @@ public void init() throws Exception { initDbPath(); logger.info("Full node running."); - Args.setParam(new String[] {"-d", dbPath}, Constant.TEST_CONF); + Args.setParam(new String[] {"-d", dbPath}, TestConstants.TEST_CONF); Args.getInstance().setNodeListenPort(10000 + port.incrementAndGet()); initParameter(Args.getInstance()); diff --git a/framework/src/test/java/org/tron/core/witness/ProposalControllerTest.java b/framework/src/test/java/org/tron/core/witness/ProposalControllerTest.java index c7b55ed4417..735e178c5df 100644 --- a/framework/src/test/java/org/tron/core/witness/ProposalControllerTest.java +++ b/framework/src/test/java/org/tron/core/witness/ProposalControllerTest.java @@ -11,7 +11,6 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.ProposalCapsule; import org.tron.core.config.args.Args; @@ -20,6 +19,7 @@ import org.tron.core.store.DynamicPropertiesStore; import org.tron.protos.Protocol.Proposal; import org.tron.protos.Protocol.Proposal.State; +import org.tron.common.TestConstants; public class ProposalControllerTest extends BaseTest { @@ -29,7 +29,7 @@ public class ProposalControllerTest extends BaseTest { private static boolean init; static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Before diff --git a/framework/src/test/java/org/tron/core/witness/WitnessControllerTest.java b/framework/src/test/java/org/tron/core/witness/WitnessControllerTest.java index 26e46ac138c..92a79577764 100644 --- a/framework/src/test/java/org/tron/core/witness/WitnessControllerTest.java +++ b/framework/src/test/java/org/tron/core/witness/WitnessControllerTest.java @@ -10,8 +10,8 @@ import org.tron.common.BaseTest; import org.tron.common.utils.ByteArray; import org.tron.consensus.dpos.DposSlot; -import org.tron.core.Constant; import org.tron.core.config.args.Args; +import org.tron.common.TestConstants; public class WitnessControllerTest extends BaseTest { @@ -20,7 +20,7 @@ public class WitnessControllerTest extends BaseTest { static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/zksnark/MerkleContainerTest.java b/framework/src/test/java/org/tron/core/zksnark/MerkleContainerTest.java index 183a504ee35..b7f50e5646a 100644 --- a/framework/src/test/java/org/tron/core/zksnark/MerkleContainerTest.java +++ b/framework/src/test/java/org/tron/core/zksnark/MerkleContainerTest.java @@ -10,7 +10,6 @@ import org.tron.common.utils.ByteArray; import org.tron.common.utils.Sha256Hash; import org.tron.common.zksnark.IncrementalMerkleVoucherContainer; -import org.tron.core.Constant; import org.tron.core.Wallet; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.BlockCapsule.BlockId; @@ -30,6 +29,7 @@ import org.tron.protos.contract.ShieldContract.PedersenHash; import org.tron.protos.contract.ShieldContract.ReceiveDescription; import org.tron.protos.contract.ShieldContract.ShieldedTransferContract; +import org.tron.common.TestConstants; public class MerkleContainerTest extends BaseTest { @@ -39,7 +39,7 @@ public class MerkleContainerTest extends BaseTest { static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } /*@Before diff --git a/framework/src/test/java/org/tron/program/AccountVoteWitnessTest.java b/framework/src/test/java/org/tron/program/AccountVoteWitnessTest.java index decdbff5e25..efd8997f045 100755 --- a/framework/src/test/java/org/tron/program/AccountVoteWitnessTest.java +++ b/framework/src/test/java/org/tron/program/AccountVoteWitnessTest.java @@ -9,11 +9,11 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.consensus.dpos.MaintenanceManager; -import org.tron.core.Constant; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.WitnessCapsule; import org.tron.core.config.args.Args; import org.tron.protos.Protocol.AccountType; +import org.tron.common.TestConstants; @Slf4j public class AccountVoteWitnessTest extends BaseTest { @@ -22,7 +22,7 @@ public class AccountVoteWitnessTest extends BaseTest { private MaintenanceManager maintenanceManager; static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); } private static Boolean deleteFolder(File index) { diff --git a/framework/src/test/java/org/tron/program/SolidityNodeTest.java b/framework/src/test/java/org/tron/program/SolidityNodeTest.java index a95d07c0c11..630c5db0755 100755 --- a/framework/src/test/java/org/tron/program/SolidityNodeTest.java +++ b/framework/src/test/java/org/tron/program/SolidityNodeTest.java @@ -6,12 +6,12 @@ import org.junit.Test; import org.tron.common.BaseTest; import org.tron.common.client.DatabaseGrpcClient; -import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.services.RpcApiService; import org.tron.core.services.http.solidity.SolidityNodeHttpApiService; import org.tron.protos.Protocol.Block; import org.tron.protos.Protocol.DynamicProperties; +import org.tron.common.TestConstants; @Slf4j public class SolidityNodeTest extends BaseTest { @@ -22,7 +22,7 @@ public class SolidityNodeTest extends BaseTest { SolidityNodeHttpApiService solidityNodeHttpApiService; static { - Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF); + Args.setParam(new String[]{"-d", dbPath()}, TestConstants.TEST_CONF); Args.getInstance().setSolidityNode(true); } diff --git a/framework/src/test/java/org/tron/program/SupplementTest.java b/framework/src/test/java/org/tron/program/SupplementTest.java index 3dfa23dfce4..2c08d7d1011 100644 --- a/framework/src/test/java/org/tron/program/SupplementTest.java +++ b/framework/src/test/java/org/tron/program/SupplementTest.java @@ -20,7 +20,6 @@ import org.tron.common.utils.CompactEncoder; import org.tron.common.utils.JsonUtil; import org.tron.common.utils.Value; -import org.tron.core.Constant; import org.tron.core.capsule.StorageRowCapsule; import org.tron.core.capsule.utils.RLP; import org.tron.core.config.TronLogShutdownHook; @@ -28,6 +27,7 @@ import org.tron.core.services.http.HttpSelfFormatFieldName; import org.tron.core.store.StorageRowStore; import org.tron.keystore.WalletUtils; +import org.tron.common.TestConstants; public class SupplementTest extends BaseTest { @@ -42,7 +42,7 @@ public class SupplementTest extends BaseTest { @BeforeClass public static void init() throws IOException { dbPath = dbPath(); - Args.setParam(new String[]{"--output-directory", dbPath, "--debug"}, Constant.TEST_CONF); + Args.setParam(new String[]{"--output-directory", dbPath, "--debug"}, TestConstants.TEST_CONF); } @Test From d9400ed70d5191d3bb6c3ed6d9397752341c187d Mon Sep 17 00:00:00 2001 From: vividcoder Date: Thu, 26 Feb 2026 15:01:31 +0800 Subject: [PATCH 5/9] style: fix import order and line length for TestConstants Sort TestConstants import alphabetically among other imports. Wrap lines exceeding 100 chars caused by longer constant name. --- .../test/java/org/tron/common/backup/BackupManagerTest.java | 5 +++-- .../test/java/org/tron/common/backup/BackupServerTest.java | 5 +++-- .../src/test/java/org/tron/common/config/args/ArgsTest.java | 2 +- .../test/java/org/tron/common/runtime/InheritanceTest.java | 2 +- .../tron/common/runtime/InternalTransactionComplexTest.java | 2 +- .../test/java/org/tron/common/runtime/ProgramResultTest.java | 2 +- .../test/java/org/tron/common/runtime/RuntimeImplTest.java | 2 +- .../org/tron/common/runtime/RuntimeTransferComplexTest.java | 2 +- .../test/java/org/tron/common/runtime/vm/BatchSendTest.java | 2 +- .../src/test/java/org/tron/common/runtime/vm/ChargeTest.java | 2 +- .../tron/common/runtime/vm/EnergyWhenAssertStyleTest.java | 2 +- .../tron/common/runtime/vm/EnergyWhenRequireStyleTest.java | 2 +- .../common/runtime/vm/EnergyWhenSendAndTransferTest.java | 2 +- .../tron/common/runtime/vm/EnergyWhenTimeoutStyleTest.java | 2 +- .../src/test/java/org/tron/common/runtime/vm/FreezeTest.java | 2 +- .../test/java/org/tron/common/runtime/vm/FreezeV2Test.java | 2 +- .../tron/common/runtime/vm/InternalTransactionCallTest.java | 2 +- .../test/java/org/tron/common/runtime/vm/OperationsTest.java | 2 +- .../org/tron/common/runtime/vm/PrecompiledContractsTest.java | 2 +- .../test/java/org/tron/common/runtime/vm/RepositoryTest.java | 2 +- .../java/org/tron/common/runtime/vm/TimeBenchmarkTest.java | 2 +- .../org/tron/common/runtime/vm/TransferToAccountTest.java | 2 +- .../java/org/tron/common/runtime/vm/TransferTokenTest.java | 2 +- .../java/org/tron/common/runtime/vm/VMContractTestBase.java | 2 +- .../src/test/java/org/tron/common/runtime/vm/VMTestBase.java | 2 +- .../common/runtime/vm/ValidateMultiSignContractTest.java | 2 +- .../src/test/java/org/tron/common/runtime/vm/VoteTest.java | 2 +- .../common/storage/leveldb/LevelDbDataSourceImplTest.java | 2 +- .../src/test/java/org/tron/core/BandwidthProcessorTest.java | 2 +- framework/src/test/java/org/tron/core/BlockUtilTest.java | 2 +- .../src/test/java/org/tron/core/EnergyProcessorTest.java | 2 +- .../src/test/java/org/tron/core/ForkControllerTest.java | 2 +- framework/src/test/java/org/tron/core/ShieldWalletTest.java | 2 +- framework/src/test/java/org/tron/core/WalletTest.java | 2 +- .../core/actuator/AccountPermissionUpdateActuatorTest.java | 2 +- .../java/org/tron/core/actuator/ActuatorConstantTest.java | 2 +- .../java/org/tron/core/actuator/ActuatorFactoryTest.java | 2 +- .../java/org/tron/core/actuator/AssetIssueActuatorTest.java | 2 +- .../tron/core/actuator/CancelAllUnfreezeV2ActuatorTest.java | 2 +- .../org/tron/core/actuator/ClearABIContractActuatorTest.java | 2 +- .../org/tron/core/actuator/CreateAccountActuatorTest.java | 2 +- .../org/tron/core/actuator/DelegateResourceActuatorTest.java | 2 +- .../org/tron/core/actuator/ExchangeCreateActuatorTest.java | 2 +- .../org/tron/core/actuator/ExchangeInjectActuatorTest.java | 2 +- .../tron/core/actuator/ExchangeTransactionActuatorTest.java | 2 +- .../org/tron/core/actuator/ExchangeWithdrawActuatorTest.java | 2 +- .../org/tron/core/actuator/FreezeBalanceActuatorTest.java | 2 +- .../org/tron/core/actuator/FreezeBalanceV2ActuatorTest.java | 2 +- .../tron/core/actuator/MarketCancelOrderActuatorTest.java | 2 +- .../org/tron/core/actuator/MarketSellAssetActuatorTest.java | 2 +- .../core/actuator/ParticipateAssetIssueActuatorTest.java | 2 +- .../org/tron/core/actuator/ProposalApproveActuatorTest.java | 2 +- .../org/tron/core/actuator/ProposalCreateActuatorTest.java | 2 +- .../org/tron/core/actuator/ProposalDeleteActuatorTest.java | 2 +- .../org/tron/core/actuator/SetAccountIdActuatorTest.java | 2 +- .../org/tron/core/actuator/ShieldedTransferActuatorTest.java | 2 +- .../java/org/tron/core/actuator/TransferActuatorTest.java | 2 +- .../org/tron/core/actuator/TransferAssetActuatorTest.java | 2 +- .../tron/core/actuator/UnDelegateResourceActuatorTest.java | 2 +- .../org/tron/core/actuator/UnfreezeAssetActuatorTest.java | 2 +- .../org/tron/core/actuator/UnfreezeBalanceActuatorTest.java | 2 +- .../tron/core/actuator/UnfreezeBalanceV2ActuatorTest.java | 2 +- .../org/tron/core/actuator/UpdateAccountActuatorTest.java | 2 +- .../java/org/tron/core/actuator/UpdateAssetActuatorTest.java | 2 +- .../org/tron/core/actuator/UpdateBrokerageActuatorTest.java | 2 +- .../core/actuator/UpdateEnergyLimitContractActuatorTest.java | 2 +- .../core/actuator/UpdateSettingContractActuatorTest.java | 2 +- .../java/org/tron/core/actuator/VoteWitnessActuatorTest.java | 2 +- .../org/tron/core/actuator/WithdrawBalanceActuatorTest.java | 2 +- .../core/actuator/WithdrawExpireUnfreezeActuatorTest.java | 2 +- .../org/tron/core/actuator/WitnessCreateActuatorTest.java | 2 +- .../org/tron/core/actuator/WitnessUpdateActuatorTest.java | 2 +- .../java/org/tron/core/actuator/utils/ProposalUtilTest.java | 2 +- .../org/tron/core/actuator/utils/TransactionUtilTest.java | 2 +- .../org/tron/core/actuator/vm/ProgramTraceListenerTest.java | 2 +- .../java/org/tron/core/actuator/vm/ProgramTraceTest.java | 2 +- .../test/java/org/tron/core/capsule/AccountCapsuleTest.java | 2 +- .../test/java/org/tron/core/capsule/BlockCapsuleTest.java | 2 +- .../test/java/org/tron/core/capsule/ExchangeCapsuleTest.java | 2 +- .../java/org/tron/core/capsule/TransactionCapsuleTest.java | 2 +- .../test/java/org/tron/core/capsule/VotesCapsuleTest.java | 2 +- .../test/java/org/tron/core/capsule/utils/AssetUtilTest.java | 2 +- .../org/tron/core/capsule/utils/ExchangeProcessorTest.java | 2 +- .../test/java/org/tron/core/config/ConfigurationTest.java | 2 +- .../src/test/java/org/tron/core/config/args/ArgsTest.java | 2 +- .../test/java/org/tron/core/config/args/DynamicArgsTest.java | 2 +- .../java/org/tron/core/config/args/LocalWitnessTest.java | 2 +- .../test/java/org/tron/core/consensus/DposServiceTest.java | 2 +- framework/src/test/java/org/tron/core/db/AbiStoreTest.java | 2 +- .../test/java/org/tron/core/db/AccountAssetStoreTest.java | 2 +- .../test/java/org/tron/core/db/AccountIdIndexStoreTest.java | 2 +- .../test/java/org/tron/core/db/AccountIndexStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/AccountStoreTest.java | 2 +- .../test/java/org/tron/core/db/AccountTraceStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/AssetIssueStoreTest.java | 2 +- .../test/java/org/tron/core/db/AssetIssueV2StoreTest.java | 2 +- .../test/java/org/tron/core/db/BalanceTraceStoreTest.java | 2 +- .../org/tron/core/db/BandwidthPriceHistoryLoaderTest.java | 2 +- .../src/test/java/org/tron/core/db/BlockIndexStoreTest.java | 2 +- framework/src/test/java/org/tron/core/db/BlockStoreTest.java | 2 +- framework/src/test/java/org/tron/core/db/CodeStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/ContractStoreTest.java | 2 +- .../tron/core/db/DelegatedResourceAccountIndexStoreTest.java | 2 +- .../java/org/tron/core/db/DelegatedResourceStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/DelegationStoreTest.java | 2 +- .../java/org/tron/core/db/EnergyPriceHistoryLoaderTest.java | 2 +- .../src/test/java/org/tron/core/db/ExchangeStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/ExchangeV2StoreTest.java | 2 +- .../org/tron/core/db/IncrementalMerkleTreeStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/KhaosDatabaseTest.java | 2 +- framework/src/test/java/org/tron/core/db/ManagerTest.java | 2 +- .../test/java/org/tron/core/db/MarketAccountStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/MarketOrderStoreTest.java | 2 +- .../org/tron/core/db/MarketPairPriceToOrderStoreTest.java | 2 +- .../java/org/tron/core/db/MarketPairToPriceStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/NullifierStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/ProposalStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/RecentBlockStoreTest.java | 2 +- .../java/org/tron/core/db/RecentTransactionStoreTest.java | 2 +- .../test/java/org/tron/core/db/TransactionExpireTest.java | 2 +- .../test/java/org/tron/core/db/TransactionHistoryTest.java | 2 +- .../test/java/org/tron/core/db/TransactionRetStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/TransactionStoreTest.java | 2 +- .../test/java/org/tron/core/db/TreeBlockIndexStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/TronDatabaseTest.java | 5 +++-- .../src/test/java/org/tron/core/db/TxCacheDBInitTest.java | 2 +- framework/src/test/java/org/tron/core/db/TxCacheDBTest.java | 2 +- framework/src/test/java/org/tron/core/db/VotesStoreTest.java | 2 +- .../test/java/org/tron/core/db/WitnessScheduleStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/WitnessStoreTest.java | 2 +- .../src/test/java/org/tron/core/db/ZKProofStoreTest.java | 2 +- framework/src/test/java/org/tron/core/db2/ChainbaseTest.java | 2 +- .../src/test/java/org/tron/core/db2/CheckpointV2Test.java | 2 +- .../org/tron/core/db2/RevokingDbWithCacheNewValueTest.java | 2 +- .../src/test/java/org/tron/core/db2/SnapshotImplTest.java | 5 +++-- .../src/test/java/org/tron/core/db2/SnapshotManagerTest.java | 2 +- .../src/test/java/org/tron/core/db2/SnapshotRootTest.java | 5 +++-- .../src/test/java/org/tron/core/event/BlockEventGetTest.java | 2 +- .../src/test/java/org/tron/core/exception/TronErrorTest.java | 2 +- .../java/org/tron/core/jsonrpc/BuildTransactionTest.java | 2 +- .../test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java | 2 +- .../test/java/org/tron/core/jsonrpc/LogBlockQueryTest.java | 2 +- .../java/org/tron/core/jsonrpc/SectionBloomStoreTest.java | 2 +- .../test/java/org/tron/core/jsonrpc/WalletCursorTest.java | 2 +- .../java/org/tron/core/metrics/MetricsApiServiceTest.java | 2 +- .../core/metrics/prometheus/PrometheusApiServiceTest.java | 2 +- framework/src/test/java/org/tron/core/net/NodeTest.java | 2 +- .../test/java/org/tron/core/net/P2pEventHandlerImplTest.java | 5 +++-- .../src/test/java/org/tron/core/net/TronNetDelegateTest.java | 2 +- .../tron/core/net/messagehandler/BlockMsgHandlerTest.java | 2 +- .../core/net/messagehandler/InventoryMsgHandlerTest.java | 2 +- .../org/tron/core/net/messagehandler/MessageHandlerTest.java | 2 +- .../org/tron/core/net/messagehandler/PbftMsgHandlerTest.java | 2 +- .../net/messagehandler/SyncBlockChainMsgHandlerTest.java | 2 +- .../core/net/messagehandler/TransactionsMsgHandlerTest.java | 2 +- .../java/org/tron/core/net/peer/PeerStatusCheckTest.java | 2 +- .../core/net/service/nodepersist/NodePersistServiceTest.java | 2 +- .../test/java/org/tron/core/net/services/AdvServiceTest.java | 2 +- .../tron/core/net/services/EffectiveCheckServiceTest.java | 2 +- .../org/tron/core/net/services/HandShakeServiceTest.java | 2 +- .../java/org/tron/core/net/services/RelayServiceTest.java | 2 +- .../org/tron/core/net/services/ResilienceServiceTest.java | 5 +++-- .../java/org/tron/core/net/services/SyncServiceTest.java | 2 +- framework/src/test/java/org/tron/core/pbft/PbftApiTest.java | 2 +- .../test/java/org/tron/core/services/ComputeRewardTest.java | 2 +- .../java/org/tron/core/services/NodeInfoServiceTest.java | 2 +- .../java/org/tron/core/services/ProposalServiceTest.java | 2 +- .../test/java/org/tron/core/services/RpcApiServicesTest.java | 5 +++-- .../src/test/java/org/tron/core/services/WalletApiTest.java | 2 +- .../tron/core/services/filter/HttpApiAccessFilterTest.java | 2 +- .../core/services/filter/LiteFnQueryGrpcInterceptorTest.java | 5 +++-- .../tron/core/services/filter/LiteFnQueryHttpFilterTest.java | 2 +- .../core/services/filter/RpcApiAccessInterceptorTest.java | 5 +++-- .../org/tron/core/services/http/ClearABIServletTest.java | 2 +- .../tron/core/services/http/CreateAccountServletTest.java | 2 +- .../tron/core/services/http/CreateAssetIssueServletTest.java | 2 +- .../core/services/http/CreateSpendAuthSigServletTest.java | 2 +- .../tron/core/services/http/CreateWitnessServletTest.java | 2 +- .../tron/core/services/http/GetAccountByIdServletTest.java | 2 +- .../core/services/http/GetAssetIssueListServletTest.java | 2 +- .../core/services/http/GetBandwidthPricesServletTest.java | 2 +- .../org/tron/core/services/http/GetBlockByIdServletTest.java | 2 +- .../tron/core/services/http/GetBlockByNumServletTest.java | 2 +- .../org/tron/core/services/http/GetBrokerageServletTest.java | 2 +- .../tron/core/services/http/GetEnergyPricesServletTest.java | 2 +- .../tron/core/services/http/GetMemoFeePricesServletTest.java | 2 +- .../org/tron/core/services/http/GetNowBlockServletTest.java | 2 +- .../org/tron/core/services/http/GetRewardServletTest.java | 2 +- .../http/GetTransactionInfoByBlockNumServletTest.java | 2 +- .../services/http/GetTransactionInfoByIdServletTest.java | 2 +- .../http/GetTransactionListFromPendingServletTest.java | 2 +- .../org/tron/core/services/http/ListNodesServletTest.java | 2 +- .../tron/core/services/http/ListProposalsServletTest.java | 2 +- .../core/services/http/TriggerSmartContractServletTest.java | 2 +- .../tron/core/services/http/UpdateAccountServletTest.java | 2 +- .../src/test/java/org/tron/core/services/http/UtilTest.java | 2 +- .../http/GetBandwidthPricesOnPBFTServletTest.java | 2 +- .../http/GetEnergyPricesOnPBFTServletTest.java | 2 +- .../http/GetBandwidthPricesOnSolidityServletTest.java | 2 +- .../http/GetEnergyPricesOnSolidityServletTest.java | 2 +- .../java/org/tron/core/services/jsonrpc/BlockResultTest.java | 2 +- .../org/tron/core/services/jsonrpc/BuildArgumentsTest.java | 2 +- .../org/tron/core/services/jsonrpc/CallArgumentsTest.java | 2 +- .../tron/core/services/jsonrpc/TransactionReceiptTest.java | 2 +- .../tron/core/services/jsonrpc/TransactionResultTest.java | 2 +- .../org/tron/core/services/stop/ConditionallyStopTest.java | 2 +- .../java/org/tron/core/witness/ProposalControllerTest.java | 2 +- .../java/org/tron/core/witness/WitnessControllerTest.java | 2 +- .../test/java/org/tron/core/zksnark/MerkleContainerTest.java | 2 +- .../test/java/org/tron/program/AccountVoteWitnessTest.java | 2 +- .../src/test/java/org/tron/program/SolidityNodeTest.java | 2 +- framework/src/test/java/org/tron/program/SupplementTest.java | 2 +- 212 files changed, 232 insertions(+), 222 deletions(-) diff --git a/framework/src/test/java/org/tron/common/backup/BackupManagerTest.java b/framework/src/test/java/org/tron/common/backup/BackupManagerTest.java index ced13b3f265..71d1bae447b 100644 --- a/framework/src/test/java/org/tron/common/backup/BackupManagerTest.java +++ b/framework/src/test/java/org/tron/common/backup/BackupManagerTest.java @@ -12,6 +12,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.backup.BackupManager.BackupStatusEnum; import org.tron.common.backup.message.KeepAliveMessage; import org.tron.common.backup.socket.BackupServer; @@ -19,7 +20,6 @@ import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.PublicMethod; import org.tron.core.config.args.Args; -import org.tron.common.TestConstants; public class BackupManagerTest { @@ -30,7 +30,8 @@ public class BackupManagerTest { @Before public void setUp() throws Exception { - Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); + Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, + TestConstants.TEST_CONF); CommonParameter.getInstance().setBackupPort(PublicMethod.chooseRandomPort()); manager = new BackupManager(); backupServer = new BackupServer(manager); diff --git a/framework/src/test/java/org/tron/common/backup/BackupServerTest.java b/framework/src/test/java/org/tron/common/backup/BackupServerTest.java index a595e804dcf..ae5f74d8b71 100644 --- a/framework/src/test/java/org/tron/common/backup/BackupServerTest.java +++ b/framework/src/test/java/org/tron/common/backup/BackupServerTest.java @@ -8,11 +8,11 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.rules.Timeout; +import org.tron.common.TestConstants; import org.tron.common.backup.socket.BackupServer; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.PublicMethod; import org.tron.core.config.args.Args; -import org.tron.common.TestConstants; public class BackupServerTest { @@ -26,7 +26,8 @@ public class BackupServerTest { @Before public void setUp() throws Exception { - Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); + Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, + TestConstants.TEST_CONF); CommonParameter.getInstance().setBackupPort(PublicMethod.chooseRandomPort()); List members = new ArrayList<>(); members.add("127.0.0.2"); diff --git a/framework/src/test/java/org/tron/common/config/args/ArgsTest.java b/framework/src/test/java/org/tron/common/config/args/ArgsTest.java index 27b2806397e..9a7283d18dc 100644 --- a/framework/src/test/java/org/tron/common/config/args/ArgsTest.java +++ b/framework/src/test/java/org/tron/common/config/args/ArgsTest.java @@ -10,9 +10,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.parameter.RateLimiterInitialization; import org.tron.core.config.args.Args; -import org.tron.common.TestConstants; public class ArgsTest { diff --git a/framework/src/test/java/org/tron/common/runtime/InheritanceTest.java b/framework/src/test/java/org/tron/common/runtime/InheritanceTest.java index ba75555f2db..e77cf2b0921 100644 --- a/framework/src/test/java/org/tron/common/runtime/InheritanceTest.java +++ b/framework/src/test/java/org/tron/common/runtime/InheritanceTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.ContractExeException; @@ -15,7 +16,6 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j public class InheritanceTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java b/framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java index 584d2d94be1..37a7a057663 100644 --- a/framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java +++ b/framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.vm.DataWord; import org.tron.core.Wallet; import org.tron.core.config.args.Args; @@ -16,7 +17,6 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j public class InternalTransactionComplexTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java b/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java index a0c044c97a5..2e35bcf51f4 100644 --- a/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java +++ b/framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java @@ -13,6 +13,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.vm.DataWord; import org.tron.core.Wallet; import org.tron.core.capsule.BlockCapsule; @@ -31,7 +32,6 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; import org.tron.protos.Protocol.Transaction.Result.contractResult; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/common/runtime/RuntimeImplTest.java b/framework/src/test/java/org/tron/common/runtime/RuntimeImplTest.java index a57ae255647..7fcdfae2753 100644 --- a/framework/src/test/java/org/tron/common/runtime/RuntimeImplTest.java +++ b/framework/src/test/java/org/tron/common/runtime/RuntimeImplTest.java @@ -9,6 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.Wallet; import org.tron.core.actuator.VMActuator; import org.tron.core.capsule.AccountCapsule; @@ -26,7 +27,6 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java b/framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java index 77cf557d421..945f4173a21 100644 --- a/framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java +++ b/framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java @@ -8,6 +8,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.WalletUtil; import org.tron.common.utils.client.utils.DataWord; import org.tron.core.Wallet; @@ -20,7 +21,6 @@ import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; -import org.tron.common.TestConstants; @Slf4j public class RuntimeTransferComplexTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/BatchSendTest.java b/framework/src/test/java/org/tron/common/runtime/vm/BatchSendTest.java index 91337e1b87d..1366bede4b2 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/BatchSendTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/BatchSendTest.java @@ -9,6 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.runtime.Runtime; import org.tron.common.runtime.TvmTestUtils; @@ -27,7 +28,6 @@ import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; -import org.tron.common.TestConstants; @Slf4j public class BatchSendTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/ChargeTest.java b/framework/src/test/java/org/tron/common/runtime/vm/ChargeTest.java index 7002572a6df..04dbc0f4493 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/ChargeTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/ChargeTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; import org.tron.core.Wallet; @@ -17,7 +18,6 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j public class ChargeTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenAssertStyleTest.java b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenAssertStyleTest.java index df30acdbd31..196efc7065f 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenAssertStyleTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenAssertStyleTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; import org.tron.core.Wallet; @@ -20,7 +21,6 @@ import org.tron.core.vm.program.Program.PrecompiledContractException; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenRequireStyleTest.java b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenRequireStyleTest.java index 686c4d65559..6be37a6a3e6 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenRequireStyleTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenRequireStyleTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; import org.tron.core.Wallet; @@ -18,7 +19,6 @@ import org.tron.core.vm.program.Program.OutOfEnergyException; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j public class EnergyWhenRequireStyleTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenSendAndTransferTest.java b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenSendAndTransferTest.java index 01c8766f1ce..596f024af65 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenSendAndTransferTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenSendAndTransferTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; import org.tron.core.Wallet; @@ -17,7 +18,6 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j public class EnergyWhenSendAndTransferTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenTimeoutStyleTest.java b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenTimeoutStyleTest.java index 511ae68e881..60a9bd8a604 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenTimeoutStyleTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/EnergyWhenTimeoutStyleTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; import org.tron.core.Wallet; @@ -19,7 +20,6 @@ import org.tron.core.vm.program.Program.OutOfTimeException; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j public class EnergyWhenTimeoutStyleTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java b/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java index 39af7089dca..01e602ac813 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/FreezeTest.java @@ -17,6 +17,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.runtime.Runtime; import org.tron.common.runtime.RuntimeImpl; @@ -46,7 +47,6 @@ import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol; import org.tron.protos.Protocol.Transaction.Result.contractResult; -import org.tron.common.TestConstants; @Slf4j public class FreezeTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/FreezeV2Test.java b/framework/src/test/java/org/tron/common/runtime/vm/FreezeV2Test.java index 2e899496d46..b9212b1b975 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/FreezeV2Test.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/FreezeV2Test.java @@ -22,6 +22,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.parameter.CommonParameter; import org.tron.common.runtime.Runtime; @@ -57,7 +58,6 @@ import org.tron.protos.Protocol; import org.tron.protos.Protocol.Transaction.Result.contractResult; import org.tron.protos.contract.Common; -import org.tron.common.TestConstants; @Slf4j public class FreezeV2Test { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/InternalTransactionCallTest.java b/framework/src/test/java/org/tron/common/runtime/vm/InternalTransactionCallTest.java index 15beede0127..db883ede6df 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/InternalTransactionCallTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/InternalTransactionCallTest.java @@ -9,6 +9,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -25,7 +26,6 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j public class InternalTransactionCallTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/OperationsTest.java b/framework/src/test/java/org/tron/common/runtime/vm/OperationsTest.java index 07c3df03d38..583b0131942 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/OperationsTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/OperationsTest.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.common.runtime.InternalTransaction; import org.tron.common.utils.DecodeUtil; @@ -43,7 +44,6 @@ import org.tron.core.vm.program.invoke.ProgramInvokeMockImpl; import org.tron.core.vm.repository.Repository; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j public class OperationsTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/PrecompiledContractsTest.java b/framework/src/test/java/org/tron/common/runtime/vm/PrecompiledContractsTest.java index 030b5be95f6..4d3ad0cc2a7 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/PrecompiledContractsTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/PrecompiledContractsTest.java @@ -16,6 +16,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.ProgramResult; import org.tron.common.utils.ByteArray; import org.tron.common.utils.ByteUtil; @@ -44,7 +45,6 @@ import org.tron.protos.Protocol.Proposal.State; import org.tron.protos.contract.BalanceContract.FreezeBalanceContract; import org.tron.protos.contract.Common; -import org.tron.common.TestConstants; @Slf4j public class PrecompiledContractsTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/RepositoryTest.java b/framework/src/test/java/org/tron/common/runtime/vm/RepositoryTest.java index 79cc96fe2db..486205479ce 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/RepositoryTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/RepositoryTest.java @@ -8,6 +8,7 @@ import org.junit.Ignore; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.common.runtime.Runtime; import org.tron.common.runtime.TVMTestResult; @@ -25,7 +26,6 @@ import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; -import org.tron.common.TestConstants; @Slf4j public class RepositoryTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/TimeBenchmarkTest.java b/framework/src/test/java/org/tron/common/runtime/vm/TimeBenchmarkTest.java index 49fe6c735ee..f88f5ef38e0 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/TimeBenchmarkTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/TimeBenchmarkTest.java @@ -7,6 +7,7 @@ import org.junit.Ignore; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.TVMTestResult; import org.tron.common.runtime.TvmTestUtils; import org.tron.core.Wallet; @@ -18,7 +19,6 @@ import org.tron.core.store.StoreFactory; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j @Ignore diff --git a/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java b/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java index 85516cfc65b..0cbdd43c3a1 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/TransferToAccountTest.java @@ -7,6 +7,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.runtime.ProgramResult; import org.tron.common.runtime.Runtime; @@ -34,7 +35,6 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; -import org.tron.common.TestConstants; @Slf4j public class TransferToAccountTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/TransferTokenTest.java b/framework/src/test/java/org/tron/common/runtime/vm/TransferTokenTest.java index efe612c8f0f..d8a63a5ffca 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/TransferTokenTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/TransferTokenTest.java @@ -7,6 +7,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.Runtime; import org.tron.common.runtime.TvmTestUtils; import org.tron.common.utils.ByteArray; @@ -23,7 +24,6 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.Protocol.Transaction; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; -import org.tron.common.TestConstants; @Slf4j public class TransferTokenTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/VMContractTestBase.java b/framework/src/test/java/org/tron/common/runtime/vm/VMContractTestBase.java index 4c7457fad80..b64df28cafc 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/VMContractTestBase.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/VMContractTestBase.java @@ -7,6 +7,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.runtime.Runtime; import org.tron.consensus.dpos.DposSlot; @@ -24,7 +25,6 @@ import org.tron.core.vm.repository.Repository; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j public class VMContractTestBase { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/VMTestBase.java b/framework/src/test/java/org/tron/common/runtime/vm/VMTestBase.java index f300ee0cc19..ec98b3858de 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/VMTestBase.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/VMTestBase.java @@ -8,6 +8,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.runtime.Runtime; import org.tron.core.Wallet; @@ -18,7 +19,6 @@ import org.tron.core.vm.repository.Repository; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j public class VMTestBase { diff --git a/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java b/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java index 7a4669e1e66..518d42041ee 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java @@ -12,6 +12,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.crypto.Hash; import org.tron.common.parameter.CommonParameter; @@ -28,7 +29,6 @@ import org.tron.core.vm.repository.Repository; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/common/runtime/vm/VoteTest.java b/framework/src/test/java/org/tron/common/runtime/vm/VoteTest.java index c2e8378215e..1615cdf8b88 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/VoteTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/VoteTest.java @@ -22,6 +22,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.parameter.CommonParameter; import org.tron.common.runtime.Runtime; @@ -49,7 +50,6 @@ import org.tron.core.vm.repository.Repository; import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j public class VoteTest { diff --git a/framework/src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java b/framework/src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java index 4c1a4076978..7c093ee2fbc 100644 --- a/framework/src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java +++ b/framework/src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java @@ -49,6 +49,7 @@ import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.rocksdb.RocksDB; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.common.storage.WriteOptionsWrapper; import org.tron.common.storage.rocksdb.RocksDbDataSourceImpl; @@ -60,7 +61,6 @@ import org.tron.core.config.args.Args; import org.tron.core.db2.common.WrappedByteArray; import org.tron.core.exception.TronError; -import org.tron.common.TestConstants; @Slf4j public class LevelDbDataSourceImplTest { diff --git a/framework/src/test/java/org/tron/core/BandwidthProcessorTest.java b/framework/src/test/java/org/tron/core/BandwidthProcessorTest.java index 2810ae96fe1..cf652af3650 100755 --- a/framework/src/test/java/org/tron/core/BandwidthProcessorTest.java +++ b/framework/src/test/java/org/tron/core/BandwidthProcessorTest.java @@ -11,6 +11,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.RuntimeImpl; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.AccountCapsule; @@ -35,7 +36,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.TransferAssetContract; import org.tron.protos.contract.BalanceContract.TransferContract; -import org.tron.common.TestConstants; @Slf4j public class BandwidthProcessorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/BlockUtilTest.java b/framework/src/test/java/org/tron/core/BlockUtilTest.java index ccf4215c342..cfe3079a1dd 100644 --- a/framework/src/test/java/org/tron/core/BlockUtilTest.java +++ b/framework/src/test/java/org/tron/core/BlockUtilTest.java @@ -21,6 +21,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Sha256Hash; import org.tron.core.capsule.BlockCapsule; @@ -29,7 +30,6 @@ import org.tron.protos.Protocol.Block; import org.tron.protos.Protocol.BlockHeader; import org.tron.protos.Protocol.BlockHeader.raw; -import org.tron.common.TestConstants; @Slf4j public class BlockUtilTest { diff --git a/framework/src/test/java/org/tron/core/EnergyProcessorTest.java b/framework/src/test/java/org/tron/core/EnergyProcessorTest.java index 85b52ed1d05..64d4d67f474 100755 --- a/framework/src/test/java/org/tron/core/EnergyProcessorTest.java +++ b/framework/src/test/java/org/tron/core/EnergyProcessorTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.Parameter.AdaptiveResourceLimitConstants; @@ -15,7 +16,6 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.Common; -import org.tron.common.TestConstants; @Slf4j public class EnergyProcessorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/ForkControllerTest.java b/framework/src/test/java/org/tron/core/ForkControllerTest.java index 52604b4824d..778368cd9e4 100644 --- a/framework/src/test/java/org/tron/core/ForkControllerTest.java +++ b/framework/src/test/java/org/tron/core/ForkControllerTest.java @@ -10,6 +10,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ForkController; import org.tron.core.capsule.BlockCapsule; @@ -18,7 +19,6 @@ import org.tron.core.config.args.Args; import org.tron.core.store.DynamicPropertiesStore; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class ForkControllerTest { private static ChainBaseManager chainBaseManager; diff --git a/framework/src/test/java/org/tron/core/ShieldWalletTest.java b/framework/src/test/java/org/tron/core/ShieldWalletTest.java index 53d45c20d6d..903309510a8 100644 --- a/framework/src/test/java/org/tron/core/ShieldWalletTest.java +++ b/framework/src/test/java/org/tron/core/ShieldWalletTest.java @@ -16,6 +16,7 @@ import org.tron.api.GrpcAPI.ShieldedAddressInfo; import org.tron.api.GrpcAPI.ShieldedTRC20Parameters; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.TransactionCapsule; import org.tron.core.config.args.Args; @@ -23,7 +24,6 @@ import org.tron.core.exception.ContractValidateException; import org.tron.core.services.http.JsonFormat; import org.tron.core.services.http.JsonFormat.ParseException; -import org.tron.common.TestConstants; public class ShieldWalletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/WalletTest.java b/framework/src/test/java/org/tron/core/WalletTest.java index f9ddb6ae019..44e25a16387 100644 --- a/framework/src/test/java/org/tron/core/WalletTest.java +++ b/framework/src/test/java/org/tron/core/WalletTest.java @@ -49,6 +49,7 @@ import org.tron.api.GrpcAPI.PricesResponseMessage; import org.tron.api.GrpcAPI.ProposalList; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ByteArray; @@ -97,7 +98,6 @@ import org.tron.protos.contract.BalanceContract.TransferContract; import org.tron.protos.contract.Common; import org.tron.protos.contract.SmartContractOuterClass; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/actuator/AccountPermissionUpdateActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/AccountPermissionUpdateActuatorTest.java index 0ddfef1dfef..250f7b9dc01 100644 --- a/framework/src/test/java/org/tron/core/actuator/AccountPermissionUpdateActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/AccountPermissionUpdateActuatorTest.java @@ -12,6 +12,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -27,7 +28,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AccountContract.AccountCreateContract; import org.tron.protos.contract.AccountContract.AccountPermissionUpdateContract; -import org.tron.common.TestConstants; @Slf4j public class AccountPermissionUpdateActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/ActuatorConstantTest.java b/framework/src/test/java/org/tron/core/actuator/ActuatorConstantTest.java index 8cd22544ff1..4242822f026 100644 --- a/framework/src/test/java/org/tron/core/actuator/ActuatorConstantTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ActuatorConstantTest.java @@ -5,8 +5,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; @Slf4j(topic = "actuator") diff --git a/framework/src/test/java/org/tron/core/actuator/ActuatorFactoryTest.java b/framework/src/test/java/org/tron/core/actuator/ActuatorFactoryTest.java index 94c2346cc79..07bb47e1a92 100644 --- a/framework/src/test/java/org/tron/core/actuator/ActuatorFactoryTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ActuatorFactoryTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -13,7 +14,6 @@ import org.tron.core.config.args.Args; import org.tron.protos.Protocol.AccountType; import org.tron.protos.contract.BalanceContract.TransferContract; -import org.tron.common.TestConstants; public class ActuatorFactoryTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/AssetIssueActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/AssetIssueActuatorTest.java index d6077fcf0e9..cfa54a63655 100755 --- a/framework/src/test/java/org/tron/core/actuator/AssetIssueActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/AssetIssueActuatorTest.java @@ -15,6 +15,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.ForkController; import org.tron.core.Wallet; @@ -31,7 +32,6 @@ import org.tron.protos.contract.AccountContract.AccountCreateContract; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract.FrozenSupply; -import org.tron.common.TestConstants; @Slf4j public class AssetIssueActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/CancelAllUnfreezeV2ActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/CancelAllUnfreezeV2ActuatorTest.java index b73b9db0544..3d4ec67c6af 100644 --- a/framework/src/test/java/org/tron/core/actuator/CancelAllUnfreezeV2ActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/CancelAllUnfreezeV2ActuatorTest.java @@ -14,6 +14,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Constant; import org.tron.core.Wallet; @@ -24,7 +25,6 @@ import org.tron.core.exception.ContractValidateException; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; -import org.tron.common.TestConstants; @Slf4j public class CancelAllUnfreezeV2ActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/ClearABIContractActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ClearABIContractActuatorTest.java index a47e40caeea..988e17131ad 100644 --- a/framework/src/test/java/org/tron/core/actuator/ClearABIContractActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ClearABIContractActuatorTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; import org.tron.core.Wallet; @@ -24,7 +25,6 @@ import org.tron.protos.contract.SmartContractOuterClass.ClearABIContract; import org.tron.protos.contract.SmartContractOuterClass.SmartContract; import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI; -import org.tron.common.TestConstants; @Slf4j public class ClearABIContractActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/CreateAccountActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/CreateAccountActuatorTest.java index 1ada3f23e3e..4cb8e639089 100755 --- a/framework/src/test/java/org/tron/core/actuator/CreateAccountActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/CreateAccountActuatorTest.java @@ -9,6 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; import org.tron.core.Wallet; @@ -21,7 +22,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AccountContract.AccountCreateContract; import org.tron.protos.contract.AssetIssueContractOuterClass; -import org.tron.common.TestConstants; @Slf4j public class CreateAccountActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/DelegateResourceActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/DelegateResourceActuatorTest.java index 200dc11bf24..e9263cc4adb 100644 --- a/framework/src/test/java/org/tron/core/actuator/DelegateResourceActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/DelegateResourceActuatorTest.java @@ -20,6 +20,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -37,7 +38,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract; import org.tron.protos.contract.BalanceContract.DelegateResourceContract; -import org.tron.common.TestConstants; @Slf4j public class DelegateResourceActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/ExchangeCreateActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ExchangeCreateActuatorTest.java index 9e14a39e372..6d0e009eae7 100644 --- a/framework/src/test/java/org/tron/core/actuator/ExchangeCreateActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ExchangeCreateActuatorTest.java @@ -11,6 +11,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -26,7 +27,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.ExchangeContract.ExchangeCreateContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/actuator/ExchangeInjectActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ExchangeInjectActuatorTest.java index cf4b7ae68f8..cdc7d378324 100644 --- a/framework/src/test/java/org/tron/core/actuator/ExchangeInjectActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ExchangeInjectActuatorTest.java @@ -12,6 +12,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -27,7 +28,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.ExchangeContract.ExchangeInjectContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/actuator/ExchangeTransactionActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ExchangeTransactionActuatorTest.java index 22cd373a864..818d9e3de0e 100644 --- a/framework/src/test/java/org/tron/core/actuator/ExchangeTransactionActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ExchangeTransactionActuatorTest.java @@ -16,6 +16,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.utils.ByteArray; import org.tron.common.utils.ForkController; @@ -43,7 +44,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.ExchangeContract.ExchangeTransactionContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/actuator/ExchangeWithdrawActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ExchangeWithdrawActuatorTest.java index 55c052bef7e..e7c08eaef67 100644 --- a/framework/src/test/java/org/tron/core/actuator/ExchangeWithdrawActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ExchangeWithdrawActuatorTest.java @@ -13,6 +13,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -28,7 +29,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.ExchangeContract.ExchangeWithdrawContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/actuator/FreezeBalanceActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/FreezeBalanceActuatorTest.java index 635bc216899..ddcb9976200 100644 --- a/framework/src/test/java/org/tron/core/actuator/FreezeBalanceActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/FreezeBalanceActuatorTest.java @@ -11,6 +11,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Utils; @@ -30,7 +31,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.FreezeBalanceContract; import org.tron.protos.contract.Common.ResourceCode; -import org.tron.common.TestConstants; @Slf4j public class FreezeBalanceActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/FreezeBalanceV2ActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/FreezeBalanceV2ActuatorTest.java index a72b3ecd08d..24585326110 100644 --- a/framework/src/test/java/org/tron/core/actuator/FreezeBalanceV2ActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/FreezeBalanceV2ActuatorTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.ChainBaseManager; import org.tron.core.Constant; @@ -25,7 +26,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract; import org.tron.protos.contract.Common.ResourceCode; -import org.tron.common.TestConstants; @Slf4j public class FreezeBalanceV2ActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java index 76978c4e338..4c6b7b58b89 100644 --- a/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java @@ -8,6 +8,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.ChainBaseManager; import org.tron.core.Wallet; @@ -34,7 +35,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.MarketContract.MarketCancelOrderContract; import org.tron.protos.contract.MarketContract.MarketSellAssetContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java index d1c5e268fe1..2789f261fd1 100644 --- a/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java @@ -11,6 +11,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.ChainBaseManager; import org.tron.core.Wallet; @@ -36,7 +37,6 @@ import org.tron.protos.Protocol.MarketPrice; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.MarketContract.MarketSellAssetContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/actuator/ParticipateAssetIssueActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ParticipateAssetIssueActuatorTest.java index 75e69f6fbbe..5c168f51bee 100755 --- a/framework/src/test/java/org/tron/core/actuator/ParticipateAssetIssueActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ParticipateAssetIssueActuatorTest.java @@ -7,6 +7,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -20,7 +21,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.ParticipateAssetIssueContract; -import org.tron.common.TestConstants; public class ParticipateAssetIssueActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/ProposalApproveActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ProposalApproveActuatorTest.java index 02741fda21d..dba8e1fca7b 100644 --- a/framework/src/test/java/org/tron/core/actuator/ProposalApproveActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ProposalApproveActuatorTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; import org.tron.core.Wallet; @@ -26,7 +27,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.ProposalContract; -import org.tron.common.TestConstants; @Slf4j public class ProposalApproveActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/ProposalCreateActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ProposalCreateActuatorTest.java index 74ff6b5fb45..687cc7385cd 100644 --- a/framework/src/test/java/org/tron/core/actuator/ProposalCreateActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ProposalCreateActuatorTest.java @@ -15,6 +15,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.ForkController; import org.tron.core.Wallet; @@ -30,7 +31,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.ProposalContract.ProposalCreateContract; -import org.tron.common.TestConstants; @Slf4j public class ProposalCreateActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/ProposalDeleteActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ProposalDeleteActuatorTest.java index 9a33ebb141f..0ea37b2ac5d 100644 --- a/framework/src/test/java/org/tron/core/actuator/ProposalDeleteActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ProposalDeleteActuatorTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; import org.tron.core.Wallet; @@ -26,7 +27,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.ProposalContract; -import org.tron.common.TestConstants; @Slf4j public class ProposalDeleteActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/SetAccountIdActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/SetAccountIdActuatorTest.java index 80bfa4335dd..623e223d1e7 100644 --- a/framework/src/test/java/org/tron/core/actuator/SetAccountIdActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/SetAccountIdActuatorTest.java @@ -7,6 +7,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -18,7 +19,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AccountContract.SetAccountIdContract; import org.tron.protos.contract.AssetIssueContractOuterClass; -import org.tron.common.TestConstants; @Slf4j public class SetAccountIdActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/ShieldedTransferActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/ShieldedTransferActuatorTest.java index a47e52dbf3a..faec4c74039 100755 --- a/framework/src/test/java/org/tron/core/actuator/ShieldedTransferActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/ShieldedTransferActuatorTest.java @@ -8,6 +8,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.PublicMethod; import org.tron.common.utils.client.utils.TransactionUtils; @@ -40,7 +41,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.ShieldContract.PedersenHash; import org.tron.protos.contract.ShieldContract.ShieldedTransferContract; -import org.tron.common.TestConstants; @Slf4j public class ShieldedTransferActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/TransferActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/TransferActuatorTest.java index 9d117730076..2d52b93a4bc 100644 --- a/framework/src/test/java/org/tron/core/actuator/TransferActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/TransferActuatorTest.java @@ -12,6 +12,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.TvmTestUtils; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; @@ -29,7 +30,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.TransferContract; -import org.tron.common.TestConstants; @Slf4j public class TransferActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/TransferAssetActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/TransferAssetActuatorTest.java index 5c4e525ebad..7da07653f1e 100755 --- a/framework/src/test/java/org/tron/core/actuator/TransferAssetActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/TransferAssetActuatorTest.java @@ -26,6 +26,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.TvmTestUtils; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; @@ -46,7 +47,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.TransferAssetContract; -import org.tron.common.TestConstants; @Slf4j public class TransferAssetActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/UnDelegateResourceActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UnDelegateResourceActuatorTest.java index 5c6a26d8d95..f3211c8b8eb 100644 --- a/framework/src/test/java/org/tron/core/actuator/UnDelegateResourceActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UnDelegateResourceActuatorTest.java @@ -11,6 +11,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -25,7 +26,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.UnDelegateResourceContract; import org.tron.protos.contract.Common.ResourceCode; -import org.tron.common.TestConstants; @Slf4j public class UnDelegateResourceActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/UnfreezeAssetActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UnfreezeAssetActuatorTest.java index 0c62af1253f..4963d813003 100644 --- a/framework/src/test/java/org/tron/core/actuator/UnfreezeAssetActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UnfreezeAssetActuatorTest.java @@ -7,6 +7,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; import org.tron.core.Wallet; @@ -23,7 +24,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.UnfreezeAssetContract; -import org.tron.common.TestConstants; @Slf4j public class UnfreezeAssetActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceActuatorTest.java index 70e1da602ac..6caf861e7cc 100644 --- a/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceActuatorTest.java @@ -11,6 +11,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -27,7 +28,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.UnfreezeBalanceContract; import org.tron.protos.contract.Common.ResourceCode; -import org.tron.common.TestConstants; @Slf4j public class UnfreezeBalanceActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceV2ActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceV2ActuatorTest.java index d53601bba0e..fd3a13990b6 100644 --- a/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceV2ActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceV2ActuatorTest.java @@ -11,6 +11,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -25,7 +26,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract; import org.tron.protos.contract.Common.ResourceCode; -import org.tron.common.TestConstants; @Slf4j public class UnfreezeBalanceV2ActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateAccountActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateAccountActuatorTest.java index a5ebed64701..ab2108096dd 100755 --- a/framework/src/test/java/org/tron/core/actuator/UpdateAccountActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateAccountActuatorTest.java @@ -9,6 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -20,7 +21,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AccountContract.AccountUpdateContract; import org.tron.protos.contract.AssetIssueContractOuterClass; -import org.tron.common.TestConstants; @Slf4j public class UpdateAccountActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java index c54b5bf52b3..1c17b3873c4 100644 --- a/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; import org.tron.core.Wallet; @@ -23,7 +24,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.AssetIssueContractOuterClass.UpdateAssetContract; -import org.tron.common.TestConstants; @Slf4j public class UpdateAssetActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateBrokerageActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateBrokerageActuatorTest.java index 9e6fb291fe4..497792a201b 100644 --- a/framework/src/test/java/org/tron/core/actuator/UpdateBrokerageActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateBrokerageActuatorTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -23,7 +24,6 @@ import org.tron.protos.Protocol.AccountType; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.StorageContract.UpdateBrokerageContract; -import org.tron.common.TestConstants; @Slf4j(topic = "actuator") public class UpdateBrokerageActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateEnergyLimitContractActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateEnergyLimitContractActuatorTest.java index af6b70cf563..d44d4c721a6 100644 --- a/framework/src/test/java/org/tron/core/actuator/UpdateEnergyLimitContractActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateEnergyLimitContractActuatorTest.java @@ -12,6 +12,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; @@ -28,7 +29,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.SmartContractOuterClass.SmartContract; import org.tron.protos.contract.SmartContractOuterClass.UpdateEnergyLimitContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateSettingContractActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateSettingContractActuatorTest.java index 503241bfac5..7c769746359 100644 --- a/framework/src/test/java/org/tron/core/actuator/UpdateSettingContractActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateSettingContractActuatorTest.java @@ -9,6 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; import org.tron.core.Wallet; @@ -22,7 +23,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.SmartContractOuterClass.SmartContract; import org.tron.protos.contract.SmartContractOuterClass.UpdateSettingContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/actuator/VoteWitnessActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/VoteWitnessActuatorTest.java index 4e53347b879..6ec72043722 100644 --- a/framework/src/test/java/org/tron/core/actuator/VoteWitnessActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/VoteWitnessActuatorTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; import org.tron.consensus.dpos.MaintenanceManager; @@ -29,7 +30,6 @@ import org.tron.protos.contract.BalanceContract.FreezeBalanceContract; import org.tron.protos.contract.WitnessContract.VoteWitnessContract; import org.tron.protos.contract.WitnessContract.VoteWitnessContract.Vote; -import org.tron.common.TestConstants; @Slf4j public class VoteWitnessActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/WithdrawBalanceActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/WithdrawBalanceActuatorTest.java index 74c10a71926..12f03769a73 100644 --- a/framework/src/test/java/org/tron/core/actuator/WithdrawBalanceActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/WithdrawBalanceActuatorTest.java @@ -9,6 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.args.Witness; import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; @@ -24,7 +25,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.WithdrawBalanceContract; -import org.tron.common.TestConstants; @Slf4j public class WithdrawBalanceActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/WithdrawExpireUnfreezeActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/WithdrawExpireUnfreezeActuatorTest.java index b4454f6f82b..40347f7c5fb 100644 --- a/framework/src/test/java/org/tron/core/actuator/WithdrawExpireUnfreezeActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/WithdrawExpireUnfreezeActuatorTest.java @@ -13,6 +13,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -27,7 +28,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.WithdrawExpireUnfreezeContract; -import org.tron.common.TestConstants; @Slf4j public class WithdrawExpireUnfreezeActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/WitnessCreateActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/WitnessCreateActuatorTest.java index 9adcad7cf96..bf146382f48 100644 --- a/framework/src/test/java/org/tron/core/actuator/WitnessCreateActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/WitnessCreateActuatorTest.java @@ -9,6 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -21,7 +22,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.WitnessContract.WitnessCreateContract; -import org.tron.common.TestConstants; @Slf4j public class WitnessCreateActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/WitnessUpdateActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/WitnessUpdateActuatorTest.java index bad4eacd11e..f2281ecc287 100644 --- a/framework/src/test/java/org/tron/core/actuator/WitnessUpdateActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/WitnessUpdateActuatorTest.java @@ -9,6 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -21,7 +22,6 @@ import org.tron.protos.Protocol.Transaction.Result.code; import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.WitnessContract.WitnessUpdateContract; -import org.tron.common.TestConstants; @Slf4j public class WitnessUpdateActuatorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java b/framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java index 35f36270f0b..15bcf7ce811 100644 --- a/framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java +++ b/framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java @@ -16,6 +16,7 @@ import org.junit.Test; import org.junit.function.ThrowingRunnable; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.ForkController; import org.tron.core.Constant; @@ -30,7 +31,6 @@ import org.tron.core.utils.ProposalUtil; import org.tron.core.utils.ProposalUtil.ProposalType; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j(topic = "actuator") public class ProposalUtilTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java b/framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java index 68856513739..15842bfa2c8 100644 --- a/framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java +++ b/framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java @@ -23,6 +23,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.ChainBaseManager; import org.tron.core.Constant; @@ -37,7 +38,6 @@ import org.tron.protos.Protocol.Transaction; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.contract.BalanceContract.DelegateResourceContract; -import org.tron.common.TestConstants; @Slf4j(topic = "capsule") public class TransactionUtilTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceListenerTest.java b/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceListenerTest.java index 092e7e6bb7b..fc0bc502790 100644 --- a/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceListenerTest.java +++ b/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceListenerTest.java @@ -12,6 +12,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.runtime.vm.DataWord; import org.tron.core.config.args.Args; import org.tron.core.db.TransactionStoreTest; @@ -20,7 +21,6 @@ import org.tron.core.vm.trace.OpActions.Action; import org.tron.core.vm.trace.ProgramTrace; import org.tron.core.vm.trace.ProgramTraceListener; -import org.tron.common.TestConstants; @Slf4j(topic = "VM") public class ProgramTraceListenerTest { diff --git a/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceTest.java b/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceTest.java index 7fae13c1b97..9868851acac 100644 --- a/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceTest.java +++ b/framework/src/test/java/org/tron/core/actuator/vm/ProgramTraceTest.java @@ -9,12 +9,12 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.runtime.vm.DataWord; import org.tron.core.config.args.Args; import org.tron.core.vm.trace.Op; import org.tron.core.vm.trace.OpActions; import org.tron.core.vm.trace.ProgramTrace; -import org.tron.common.TestConstants; public class ProgramTraceTest { diff --git a/framework/src/test/java/org/tron/core/capsule/AccountCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/AccountCapsuleTest.java index 6c6c114eb47..50b6eb8a5dd 100644 --- a/framework/src/test/java/org/tron/core/capsule/AccountCapsuleTest.java +++ b/framework/src/test/java/org/tron/core/capsule/AccountCapsuleTest.java @@ -8,6 +8,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.config.args.Args; @@ -16,7 +17,6 @@ import org.tron.protos.Protocol.Permission; import org.tron.protos.Protocol.Vote; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; -import org.tron.common.TestConstants; public class AccountCapsuleTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/capsule/BlockCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/BlockCapsuleTest.java index 677d6c78178..87c412dc15c 100644 --- a/framework/src/test/java/org/tron/core/capsule/BlockCapsuleTest.java +++ b/framework/src/test/java/org/tron/core/capsule/BlockCapsuleTest.java @@ -12,6 +12,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.LocalWitnesses; import org.tron.common.utils.PublicMethod; @@ -22,7 +23,6 @@ import org.tron.core.exception.BadItemException; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.contract.BalanceContract.TransferContract; -import org.tron.common.TestConstants; @Slf4j public class BlockCapsuleTest { diff --git a/framework/src/test/java/org/tron/core/capsule/ExchangeCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/ExchangeCapsuleTest.java index 40323e984b1..be16b511bb8 100644 --- a/framework/src/test/java/org/tron/core/capsule/ExchangeCapsuleTest.java +++ b/framework/src/test/java/org/tron/core/capsule/ExchangeCapsuleTest.java @@ -6,10 +6,10 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; -import org.tron.common.TestConstants; @Slf4j public class ExchangeCapsuleTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/capsule/TransactionCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/TransactionCapsuleTest.java index 4c0186ae296..70434430262 100644 --- a/framework/src/test/java/org/tron/core/capsule/TransactionCapsuleTest.java +++ b/framework/src/test/java/org/tron/core/capsule/TransactionCapsuleTest.java @@ -11,6 +11,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.StringUtil; import org.tron.core.Wallet; import org.tron.core.config.args.Args; @@ -20,7 +21,6 @@ import org.tron.protos.Protocol.Transaction.Result; import org.tron.protos.Protocol.Transaction.Result.contractResult; import org.tron.protos.Protocol.Transaction.raw; -import org.tron.common.TestConstants; @Slf4j public class TransactionCapsuleTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/capsule/VotesCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/VotesCapsuleTest.java index baebc58a4bb..d98fba15ccd 100644 --- a/framework/src/test/java/org/tron/core/capsule/VotesCapsuleTest.java +++ b/framework/src/test/java/org/tron/core/capsule/VotesCapsuleTest.java @@ -11,12 +11,12 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.utils.StringUtil; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.db.TransactionStoreTest; import org.tron.protos.Protocol.Vote; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/capsule/utils/AssetUtilTest.java b/framework/src/test/java/org/tron/core/capsule/utils/AssetUtilTest.java index e9f99d4707f..e768f46dfe5 100644 --- a/framework/src/test/java/org/tron/core/capsule/utils/AssetUtilTest.java +++ b/framework/src/test/java/org/tron/core/capsule/utils/AssetUtilTest.java @@ -10,6 +10,7 @@ import org.junit.Test; import org.tron.api.GrpcAPI.AssetIssueList; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AssetIssueCapsule; @@ -17,7 +18,6 @@ import org.tron.core.db.BandwidthProcessor; import org.tron.protos.Protocol; import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; -import org.tron.common.TestConstants; @Slf4j public class AssetUtilTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/capsule/utils/ExchangeProcessorTest.java b/framework/src/test/java/org/tron/core/capsule/utils/ExchangeProcessorTest.java index cc1fa9200f0..968719e8263 100644 --- a/framework/src/test/java/org/tron/core/capsule/utils/ExchangeProcessorTest.java +++ b/framework/src/test/java/org/tron/core/capsule/utils/ExchangeProcessorTest.java @@ -5,9 +5,9 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.ExchangeProcessor; import org.tron.core.config.args.Args; -import org.tron.common.TestConstants; @Slf4j public class ExchangeProcessorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/config/ConfigurationTest.java b/framework/src/test/java/org/tron/core/config/ConfigurationTest.java index ce0c0396663..11ceb88bfcc 100644 --- a/framework/src/test/java/org/tron/core/config/ConfigurationTest.java +++ b/framework/src/test/java/org/tron/core/config/ConfigurationTest.java @@ -31,10 +31,10 @@ import org.bouncycastle.util.encoders.Hex; import org.junit.Before; import org.junit.Test; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; -import org.tron.common.TestConstants; @Slf4j public class ConfigurationTest { diff --git a/framework/src/test/java/org/tron/core/config/args/ArgsTest.java b/framework/src/test/java/org/tron/core/config/args/ArgsTest.java index 7e0ff40b0eb..6fb0e1c3cdd 100644 --- a/framework/src/test/java/org/tron/core/config/args/ArgsTest.java +++ b/framework/src/test/java/org/tron/core/config/args/ArgsTest.java @@ -31,6 +31,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.tron.common.TestConstants; import org.tron.common.args.GenesisBlock; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ByteArray; @@ -39,7 +40,6 @@ import org.tron.common.utils.PublicMethod; import org.tron.core.Constant; import org.tron.core.config.Configuration; -import org.tron.common.TestConstants; @Slf4j public class ArgsTest { diff --git a/framework/src/test/java/org/tron/core/config/args/DynamicArgsTest.java b/framework/src/test/java/org/tron/core/config/args/DynamicArgsTest.java index c591aec4bcb..8e32c400806 100644 --- a/framework/src/test/java/org/tron/core/config/args/DynamicArgsTest.java +++ b/framework/src/test/java/org/tron/core/config/args/DynamicArgsTest.java @@ -8,6 +8,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ReflectUtils; @@ -15,7 +16,6 @@ import org.tron.core.config.DefaultConfig; import org.tron.core.net.TronNetService; import org.tron.p2p.P2pConfig; -import org.tron.common.TestConstants; public class DynamicArgsTest { protected TronApplicationContext context; diff --git a/framework/src/test/java/org/tron/core/config/args/LocalWitnessTest.java b/framework/src/test/java/org/tron/core/config/args/LocalWitnessTest.java index 01c9b234616..83a65926446 100644 --- a/framework/src/test/java/org/tron/core/config/args/LocalWitnessTest.java +++ b/framework/src/test/java/org/tron/core/config/args/LocalWitnessTest.java @@ -29,13 +29,13 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.LocalWitnesses; import org.tron.common.utils.PublicMethod; import org.tron.common.utils.StringUtil; import org.tron.core.exception.TronError; import org.tron.core.exception.TronError.ErrCode; -import org.tron.common.TestConstants; public class LocalWitnessTest { diff --git a/framework/src/test/java/org/tron/core/consensus/DposServiceTest.java b/framework/src/test/java/org/tron/core/consensus/DposServiceTest.java index 3c8b898e247..e6aafc9e166 100644 --- a/framework/src/test/java/org/tron/core/consensus/DposServiceTest.java +++ b/framework/src/test/java/org/tron/core/consensus/DposServiceTest.java @@ -8,6 +8,7 @@ import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.consensus.ConsensusDelegate; import org.tron.consensus.dpos.DposService; @@ -17,7 +18,6 @@ import org.tron.core.store.DynamicPropertiesStore; import org.tron.p2p.utils.NetUtil; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class DposServiceTest { DposService service = new DposService(); diff --git a/framework/src/test/java/org/tron/core/db/AbiStoreTest.java b/framework/src/test/java/org/tron/core/db/AbiStoreTest.java index b9d1b40fcf0..f39f5ad19c8 100644 --- a/framework/src/test/java/org/tron/core/db/AbiStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AbiStoreTest.java @@ -9,6 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.AbiCapsule; import org.tron.core.capsule.AccountCapsule; @@ -17,7 +18,6 @@ import org.tron.core.store.AccountIndexStore; import org.tron.protos.Protocol.AccountType; import org.tron.protos.contract.SmartContractOuterClass; -import org.tron.common.TestConstants; public class AbiStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/AccountAssetStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountAssetStoreTest.java index e098f834afb..88734945687 100644 --- a/framework/src/test/java/org/tron/core/db/AccountAssetStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountAssetStoreTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -19,7 +20,6 @@ import org.tron.core.store.AccountStore; import org.tron.protos.Protocol; import org.tron.protos.contract.AssetIssueContractOuterClass; -import org.tron.common.TestConstants; public class AccountAssetStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java index 24c1eecee11..236c3464697 100644 --- a/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java @@ -8,12 +8,12 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.AccountIdIndexStore; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; public class AccountIdIndexStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/AccountIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountIndexStoreTest.java index 4b1a80b433d..4971132b8c5 100755 --- a/framework/src/test/java/org/tron/core/db/AccountIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountIndexStoreTest.java @@ -6,12 +6,12 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.AccountIndexStore; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; public class AccountIndexStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/AccountStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountStoreTest.java index 42571ec1e1b..a908d5d3cea 100755 --- a/framework/src/test/java/org/tron/core/db/AccountStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountStoreTest.java @@ -17,6 +17,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; @@ -27,7 +28,6 @@ import org.tron.core.store.AssetIssueStore; import org.tron.core.store.DynamicPropertiesStore; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; public class AccountStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/AccountTraceStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountTraceStoreTest.java index bf73afd9c14..cc725a36c3b 100644 --- a/framework/src/test/java/org/tron/core/db/AccountTraceStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountTraceStoreTest.java @@ -9,6 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.AccountTraceCapsule; @@ -18,7 +19,6 @@ import org.tron.core.store.AccountIndexStore; import org.tron.core.store.AccountTraceStore; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; public class AccountTraceStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/AssetIssueStoreTest.java b/framework/src/test/java/org/tron/core/db/AssetIssueStoreTest.java index d40e34d86fd..703ce67fd88 100644 --- a/framework/src/test/java/org/tron/core/db/AssetIssueStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AssetIssueStoreTest.java @@ -6,12 +6,12 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.AssetIssueCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.AssetIssueStore; import org.tron.protos.contract.AssetIssueContractOuterClass; -import org.tron.common.TestConstants; public class AssetIssueStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/AssetIssueV2StoreTest.java b/framework/src/test/java/org/tron/core/db/AssetIssueV2StoreTest.java index 46bb2d3bd0f..6a33107b156 100644 --- a/framework/src/test/java/org/tron/core/db/AssetIssueV2StoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AssetIssueV2StoreTest.java @@ -6,11 +6,11 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.AssetIssueCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.AssetIssueV2Store; import org.tron.protos.contract.AssetIssueContractOuterClass; -import org.tron.common.TestConstants; public class AssetIssueV2StoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/BalanceTraceStoreTest.java b/framework/src/test/java/org/tron/core/db/BalanceTraceStoreTest.java index 53a4340e067..f7b6db1f0dd 100644 --- a/framework/src/test/java/org/tron/core/db/BalanceTraceStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/BalanceTraceStoreTest.java @@ -12,6 +12,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.BlockBalanceTraceCapsule; import org.tron.core.capsule.BlockCapsule; @@ -20,7 +21,6 @@ import org.tron.core.store.BalanceTraceStore; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; -import org.tron.common.TestConstants; public class BalanceTraceStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/BandwidthPriceHistoryLoaderTest.java b/framework/src/test/java/org/tron/core/db/BandwidthPriceHistoryLoaderTest.java index 5e3c2cea657..64bc5c8a39d 100644 --- a/framework/src/test/java/org/tron/core/db/BandwidthPriceHistoryLoaderTest.java +++ b/framework/src/test/java/org/tron/core/db/BandwidthPriceHistoryLoaderTest.java @@ -21,6 +21,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.core.ChainBaseManager; import org.tron.core.capsule.ProposalCapsule; @@ -29,7 +30,6 @@ import org.tron.core.db.api.BandwidthPriceHistoryLoader; import org.tron.protos.Protocol.Proposal; import org.tron.protos.Protocol.Proposal.State; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/db/BlockIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/BlockIndexStoreTest.java index 9777fdfbe2d..32c7cf0c98a 100644 --- a/framework/src/test/java/org/tron/core/db/BlockIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/BlockIndexStoreTest.java @@ -5,13 +5,13 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Sha256Hash; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; -import org.tron.common.TestConstants; public class BlockIndexStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/BlockStoreTest.java b/framework/src/test/java/org/tron/core/db/BlockStoreTest.java index 6a6fe3f97a7..1868eae4cba 100644 --- a/framework/src/test/java/org/tron/core/db/BlockStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/BlockStoreTest.java @@ -6,12 +6,12 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.Sha256Hash; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.BadItemException; import org.tron.core.exception.ItemNotFoundException; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/db/CodeStoreTest.java b/framework/src/test/java/org/tron/core/db/CodeStoreTest.java index 228da1a5cf3..bf0a0b8c27c 100644 --- a/framework/src/test/java/org/tron/core/db/CodeStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/CodeStoreTest.java @@ -9,11 +9,11 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.CodeCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.CodeStore; -import org.tron.common.TestConstants; public class CodeStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/ContractStoreTest.java b/framework/src/test/java/org/tron/core/db/ContractStoreTest.java index 2b18379ac84..c5636d6dc1a 100644 --- a/framework/src/test/java/org/tron/core/db/ContractStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/ContractStoreTest.java @@ -6,13 +6,13 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.ContractCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.ContractStore; import org.tron.protos.contract.SmartContractOuterClass; -import org.tron.common.TestConstants; public class ContractStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/DelegatedResourceAccountIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/DelegatedResourceAccountIndexStoreTest.java index 438b9d59eed..d4f11c64e6f 100644 --- a/framework/src/test/java/org/tron/core/db/DelegatedResourceAccountIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/DelegatedResourceAccountIndexStoreTest.java @@ -7,12 +7,12 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.DecodeUtil; import org.tron.core.capsule.DelegatedResourceAccountIndexCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.DelegatedResourceAccountIndexStore; -import org.tron.common.TestConstants; public class DelegatedResourceAccountIndexStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/DelegatedResourceStoreTest.java b/framework/src/test/java/org/tron/core/db/DelegatedResourceStoreTest.java index ba70ef203ea..3e2deb6b1ad 100644 --- a/framework/src/test/java/org/tron/core/db/DelegatedResourceStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/DelegatedResourceStoreTest.java @@ -6,11 +6,11 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.DelegatedResourceCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.DelegatedResourceStore; -import org.tron.common.TestConstants; public class DelegatedResourceStoreTest extends BaseTest { private static final long BALANCE = 1_000_000; diff --git a/framework/src/test/java/org/tron/core/db/DelegationStoreTest.java b/framework/src/test/java/org/tron/core/db/DelegationStoreTest.java index 1a945d2115b..7fd0bc062d0 100644 --- a/framework/src/test/java/org/tron/core/db/DelegationStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/DelegationStoreTest.java @@ -6,11 +6,11 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.DelegationStore; -import org.tron.common.TestConstants; public class DelegationStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/EnergyPriceHistoryLoaderTest.java b/framework/src/test/java/org/tron/core/db/EnergyPriceHistoryLoaderTest.java index 5c480e14b1d..1e20ca5d69d 100644 --- a/framework/src/test/java/org/tron/core/db/EnergyPriceHistoryLoaderTest.java +++ b/framework/src/test/java/org/tron/core/db/EnergyPriceHistoryLoaderTest.java @@ -14,13 +14,13 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.ProposalCapsule; import org.tron.core.config.args.Args; import org.tron.core.db.api.EnergyPriceHistoryLoader; import org.tron.core.store.ProposalStore; import org.tron.protos.Protocol.Proposal; import org.tron.protos.Protocol.Proposal.State; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/db/ExchangeStoreTest.java b/framework/src/test/java/org/tron/core/db/ExchangeStoreTest.java index 09a72a93304..3603cf8eba3 100644 --- a/framework/src/test/java/org/tron/core/db/ExchangeStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/ExchangeStoreTest.java @@ -7,12 +7,12 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.ExchangeCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.ExchangeStore; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class ExchangeStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/ExchangeV2StoreTest.java b/framework/src/test/java/org/tron/core/db/ExchangeV2StoreTest.java index c3a0e342cd0..ece6619dbe4 100644 --- a/framework/src/test/java/org/tron/core/db/ExchangeV2StoreTest.java +++ b/framework/src/test/java/org/tron/core/db/ExchangeV2StoreTest.java @@ -5,12 +5,12 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.ExchangeCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.ExchangeV2Store; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class ExchangeV2StoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/IncrementalMerkleTreeStoreTest.java b/framework/src/test/java/org/tron/core/db/IncrementalMerkleTreeStoreTest.java index 206eef86c83..01d003752a4 100644 --- a/framework/src/test/java/org/tron/core/db/IncrementalMerkleTreeStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/IncrementalMerkleTreeStoreTest.java @@ -5,10 +5,10 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.IncrementalMerkleTreeCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.IncrementalMerkleTreeStore; -import org.tron.common.TestConstants; public class IncrementalMerkleTreeStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/KhaosDatabaseTest.java b/framework/src/test/java/org/tron/core/db/KhaosDatabaseTest.java index e6f388e6cbd..ba7478cb22d 100644 --- a/framework/src/test/java/org/tron/core/db/KhaosDatabaseTest.java +++ b/framework/src/test/java/org/tron/core/db/KhaosDatabaseTest.java @@ -10,6 +10,7 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Pair; @@ -22,7 +23,6 @@ import org.tron.protos.Protocol.Block; import org.tron.protos.Protocol.BlockHeader; import org.tron.protos.Protocol.BlockHeader.raw; -import org.tron.common.TestConstants; @Slf4j public class KhaosDatabaseTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/ManagerTest.java b/framework/src/test/java/org/tron/core/db/ManagerTest.java index 7eba6d7f06f..eb6f7f2de81 100755 --- a/framework/src/test/java/org/tron/core/db/ManagerTest.java +++ b/framework/src/test/java/org/tron/core/db/ManagerTest.java @@ -34,6 +34,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.tron.api.GrpcAPI; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.crypto.ECKey; import org.tron.common.runtime.RuntimeImpl; @@ -104,7 +105,6 @@ import org.tron.protos.contract.AssetIssueContractOuterClass; import org.tron.protos.contract.BalanceContract.TransferContract; import org.tron.protos.contract.ShieldContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/db/MarketAccountStoreTest.java b/framework/src/test/java/org/tron/core/db/MarketAccountStoreTest.java index 54f15a8e77f..3a62df778e8 100644 --- a/framework/src/test/java/org/tron/core/db/MarketAccountStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/MarketAccountStoreTest.java @@ -5,11 +5,11 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.MarketAccountOrderCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.MarketAccountStore; -import org.tron.common.TestConstants; public class MarketAccountStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/MarketOrderStoreTest.java b/framework/src/test/java/org/tron/core/db/MarketOrderStoreTest.java index 3a919b8eb2f..f5916113ef0 100644 --- a/framework/src/test/java/org/tron/core/db/MarketOrderStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/MarketOrderStoreTest.java @@ -5,12 +5,12 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.MarketOrderCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.MarketOrderStore; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class MarketOrderStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/MarketPairPriceToOrderStoreTest.java b/framework/src/test/java/org/tron/core/db/MarketPairPriceToOrderStoreTest.java index 295b6d721da..35cbbd1096f 100755 --- a/framework/src/test/java/org/tron/core/db/MarketPairPriceToOrderStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/MarketPairPriceToOrderStoreTest.java @@ -9,6 +9,7 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.ByteUtil; import org.tron.core.ChainBaseManager; @@ -20,7 +21,6 @@ import org.tron.core.store.MarketPairToPriceStore; import org.tron.protos.Protocol.MarketOrderPair; import org.tron.protos.Protocol.MarketPrice; -import org.tron.common.TestConstants; @Slf4j public class MarketPairPriceToOrderStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/MarketPairToPriceStoreTest.java b/framework/src/test/java/org/tron/core/db/MarketPairToPriceStoreTest.java index 37c31e5931b..141482896b8 100644 --- a/framework/src/test/java/org/tron/core/db/MarketPairToPriceStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/MarketPairToPriceStoreTest.java @@ -6,12 +6,12 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.MarketPairPriceToOrderStore; import org.tron.core.store.MarketPairToPriceStore; -import org.tron.common.TestConstants; public class MarketPairToPriceStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/NullifierStoreTest.java b/framework/src/test/java/org/tron/core/db/NullifierStoreTest.java index e3fc44f6bec..1dec1205c95 100644 --- a/framework/src/test/java/org/tron/core/db/NullifierStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/NullifierStoreTest.java @@ -7,11 +7,11 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.Wallet; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.NullifierStore; -import org.tron.common.TestConstants; public class NullifierStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/ProposalStoreTest.java b/framework/src/test/java/org/tron/core/db/ProposalStoreTest.java index df816c9375a..b9e866e7eeb 100644 --- a/framework/src/test/java/org/tron/core/db/ProposalStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/ProposalStoreTest.java @@ -10,12 +10,12 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.ProposalCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.ProposalStore; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class ProposalStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/RecentBlockStoreTest.java b/framework/src/test/java/org/tron/core/db/RecentBlockStoreTest.java index 1edb611be00..c45eaf09ba5 100644 --- a/framework/src/test/java/org/tron/core/db/RecentBlockStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/RecentBlockStoreTest.java @@ -5,13 +5,13 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Sha256Hash; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; -import org.tron.common.TestConstants; public class RecentBlockStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/RecentTransactionStoreTest.java b/framework/src/test/java/org/tron/core/db/RecentTransactionStoreTest.java index d915ab997b3..39df57ab679 100644 --- a/framework/src/test/java/org/tron/core/db/RecentTransactionStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/RecentTransactionStoreTest.java @@ -6,6 +6,7 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.BytesCapsule; import org.tron.core.capsule.TransactionCapsule; @@ -13,7 +14,6 @@ import org.tron.core.exception.ItemNotFoundException; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; -import org.tron.common.TestConstants; public class RecentTransactionStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/TransactionExpireTest.java b/framework/src/test/java/org/tron/core/db/TransactionExpireTest.java index e02a5c48b9e..e4b6b190b0b 100644 --- a/framework/src/test/java/org/tron/core/db/TransactionExpireTest.java +++ b/framework/src/test/java/org/tron/core/db/TransactionExpireTest.java @@ -13,6 +13,7 @@ import org.tron.api.GrpcAPI; import org.tron.api.GrpcAPI.Return.response_code; import org.tron.api.GrpcAPI.TransactionApprovedList; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ByteArray; @@ -29,7 +30,6 @@ import org.tron.protos.Protocol.Transaction; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.contract.BalanceContract.TransferContract; -import org.tron.common.TestConstants; @Slf4j public class TransactionExpireTest { diff --git a/framework/src/test/java/org/tron/core/db/TransactionHistoryTest.java b/framework/src/test/java/org/tron/core/db/TransactionHistoryTest.java index 59c02cdec8b..676293efbc0 100644 --- a/framework/src/test/java/org/tron/core/db/TransactionHistoryTest.java +++ b/framework/src/test/java/org/tron/core/db/TransactionHistoryTest.java @@ -6,12 +6,12 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.TransactionInfoCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.BadItemException; import org.tron.core.store.TransactionHistoryStore; -import org.tron.common.TestConstants; public class TransactionHistoryTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/TransactionRetStoreTest.java b/framework/src/test/java/org/tron/core/db/TransactionRetStoreTest.java index f47b8ad08d2..6cd7af96577 100644 --- a/framework/src/test/java/org/tron/core/db/TransactionRetStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/TransactionRetStoreTest.java @@ -6,6 +6,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.TransactionCapsule; import org.tron.core.capsule.TransactionInfoCapsule; @@ -14,7 +15,6 @@ import org.tron.core.exception.BadItemException; import org.tron.core.store.TransactionRetStore; import org.tron.protos.Protocol.Transaction; -import org.tron.common.TestConstants; public class TransactionRetStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/TransactionStoreTest.java b/framework/src/test/java/org/tron/core/db/TransactionStoreTest.java index 896b9151494..5341cffd171 100644 --- a/framework/src/test/java/org/tron/core/db/TransactionStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/TransactionStoreTest.java @@ -7,6 +7,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.utils.ByteArray; import org.tron.common.utils.PublicMethod; @@ -25,7 +26,6 @@ import org.tron.protos.contract.WitnessContract.VoteWitnessContract; import org.tron.protos.contract.WitnessContract.VoteWitnessContract.Vote; import org.tron.protos.contract.WitnessContract.WitnessCreateContract; -import org.tron.common.TestConstants; public class TransactionStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/TreeBlockIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/TreeBlockIndexStoreTest.java index 92fa9b90592..f338acb1783 100644 --- a/framework/src/test/java/org/tron/core/db/TreeBlockIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/TreeBlockIndexStoreTest.java @@ -4,12 +4,12 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.store.TreeBlockIndexStore; -import org.tron.common.TestConstants; public class TreeBlockIndexStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/TronDatabaseTest.java b/framework/src/test/java/org/tron/core/db/TronDatabaseTest.java index 25918ab87a0..52adf8e49fa 100644 --- a/framework/src/test/java/org/tron/core/db/TronDatabaseTest.java +++ b/framework/src/test/java/org/tron/core/db/TronDatabaseTest.java @@ -11,10 +11,10 @@ import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.rocksdb.RocksDB; +import org.tron.common.TestConstants; import org.tron.core.config.args.Args; import org.tron.core.exception.BadItemException; import org.tron.core.exception.ItemNotFoundException; -import org.tron.common.TestConstants; public class TronDatabaseTest extends TronDatabase { @@ -27,7 +27,8 @@ public class TronDatabaseTest extends TronDatabase { @BeforeClass public static void initArgs() throws IOException { - Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); + Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, + TestConstants.TEST_CONF); } @AfterClass diff --git a/framework/src/test/java/org/tron/core/db/TxCacheDBInitTest.java b/framework/src/test/java/org/tron/core/db/TxCacheDBInitTest.java index 7056b35c09c..eb9c3ebdbc7 100644 --- a/framework/src/test/java/org/tron/core/db/TxCacheDBInitTest.java +++ b/framework/src/test/java/org/tron/core/db/TxCacheDBInitTest.java @@ -9,6 +9,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.BytesCapsule; @@ -16,7 +17,6 @@ import org.tron.core.config.args.Args; import org.tron.core.store.DynamicPropertiesStore; import org.tron.keystore.Wallet; -import org.tron.common.TestConstants; @Slf4j public class TxCacheDBInitTest { diff --git a/framework/src/test/java/org/tron/core/db/TxCacheDBTest.java b/framework/src/test/java/org/tron/core/db/TxCacheDBTest.java index 0194aa618d5..e47ef72a29d 100644 --- a/framework/src/test/java/org/tron/core/db/TxCacheDBTest.java +++ b/framework/src/test/java/org/tron/core/db/TxCacheDBTest.java @@ -4,11 +4,11 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; import org.tron.keystore.Wallet; -import org.tron.common.TestConstants; public class TxCacheDBTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/VotesStoreTest.java b/framework/src/test/java/org/tron/core/db/VotesStoreTest.java index 81edc1fd501..c1ee0b1418c 100755 --- a/framework/src/test/java/org/tron/core/db/VotesStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/VotesStoreTest.java @@ -8,11 +8,11 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.VotesCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.VotesStore; import org.tron.protos.Protocol.Vote; -import org.tron.common.TestConstants; @Slf4j public class VotesStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/WitnessScheduleStoreTest.java b/framework/src/test/java/org/tron/core/db/WitnessScheduleStoreTest.java index aa1de420068..e11cfbefa94 100644 --- a/framework/src/test/java/org/tron/core/db/WitnessScheduleStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/WitnessScheduleStoreTest.java @@ -9,10 +9,10 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.config.args.Args; import org.tron.core.store.WitnessScheduleStore; -import org.tron.common.TestConstants; public class WitnessScheduleStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/WitnessStoreTest.java b/framework/src/test/java/org/tron/core/db/WitnessStoreTest.java index a0e0cc866a0..bf7d28de572 100755 --- a/framework/src/test/java/org/tron/core/db/WitnessStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/WitnessStoreTest.java @@ -9,10 +9,10 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.WitnessCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.WitnessStore; -import org.tron.common.TestConstants; @Slf4j public class WitnessStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db/ZKProofStoreTest.java b/framework/src/test/java/org/tron/core/db/ZKProofStoreTest.java index 88bd186d6f2..1ed93c800a4 100644 --- a/framework/src/test/java/org/tron/core/db/ZKProofStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/ZKProofStoreTest.java @@ -5,12 +5,12 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.capsule.TransactionCapsule; import org.tron.core.config.args.Args; import org.tron.core.store.ZKProofStore; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; -import org.tron.common.TestConstants; public class ZKProofStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/db2/ChainbaseTest.java b/framework/src/test/java/org/tron/core/db2/ChainbaseTest.java index 24437109faa..1be01a97bb0 100644 --- a/framework/src/test/java/org/tron/core/db2/ChainbaseTest.java +++ b/framework/src/test/java/org/tron/core/db2/ChainbaseTest.java @@ -11,6 +11,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.rocksdb.RocksDB; +import org.tron.common.TestConstants; import org.tron.common.storage.leveldb.LevelDbDataSourceImpl; import org.tron.common.storage.rocksdb.RocksDbDataSourceImpl; import org.tron.common.utils.ByteArray; @@ -20,7 +21,6 @@ import org.tron.core.db2.core.Chainbase; import org.tron.core.db2.core.Snapshot; import org.tron.core.db2.core.SnapshotRoot; -import org.tron.common.TestConstants; @Slf4j public class ChainbaseTest { diff --git a/framework/src/test/java/org/tron/core/db2/CheckpointV2Test.java b/framework/src/test/java/org/tron/core/db2/CheckpointV2Test.java index b4bff54bdb5..2a4a76a2614 100644 --- a/framework/src/test/java/org/tron/core/db2/CheckpointV2Test.java +++ b/framework/src/test/java/org/tron/core/db2/CheckpointV2Test.java @@ -16,6 +16,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -26,7 +27,6 @@ import org.tron.core.db2.RevokingDbWithCacheNewValueTest.TestRevokingTronStore; import org.tron.core.db2.core.Chainbase; import org.tron.core.db2.core.SnapshotManager; -import org.tron.common.TestConstants; @Slf4j public class CheckpointV2Test { diff --git a/framework/src/test/java/org/tron/core/db2/RevokingDbWithCacheNewValueTest.java b/framework/src/test/java/org/tron/core/db2/RevokingDbWithCacheNewValueTest.java index 62b7b0f3b55..8d294e16b9d 100644 --- a/framework/src/test/java/org/tron/core/db2/RevokingDbWithCacheNewValueTest.java +++ b/framework/src/test/java/org/tron/core/db2/RevokingDbWithCacheNewValueTest.java @@ -13,6 +13,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -25,7 +26,6 @@ import org.tron.core.db2.SnapshotRootTest.ProtoCapsuleTest; import org.tron.core.db2.core.SnapshotManager; import org.tron.core.exception.RevokingStoreIllegalStateException; -import org.tron.common.TestConstants; @Slf4j public class RevokingDbWithCacheNewValueTest { diff --git a/framework/src/test/java/org/tron/core/db2/SnapshotImplTest.java b/framework/src/test/java/org/tron/core/db2/SnapshotImplTest.java index 606189f3d97..b0596b2b3d2 100644 --- a/framework/src/test/java/org/tron/core/db2/SnapshotImplTest.java +++ b/framework/src/test/java/org/tron/core/db2/SnapshotImplTest.java @@ -10,6 +10,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -19,7 +20,6 @@ import org.tron.core.db2.core.SnapshotImpl; import org.tron.core.db2.core.SnapshotManager; import org.tron.core.db2.core.SnapshotRoot; -import org.tron.common.TestConstants; public class SnapshotImplTest { private RevokingDbWithCacheNewValueTest.TestRevokingTronStore tronDatabase; @@ -31,7 +31,8 @@ public class SnapshotImplTest { @Before public void init() throws IOException { - Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); + Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, + TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); appT = ApplicationFactory.create(context); diff --git a/framework/src/test/java/org/tron/core/db2/SnapshotManagerTest.java b/framework/src/test/java/org/tron/core/db2/SnapshotManagerTest.java index d29a76ba7a8..591e731dd55 100644 --- a/framework/src/test/java/org/tron/core/db2/SnapshotManagerTest.java +++ b/framework/src/test/java/org/tron/core/db2/SnapshotManagerTest.java @@ -18,6 +18,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -32,7 +33,6 @@ import org.tron.core.exception.BadItemException; import org.tron.core.exception.ItemNotFoundException; import org.tron.core.exception.TronError; -import org.tron.common.TestConstants; @Slf4j public class SnapshotManagerTest { diff --git a/framework/src/test/java/org/tron/core/db2/SnapshotRootTest.java b/framework/src/test/java/org/tron/core/db2/SnapshotRootTest.java index 702bcffc6de..b51594e0af9 100644 --- a/framework/src/test/java/org/tron/core/db2/SnapshotRootTest.java +++ b/framework/src/test/java/org/tron/core/db2/SnapshotRootTest.java @@ -20,6 +20,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.springframework.util.CollectionUtils; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -34,7 +35,6 @@ import org.tron.core.db2.core.SnapshotManager; import org.tron.core.db2.core.SnapshotRoot; import org.tron.core.exception.ItemNotFoundException; -import org.tron.common.TestConstants; public class SnapshotRootTest { @@ -56,7 +56,8 @@ public class SnapshotRootTest { @Before public void init() throws IOException { - Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); + Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, + TestConstants.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); appT = ApplicationFactory.create(context); } diff --git a/framework/src/test/java/org/tron/core/event/BlockEventGetTest.java b/framework/src/test/java/org/tron/core/event/BlockEventGetTest.java index 45dc7205afc..d1fb95f2f69 100644 --- a/framework/src/test/java/org/tron/core/event/BlockEventGetTest.java +++ b/framework/src/test/java/org/tron/core/event/BlockEventGetTest.java @@ -20,6 +20,7 @@ import org.junit.rules.TemporaryFolder; import org.mockito.Mockito; import org.tron.api.GrpcAPI; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.logsfilter.EventPluginConfig; import org.tron.common.logsfilter.EventPluginLoader; @@ -46,7 +47,6 @@ import org.tron.core.store.DynamicPropertiesStore; import org.tron.core.store.TransactionRetStore; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j public class BlockEventGetTest extends BlockGenerate { diff --git a/framework/src/test/java/org/tron/core/exception/TronErrorTest.java b/framework/src/test/java/org/tron/core/exception/TronErrorTest.java index 570809b5823..b620ad7d476 100644 --- a/framework/src/test/java/org/tron/core/exception/TronErrorTest.java +++ b/framework/src/test/java/org/tron/core/exception/TronErrorTest.java @@ -31,6 +31,7 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.slf4j.LoggerFactory; +import org.tron.common.TestConstants; import org.tron.common.arch.Arch; import org.tron.common.log.LogService; import org.tron.common.parameter.RateLimiterInitialization; @@ -41,7 +42,6 @@ import org.tron.core.services.http.GetBlockServlet; import org.tron.core.services.http.RateLimiterServlet; import org.tron.core.zen.ZksnarkInitService; -import org.tron.common.TestConstants; @RunWith(MockitoJUnitRunner.class) diff --git a/framework/src/test/java/org/tron/core/jsonrpc/BuildTransactionTest.java b/framework/src/test/java/org/tron/core/jsonrpc/BuildTransactionTest.java index a9ef7f78656..56cfd25ae5d 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/BuildTransactionTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/BuildTransactionTest.java @@ -7,6 +7,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -16,7 +17,6 @@ import org.tron.protos.Protocol; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.contract.SmartContractOuterClass.SmartContract; -import org.tron.common.TestConstants; @Slf4j public class BuildTransactionTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java b/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java index c4861dcc05f..ced7048c9d2 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java @@ -24,6 +24,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.common.prometheus.Metrics; import org.tron.common.utils.ByteArray; @@ -52,7 +53,6 @@ import org.tron.protos.Protocol; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.contract.BalanceContract.TransferContract; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/jsonrpc/LogBlockQueryTest.java b/framework/src/test/java/org/tron/core/jsonrpc/LogBlockQueryTest.java index 36f9047d416..d80d10694a8 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/LogBlockQueryTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/LogBlockQueryTest.java @@ -10,12 +10,12 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.config.args.Args; import org.tron.core.services.jsonrpc.TronJsonRpc.FilterRequest; import org.tron.core.services.jsonrpc.filters.LogBlockQuery; import org.tron.core.services.jsonrpc.filters.LogFilterWrapper; import org.tron.core.store.SectionBloomStore; -import org.tron.common.TestConstants; public class LogBlockQueryTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/jsonrpc/SectionBloomStoreTest.java b/framework/src/test/java/org/tron/core/jsonrpc/SectionBloomStoreTest.java index 6e6c1d003e6..d31f7a4f63d 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/SectionBloomStoreTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/SectionBloomStoreTest.java @@ -9,6 +9,7 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.vm.DataWord; import org.tron.common.runtime.vm.LogInfo; import org.tron.common.utils.ByteArray; @@ -21,7 +22,6 @@ import org.tron.core.store.SectionBloomStore; import org.tron.protos.Protocol.TransactionInfo; import org.tron.protos.Protocol.TransactionInfo.Log; -import org.tron.common.TestConstants; public class SectionBloomStoreTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java b/framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java index ea48c5074b1..fdd9cb44222 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java @@ -7,6 +7,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -17,7 +18,6 @@ import org.tron.core.services.jsonrpc.TronJsonRpcImpl.RequestSource; import org.tron.core.services.jsonrpc.types.BuildArguments; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j public class WalletCursorTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/metrics/MetricsApiServiceTest.java b/framework/src/test/java/org/tron/core/metrics/MetricsApiServiceTest.java index a6fdb0b66f8..d70073e3e70 100644 --- a/framework/src/test/java/org/tron/core/metrics/MetricsApiServiceTest.java +++ b/framework/src/test/java/org/tron/core/metrics/MetricsApiServiceTest.java @@ -8,6 +8,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -17,7 +18,6 @@ import org.tron.core.services.RpcApiService; import org.tron.program.Version; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j public class MetricsApiServiceTest { diff --git a/framework/src/test/java/org/tron/core/metrics/prometheus/PrometheusApiServiceTest.java b/framework/src/test/java/org/tron/core/metrics/prometheus/PrometheusApiServiceTest.java index 93c8ae2babb..d4d758b7a98 100644 --- a/framework/src/test/java/org/tron/core/metrics/prometheus/PrometheusApiServiceTest.java +++ b/framework/src/test/java/org/tron/core/metrics/prometheus/PrometheusApiServiceTest.java @@ -17,6 +17,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.parameter.CommonParameter; import org.tron.common.prometheus.MetricLabels; @@ -34,7 +35,6 @@ import org.tron.core.consensus.ConsensusService; import org.tron.core.net.TronNetDelegate; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j(topic = "metric") public class PrometheusApiServiceTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/net/NodeTest.java b/framework/src/test/java/org/tron/core/net/NodeTest.java index edf1cc162db..69bb8aae312 100644 --- a/framework/src/test/java/org/tron/core/net/NodeTest.java +++ b/framework/src/test/java/org/tron/core/net/NodeTest.java @@ -12,6 +12,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; +import org.tron.common.TestConstants; import org.tron.core.config.Configuration; import org.tron.core.config.args.Args; import org.tron.p2p.discover.Node; @@ -19,7 +20,6 @@ import org.tron.p2p.dns.update.PublishConfig; import org.tron.p2p.utils.NetUtil; import org.tron.protos.Discover.Endpoint; -import org.tron.common.TestConstants; @Slf4j public class NodeTest { diff --git a/framework/src/test/java/org/tron/core/net/P2pEventHandlerImplTest.java b/framework/src/test/java/org/tron/core/net/P2pEventHandlerImplTest.java index 44e6396d332..03c79f495ee 100644 --- a/framework/src/test/java/org/tron/core/net/P2pEventHandlerImplTest.java +++ b/framework/src/test/java/org/tron/core/net/P2pEventHandlerImplTest.java @@ -10,6 +10,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.Sha256Hash; import org.tron.core.config.args.Args; @@ -20,13 +21,13 @@ import org.tron.core.net.service.statistics.PeerStatistics; import org.tron.protos.Protocol; import org.tron.protos.Protocol.Inventory.InventoryType; -import org.tron.common.TestConstants; public class P2pEventHandlerImplTest extends BaseTest { @BeforeClass public static void init() throws Exception { - Args.setParam(new String[] {"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); + Args.setParam(new String[] {"--output-directory", dbPath(), "--debug"}, + TestConstants.TEST_CONF); } @Test diff --git a/framework/src/test/java/org/tron/core/net/TronNetDelegateTest.java b/framework/src/test/java/org/tron/core/net/TronNetDelegateTest.java index c23284d8151..30659bde5d3 100644 --- a/framework/src/test/java/org/tron/core/net/TronNetDelegateTest.java +++ b/framework/src/test/java/org/tron/core/net/TronNetDelegateTest.java @@ -6,12 +6,12 @@ import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.Sha256Hash; import org.tron.core.ChainBaseManager; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.args.Args; -import org.tron.common.TestConstants; public class TronNetDelegateTest { diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/BlockMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/BlockMsgHandlerTest.java index 0b49f3e3f28..82ea2b6cb57 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/BlockMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/BlockMsgHandlerTest.java @@ -19,6 +19,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Sha256Hash; import org.tron.core.Constant; @@ -34,7 +35,6 @@ import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol.Inventory.InventoryType; import org.tron.protos.Protocol.Transaction; -import org.tron.common.TestConstants; @Slf4j public class BlockMsgHandlerTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/InventoryMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/InventoryMsgHandlerTest.java index 045314da9b0..338b44e6699 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/InventoryMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/InventoryMsgHandlerTest.java @@ -8,13 +8,13 @@ import java.util.ArrayList; import org.junit.Test; import org.mockito.Mockito; +import org.tron.common.TestConstants; import org.tron.core.config.args.Args; import org.tron.core.net.TronNetDelegate; import org.tron.core.net.message.adv.InventoryMessage; import org.tron.core.net.peer.PeerConnection; import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol.Inventory.InventoryType; -import org.tron.common.TestConstants; public class InventoryMsgHandlerTest { diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/MessageHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/MessageHandlerTest.java index 69e961d3d0a..b1fb197a2e9 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/MessageHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/MessageHandlerTest.java @@ -13,6 +13,7 @@ import org.junit.rules.TemporaryFolder; import org.mockito.Mockito; import org.springframework.context.ApplicationContext; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ReflectUtils; import org.tron.common.utils.Sha256Hash; @@ -28,7 +29,6 @@ import org.tron.p2p.P2pConfig; import org.tron.p2p.base.Parameter; import org.tron.p2p.connection.Channel; -import org.tron.common.TestConstants; public class MessageHandlerTest { diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/PbftMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/PbftMsgHandlerTest.java index c2ef3726285..65a8f615bfe 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/PbftMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/PbftMsgHandlerTest.java @@ -12,6 +12,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.crypto.SignInterface; import org.tron.common.crypto.SignUtils; @@ -35,7 +36,6 @@ import org.tron.p2p.base.Parameter; import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class PbftMsgHandlerTest { diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/SyncBlockChainMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/SyncBlockChainMsgHandlerTest.java index e40bc126173..7960ef190f1 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/SyncBlockChainMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/SyncBlockChainMsgHandlerTest.java @@ -14,6 +14,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.BlockCapsule.BlockId; @@ -25,7 +26,6 @@ import org.tron.core.net.peer.PeerConnection; import org.tron.core.net.peer.PeerManager; import org.tron.p2p.connection.Channel; -import org.tron.common.TestConstants; public class SyncBlockChainMsgHandlerTest { diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java index a5274e226d1..db8aac00c60 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java @@ -17,6 +17,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.runtime.TvmTestUtils; import org.tron.common.utils.ByteArray; import org.tron.core.config.args.Args; @@ -28,7 +29,6 @@ import org.tron.core.net.service.adv.AdvService; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; -import org.tron.common.TestConstants; public class TransactionsMsgHandlerTest extends BaseTest { @BeforeClass diff --git a/framework/src/test/java/org/tron/core/net/peer/PeerStatusCheckTest.java b/framework/src/test/java/org/tron/core/net/peer/PeerStatusCheckTest.java index 09c9b468aeb..10092626696 100644 --- a/framework/src/test/java/org/tron/core/net/peer/PeerStatusCheckTest.java +++ b/framework/src/test/java/org/tron/core/net/peer/PeerStatusCheckTest.java @@ -13,6 +13,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.mockito.Mockito; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ReflectUtils; import org.tron.core.capsule.BlockCapsule.BlockId; @@ -20,7 +21,6 @@ import org.tron.core.config.Parameter.NetConstants; import org.tron.core.config.args.Args; import org.tron.p2p.connection.Channel; -import org.tron.common.TestConstants; public class PeerStatusCheckTest { diff --git a/framework/src/test/java/org/tron/core/net/service/nodepersist/NodePersistServiceTest.java b/framework/src/test/java/org/tron/core/net/service/nodepersist/NodePersistServiceTest.java index 44c569525d2..2700a41d2c4 100644 --- a/framework/src/test/java/org/tron/core/net/service/nodepersist/NodePersistServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/service/nodepersist/NodePersistServiceTest.java @@ -7,10 +7,10 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.JsonUtil; import org.tron.core.capsule.BytesCapsule; import org.tron.core.config.args.Args; -import org.tron.common.TestConstants; public class NodePersistServiceTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java b/framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java index b1d0b73b864..4c1de32627a 100644 --- a/framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java @@ -13,6 +13,7 @@ import org.junit.rules.TemporaryFolder; import org.mockito.Mockito; import org.springframework.context.ApplicationContext; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ReflectUtils; @@ -30,7 +31,6 @@ import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol; import org.tron.protos.Protocol.Inventory.InventoryType; -import org.tron.common.TestConstants; public class AdvServiceTest { private static TronApplicationContext context; diff --git a/framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java b/framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java index 2ed52b491b3..89041cb9885 100644 --- a/framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java @@ -7,13 +7,13 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.PublicMethod; import org.tron.common.utils.ReflectUtils; import org.tron.core.config.args.Args; import org.tron.core.net.TronNetService; import org.tron.core.net.service.effective.EffectiveCheckService; import org.tron.p2p.P2pConfig; -import org.tron.common.TestConstants; public class EffectiveCheckServiceTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java b/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java index 36e26a749c0..b8b0d5f6deb 100644 --- a/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java @@ -17,6 +17,7 @@ import org.junit.rules.TemporaryFolder; import org.mockito.Mockito; import org.springframework.context.ApplicationContext; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ReflectUtils; import org.tron.common.utils.Sha256Hash; @@ -39,7 +40,6 @@ import org.tron.protos.Discover.Endpoint; import org.tron.protos.Protocol; import org.tron.protos.Protocol.HelloMessage.Builder; -import org.tron.common.TestConstants; public class HandShakeServiceTest { diff --git a/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java b/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java index bd45e9b63d9..88b0527f36f 100644 --- a/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java @@ -23,6 +23,7 @@ import org.mockito.Mockito; import org.springframework.context.ApplicationContext; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.SignInterface; import org.tron.common.crypto.SignUtils; import org.tron.common.parameter.CommonParameter; @@ -47,7 +48,6 @@ import org.tron.p2p.discover.Node; import org.tron.p2p.utils.NetUtil; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j(topic = "net") public class RelayServiceTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/net/services/ResilienceServiceTest.java b/framework/src/test/java/org/tron/core/net/services/ResilienceServiceTest.java index 2c85900aec4..792fb82c2c6 100644 --- a/framework/src/test/java/org/tron/core/net/services/ResilienceServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/ResilienceServiceTest.java @@ -16,6 +16,7 @@ import org.mockito.Mockito; import org.springframework.context.ApplicationContext; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ReflectUtils; import org.tron.core.config.args.Args; import org.tron.core.net.P2pEventHandlerImpl; @@ -23,7 +24,6 @@ import org.tron.core.net.peer.PeerManager; import org.tron.core.net.service.effective.ResilienceService; import org.tron.p2p.connection.Channel; -import org.tron.common.TestConstants; public class ResilienceServiceTest extends BaseTest { @@ -36,7 +36,8 @@ public class ResilienceServiceTest extends BaseTest { @BeforeClass public static void init() throws IOException { - Args.setParam(new String[] {"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF); + Args.setParam(new String[] {"--output-directory", dbPath(), "--debug"}, + TestConstants.TEST_CONF); } @After diff --git a/framework/src/test/java/org/tron/core/net/services/SyncServiceTest.java b/framework/src/test/java/org/tron/core/net/services/SyncServiceTest.java index 413235ed1b0..a34509e7760 100644 --- a/framework/src/test/java/org/tron/core/net/services/SyncServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/SyncServiceTest.java @@ -17,6 +17,7 @@ import org.junit.rules.TemporaryFolder; import org.mockito.Mockito; import org.springframework.context.ApplicationContext; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.ReflectUtils; import org.tron.common.utils.Sha256Hash; @@ -31,7 +32,6 @@ import org.tron.core.net.service.sync.SyncService; import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class SyncServiceTest { protected TronApplicationContext context; diff --git a/framework/src/test/java/org/tron/core/pbft/PbftApiTest.java b/framework/src/test/java/org/tron/core/pbft/PbftApiTest.java index ddb4e6575b2..48af7408b6f 100755 --- a/framework/src/test/java/org/tron/core/pbft/PbftApiTest.java +++ b/framework/src/test/java/org/tron/core/pbft/PbftApiTest.java @@ -16,6 +16,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.PublicMethod; @@ -28,7 +29,6 @@ import org.tron.core.db2.ISession; import org.tron.core.services.interfaceOnPBFT.http.PBFT.HttpApiOnPBFTService; import org.tron.core.store.DynamicPropertiesStore; -import org.tron.common.TestConstants; @Slf4j public class PbftApiTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/ComputeRewardTest.java b/framework/src/test/java/org/tron/core/services/ComputeRewardTest.java index 449cab4ef73..1f0001987d6 100644 --- a/framework/src/test/java/org/tron/core/services/ComputeRewardTest.java +++ b/framework/src/test/java/org/tron/core/services/ComputeRewardTest.java @@ -18,6 +18,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.error.TronDBException; import org.tron.common.es.ExecutorServiceManager; @@ -37,7 +38,6 @@ import org.tron.core.store.RewardViStore; import org.tron.core.store.WitnessStore; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class ComputeRewardTest { diff --git a/framework/src/test/java/org/tron/core/services/NodeInfoServiceTest.java b/framework/src/test/java/org/tron/core/services/NodeInfoServiceTest.java index 68e2ea04f77..10e69258406 100644 --- a/framework/src/test/java/org/tron/core/services/NodeInfoServiceTest.java +++ b/framework/src/test/java/org/tron/core/services/NodeInfoServiceTest.java @@ -11,6 +11,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.entity.NodeInfo; import org.tron.common.utils.PublicMethod; import org.tron.common.utils.ReflectUtils; @@ -23,7 +24,6 @@ import org.tron.p2p.P2pConfig; import org.tron.p2p.connection.Channel; import org.tron.program.Version; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java b/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java index 1c15a9ae4c0..5732e6f1cde 100644 --- a/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java +++ b/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java @@ -15,13 +15,13 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.core.capsule.ProposalCapsule; import org.tron.core.config.args.Args; import org.tron.core.consensus.ProposalService; import org.tron.core.utils.ProposalUtil.ProposalType; import org.tron.protos.Protocol.Proposal; -import org.tron.common.TestConstants; @Slf4j public class ProposalServiceTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java b/framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java index 343f3290386..f40ec48e035 100644 --- a/framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java +++ b/framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java @@ -51,6 +51,7 @@ import org.tron.api.WalletGrpc.WalletBlockingStub; import org.tron.api.WalletSolidityGrpc; import org.tron.api.WalletSolidityGrpc.WalletSolidityBlockingStub; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -113,7 +114,6 @@ import org.tron.protos.contract.WitnessContract.VoteWitnessContract; import org.tron.protos.contract.WitnessContract.WitnessCreateContract; import org.tron.protos.contract.WitnessContract.WitnessUpdateContract; -import org.tron.common.TestConstants; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class RpcApiServicesTest { @@ -148,7 +148,8 @@ public class RpcApiServicesTest { @BeforeClass public static void init() throws IOException { - Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); + Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, + TestConstants.TEST_CONF); Assert.assertEquals(5, getInstance().getRpcMaxRstStream()); Assert.assertEquals(10, getInstance().getRpcSecondsPerWindow()); String OWNER_ADDRESS = Wallet.getAddressPreFixString() diff --git a/framework/src/test/java/org/tron/core/services/WalletApiTest.java b/framework/src/test/java/org/tron/core/services/WalletApiTest.java index bf02b4b04dd..b7a26d6dc73 100644 --- a/framework/src/test/java/org/tron/core/services/WalletApiTest.java +++ b/framework/src/test/java/org/tron/core/services/WalletApiTest.java @@ -14,6 +14,7 @@ import org.junit.rules.Timeout; import org.tron.api.GrpcAPI.EmptyMessage; import org.tron.api.WalletGrpc; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -21,7 +22,6 @@ import org.tron.common.utils.TimeoutInterceptor; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; -import org.tron.common.TestConstants; @Slf4j diff --git a/framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java b/framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java index c366a6a0253..c99b6064d15 100644 --- a/framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java +++ b/framework/src/test/java/org/tron/core/services/filter/HttpApiAccessFilterTest.java @@ -16,13 +16,13 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.PublicMethod; import org.tron.core.config.args.Args; import org.tron.core.services.http.FullNodeHttpApiService; import org.tron.core.services.interfaceOnPBFT.http.PBFT.HttpApiOnPBFTService; import org.tron.core.services.interfaceOnSolidity.http.solidity.HttpApiOnSolidityService; -import org.tron.common.TestConstants; public class HttpApiAccessFilterTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java b/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java index e7ab0ce19fa..42ed21312c3 100644 --- a/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java +++ b/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java @@ -18,6 +18,7 @@ import org.tron.api.GrpcAPI; import org.tron.api.WalletGrpc; import org.tron.api.WalletSolidityGrpc; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -27,7 +28,6 @@ import org.tron.core.Constant; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; -import org.tron.common.TestConstants; @Slf4j public class LiteFnQueryGrpcInterceptorTest { @@ -57,7 +57,8 @@ public class LiteFnQueryGrpcInterceptorTest { */ @BeforeClass public static void init() throws IOException { - Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); + Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, + TestConstants.TEST_CONF); Args.getInstance().setRpcEnable(true); Args.getInstance().setRpcPort(PublicMethod.chooseRandomPort()); Args.getInstance().setRpcSolidityEnable(true); diff --git a/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryHttpFilterTest.java b/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryHttpFilterTest.java index 2584726bd4d..5c9b1d9a52c 100644 --- a/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryHttpFilterTest.java +++ b/framework/src/test/java/org/tron/core/services/filter/LiteFnQueryHttpFilterTest.java @@ -18,9 +18,9 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.PublicMethod; import org.tron.core.config.args.Args; -import org.tron.common.TestConstants; @Slf4j public class LiteFnQueryHttpFilterTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java b/framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java index 790dd0d8040..817693dc630 100644 --- a/framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java +++ b/framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java @@ -31,6 +31,7 @@ import org.tron.api.GrpcAPI.TransactionIdList; import org.tron.api.WalletGrpc; import org.tron.api.WalletSolidityGrpc; +import org.tron.common.TestConstants; import org.tron.common.application.Application; import org.tron.common.application.ApplicationFactory; import org.tron.common.application.TronApplicationContext; @@ -41,7 +42,6 @@ import org.tron.core.config.args.Args; import org.tron.core.services.RpcApiService; import org.tron.protos.Protocol.Transaction; -import org.tron.common.TestConstants; @Slf4j public class RpcApiAccessInterceptorTest { @@ -64,7 +64,8 @@ public class RpcApiAccessInterceptorTest { */ @BeforeClass public static void init() throws IOException { - Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, TestConstants.TEST_CONF); + Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, + TestConstants.TEST_CONF); Args.getInstance().setRpcEnable(true); Args.getInstance().setRpcPort(PublicMethod.chooseRandomPort()); Args.getInstance().setRpcSolidityEnable(true); diff --git a/framework/src/test/java/org/tron/core/services/http/ClearABIServletTest.java b/framework/src/test/java/org/tron/core/services/http/ClearABIServletTest.java index 89bc6fc59bd..b3dbbced559 100644 --- a/framework/src/test/java/org/tron/core/services/http/ClearABIServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/ClearABIServletTest.java @@ -18,11 +18,11 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.ContractCapsule; import org.tron.core.config.args.Args; import org.tron.protos.contract.SmartContractOuterClass; -import org.tron.common.TestConstants; public class ClearABIServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/CreateAccountServletTest.java b/framework/src/test/java/org/tron/core/services/http/CreateAccountServletTest.java index c72bde13d4e..5fa6a778680 100644 --- a/framework/src/test/java/org/tron/core/services/http/CreateAccountServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/CreateAccountServletTest.java @@ -17,11 +17,11 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class CreateAccountServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/CreateAssetIssueServletTest.java b/framework/src/test/java/org/tron/core/services/http/CreateAssetIssueServletTest.java index 413b585e58f..d2e6b831047 100644 --- a/framework/src/test/java/org/tron/core/services/http/CreateAssetIssueServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/CreateAssetIssueServletTest.java @@ -17,11 +17,11 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.AccountCapsule; import org.tron.core.config.args.Args; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class CreateAssetIssueServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/CreateSpendAuthSigServletTest.java b/framework/src/test/java/org/tron/core/services/http/CreateSpendAuthSigServletTest.java index dc6e8a5df05..85d6764132b 100644 --- a/framework/src/test/java/org/tron/core/services/http/CreateSpendAuthSigServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/CreateSpendAuthSigServletTest.java @@ -13,8 +13,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class CreateSpendAuthSigServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/CreateWitnessServletTest.java b/framework/src/test/java/org/tron/core/services/http/CreateWitnessServletTest.java index b745dbaa966..62908c1563f 100644 --- a/framework/src/test/java/org/tron/core/services/http/CreateWitnessServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/CreateWitnessServletTest.java @@ -17,6 +17,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.crypto.ECKey; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Utils; @@ -24,7 +25,6 @@ import org.tron.core.capsule.WitnessCapsule; import org.tron.core.config.args.Args; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class CreateWitnessServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetAccountByIdServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetAccountByIdServletTest.java index 64922ef7aa8..885e5b2a1cf 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetAccountByIdServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetAccountByIdServletTest.java @@ -8,8 +8,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetAccountByIdServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetAssetIssueListServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetAssetIssueListServletTest.java index f3b80559dc2..935a3d1416d 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetAssetIssueListServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetAssetIssueListServletTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetAssetIssueListServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetBandwidthPricesServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetBandwidthPricesServletTest.java index 0c8348101eb..e4837610e23 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetBandwidthPricesServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetBandwidthPricesServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetBandwidthPricesServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetBlockByIdServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetBlockByIdServletTest.java index fbac7884bab..8e04713922a 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetBlockByIdServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetBlockByIdServletTest.java @@ -12,8 +12,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetBlockByIdServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetBlockByNumServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetBlockByNumServletTest.java index c3039f6dd6d..d4d6f33cf17 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetBlockByNumServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetBlockByNumServletTest.java @@ -13,8 +13,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetBlockByNumServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetBrokerageServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetBrokerageServletTest.java index 966005c0961..7588283b4b6 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetBrokerageServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetBrokerageServletTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetBrokerageServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetEnergyPricesServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetEnergyPricesServletTest.java index 9e76cdf8492..6c208c59d39 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetEnergyPricesServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetEnergyPricesServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetEnergyPricesServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetMemoFeePricesServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetMemoFeePricesServletTest.java index f3438b3fc6e..df8cda9e15e 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetMemoFeePricesServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetMemoFeePricesServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetMemoFeePricesServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetNowBlockServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetNowBlockServletTest.java index 655ed6c4af1..bf5ab766fb1 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetNowBlockServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetNowBlockServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetNowBlockServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetRewardServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetRewardServletTest.java index 3b1f623c0cd..29c44c171e2 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetRewardServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetRewardServletTest.java @@ -17,12 +17,12 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.FileUtil; import org.tron.core.config.args.Args; import org.tron.core.db.Manager; import org.tron.core.service.MortgageService; import org.tron.core.store.DelegationStore; -import org.tron.common.TestConstants; @Slf4j public class GetRewardServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByBlockNumServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByBlockNumServletTest.java index dfab71fa140..c2c02453cd4 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByBlockNumServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByBlockNumServletTest.java @@ -16,13 +16,13 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.capsule.TransactionInfoCapsule; import org.tron.core.capsule.TransactionRetCapsule; import org.tron.core.config.args.Args; import org.tron.core.db.TransactionStoreTest; -import org.tron.common.TestConstants; public class GetTransactionInfoByBlockNumServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByIdServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByIdServletTest.java index 786b537db28..ed1bc19aed6 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByIdServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetTransactionInfoByIdServletTest.java @@ -16,6 +16,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -28,7 +29,6 @@ import org.tron.core.store.TransactionRetStore; import org.tron.protos.Protocol; import org.tron.protos.contract.BalanceContract; -import org.tron.common.TestConstants; public class GetTransactionInfoByIdServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/GetTransactionListFromPendingServletTest.java b/framework/src/test/java/org/tron/core/services/http/GetTransactionListFromPendingServletTest.java index 07692dfd387..52277992850 100644 --- a/framework/src/test/java/org/tron/core/services/http/GetTransactionListFromPendingServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/GetTransactionListFromPendingServletTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetTransactionListFromPendingServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/ListNodesServletTest.java b/framework/src/test/java/org/tron/core/services/http/ListNodesServletTest.java index ab24f333e3d..767d89c6e2f 100644 --- a/framework/src/test/java/org/tron/core/services/http/ListNodesServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/ListNodesServletTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class ListNodesServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/ListProposalsServletTest.java b/framework/src/test/java/org/tron/core/services/http/ListProposalsServletTest.java index f6d7b0eb1ff..980c6617001 100644 --- a/framework/src/test/java/org/tron/core/services/http/ListProposalsServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/ListProposalsServletTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class ListProposalsServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/TriggerSmartContractServletTest.java b/framework/src/test/java/org/tron/core/services/http/TriggerSmartContractServletTest.java index b00115b180c..bae9523401b 100644 --- a/framework/src/test/java/org/tron/core/services/http/TriggerSmartContractServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/TriggerSmartContractServletTest.java @@ -9,6 +9,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.common.utils.PublicMethod; import org.tron.common.utils.client.utils.HttpMethed; @@ -19,7 +20,6 @@ import org.tron.core.vm.repository.RepositoryImpl; import org.tron.protos.Protocol; import org.tron.protos.contract.SmartContractOuterClass; -import org.tron.common.TestConstants; @Slf4j public class TriggerSmartContractServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/UpdateAccountServletTest.java b/framework/src/test/java/org/tron/core/services/http/UpdateAccountServletTest.java index ce45d45aefa..4d60a39d0b8 100644 --- a/framework/src/test/java/org/tron/core/services/http/UpdateAccountServletTest.java +++ b/framework/src/test/java/org/tron/core/services/http/UpdateAccountServletTest.java @@ -9,8 +9,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class UpdateAccountServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/http/UtilTest.java b/framework/src/test/java/org/tron/core/services/http/UtilTest.java index 083f4550dc0..98c11fd4018 100644 --- a/framework/src/test/java/org/tron/core/services/http/UtilTest.java +++ b/framework/src/test/java/org/tron/core/services/http/UtilTest.java @@ -8,6 +8,7 @@ import org.tron.api.GrpcAPI.TransactionApprovedList; import org.tron.api.GrpcAPI.TransactionSignWeight; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; @@ -15,7 +16,6 @@ import org.tron.core.utils.TransactionUtil; import org.tron.protos.Protocol; import org.tron.protos.Protocol.Transaction; -import org.tron.common.TestConstants; public class UtilTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServletTest.java b/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServletTest.java index e5c903f559e..5f6558e0bd3 100644 --- a/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServletTest.java +++ b/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetBandwidthPricesOnPBFTServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServletTest.java b/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServletTest.java index af6f0be9ad9..a2774095d94 100644 --- a/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServletTest.java +++ b/framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetEnergyPricesOnPBFTServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServletTest.java b/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServletTest.java index 617d4e5c494..d1f2e33410f 100644 --- a/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServletTest.java +++ b/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetBandwidthPricesOnSolidityServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetEnergyPricesOnSolidityServletTest.java b/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetEnergyPricesOnSolidityServletTest.java index 2d2570d23d2..133a4b5cde5 100644 --- a/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetEnergyPricesOnSolidityServletTest.java +++ b/framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetEnergyPricesOnSolidityServletTest.java @@ -14,8 +14,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.tron.common.BaseTest; -import org.tron.core.config.args.Args; import org.tron.common.TestConstants; +import org.tron.core.config.args.Args; public class GetEnergyPricesOnSolidityServletTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/jsonrpc/BlockResultTest.java b/framework/src/test/java/org/tron/core/services/jsonrpc/BlockResultTest.java index aa96dfae8ff..40beaee1900 100644 --- a/framework/src/test/java/org/tron/core/services/jsonrpc/BlockResultTest.java +++ b/framework/src/test/java/org/tron/core/services/jsonrpc/BlockResultTest.java @@ -5,13 +5,13 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.BlockCapsule; import org.tron.core.config.args.Args; import org.tron.core.services.jsonrpc.types.BlockResult; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class BlockResultTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/jsonrpc/BuildArgumentsTest.java b/framework/src/test/java/org/tron/core/services/jsonrpc/BuildArgumentsTest.java index 1bf98a246b8..26699bc63f6 100644 --- a/framework/src/test/java/org/tron/core/services/jsonrpc/BuildArgumentsTest.java +++ b/framework/src/test/java/org/tron/core/services/jsonrpc/BuildArgumentsTest.java @@ -5,6 +5,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.jsonrpc.JsonRpcInvalidParamsException; @@ -12,7 +13,6 @@ import org.tron.core.services.jsonrpc.types.BuildArguments; import org.tron.core.services.jsonrpc.types.CallArguments; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class BuildArgumentsTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/jsonrpc/CallArgumentsTest.java b/framework/src/test/java/org/tron/core/services/jsonrpc/CallArgumentsTest.java index ba6b391b9e3..2148e1a2fe0 100644 --- a/framework/src/test/java/org/tron/core/services/jsonrpc/CallArgumentsTest.java +++ b/framework/src/test/java/org/tron/core/services/jsonrpc/CallArgumentsTest.java @@ -5,13 +5,13 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.core.Wallet; import org.tron.core.config.args.Args; import org.tron.core.exception.jsonrpc.JsonRpcInvalidParamsException; import org.tron.core.exception.jsonrpc.JsonRpcInvalidRequestException; import org.tron.core.services.jsonrpc.types.CallArguments; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class CallArgumentsTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionReceiptTest.java b/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionReceiptTest.java index bf8a4e815e1..a53a32daf45 100644 --- a/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionReceiptTest.java +++ b/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionReceiptTest.java @@ -5,6 +5,7 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.BlockCapsule; @@ -15,7 +16,6 @@ import org.tron.core.services.jsonrpc.types.TransactionReceipt.TransactionContext; import org.tron.core.store.TransactionRetStore; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; public class TransactionReceiptTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionResultTest.java b/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionResultTest.java index 071aa870f62..4e1af06199c 100644 --- a/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionResultTest.java +++ b/framework/src/test/java/org/tron/core/services/jsonrpc/TransactionResultTest.java @@ -5,6 +5,7 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.BlockCapsule; @@ -13,7 +14,6 @@ import org.tron.core.services.jsonrpc.types.TransactionResult; import org.tron.protos.Protocol; import org.tron.protos.contract.SmartContractOuterClass; -import org.tron.common.TestConstants; public class TransactionResultTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/services/stop/ConditionallyStopTest.java b/framework/src/test/java/org/tron/core/services/stop/ConditionallyStopTest.java index d31af91db24..58e0e0d075f 100644 --- a/framework/src/test/java/org/tron/core/services/stop/ConditionallyStopTest.java +++ b/framework/src/test/java/org/tron/core/services/stop/ConditionallyStopTest.java @@ -18,6 +18,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.tron.common.TestConstants; import org.tron.common.application.TronApplicationContext; import org.tron.common.crypto.ECKey; import org.tron.common.parameter.CommonParameter; @@ -37,7 +38,6 @@ import org.tron.core.db.Manager; import org.tron.core.net.TronNetDelegate; import org.tron.protos.Protocol; -import org.tron.common.TestConstants; @Slf4j(topic = "test") public abstract class ConditionallyStopTest { diff --git a/framework/src/test/java/org/tron/core/witness/ProposalControllerTest.java b/framework/src/test/java/org/tron/core/witness/ProposalControllerTest.java index 735e178c5df..59f4e899d9f 100644 --- a/framework/src/test/java/org/tron/core/witness/ProposalControllerTest.java +++ b/framework/src/test/java/org/tron/core/witness/ProposalControllerTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.ProposalCapsule; @@ -19,7 +20,6 @@ import org.tron.core.store.DynamicPropertiesStore; import org.tron.protos.Protocol.Proposal; import org.tron.protos.Protocol.Proposal.State; -import org.tron.common.TestConstants; public class ProposalControllerTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/witness/WitnessControllerTest.java b/framework/src/test/java/org/tron/core/witness/WitnessControllerTest.java index 92a79577764..3830e631cce 100644 --- a/framework/src/test/java/org/tron/core/witness/WitnessControllerTest.java +++ b/framework/src/test/java/org/tron/core/witness/WitnessControllerTest.java @@ -8,10 +8,10 @@ import javax.annotation.Resource; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.utils.ByteArray; import org.tron.consensus.dpos.DposSlot; import org.tron.core.config.args.Args; -import org.tron.common.TestConstants; public class WitnessControllerTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/core/zksnark/MerkleContainerTest.java b/framework/src/test/java/org/tron/core/zksnark/MerkleContainerTest.java index b7f50e5646a..ed52e014a7b 100644 --- a/framework/src/test/java/org/tron/core/zksnark/MerkleContainerTest.java +++ b/framework/src/test/java/org/tron/core/zksnark/MerkleContainerTest.java @@ -6,6 +6,7 @@ import org.junit.Assert; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ByteArray; import org.tron.common.utils.Sha256Hash; @@ -29,7 +30,6 @@ import org.tron.protos.contract.ShieldContract.PedersenHash; import org.tron.protos.contract.ShieldContract.ReceiveDescription; import org.tron.protos.contract.ShieldContract.ShieldedTransferContract; -import org.tron.common.TestConstants; public class MerkleContainerTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/program/AccountVoteWitnessTest.java b/framework/src/test/java/org/tron/program/AccountVoteWitnessTest.java index efd8997f045..bc449be4a8c 100755 --- a/framework/src/test/java/org/tron/program/AccountVoteWitnessTest.java +++ b/framework/src/test/java/org/tron/program/AccountVoteWitnessTest.java @@ -8,12 +8,12 @@ import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.consensus.dpos.MaintenanceManager; import org.tron.core.capsule.AccountCapsule; import org.tron.core.capsule.WitnessCapsule; import org.tron.core.config.args.Args; import org.tron.protos.Protocol.AccountType; -import org.tron.common.TestConstants; @Slf4j public class AccountVoteWitnessTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/program/SolidityNodeTest.java b/framework/src/test/java/org/tron/program/SolidityNodeTest.java index 8688d969e3e..7d94f813b80 100755 --- a/framework/src/test/java/org/tron/program/SolidityNodeTest.java +++ b/framework/src/test/java/org/tron/program/SolidityNodeTest.java @@ -11,6 +11,7 @@ import org.junit.Test; import org.junit.rules.Timeout; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.client.DatabaseGrpcClient; import org.tron.common.utils.PublicMethod; import org.tron.core.config.args.Args; @@ -19,7 +20,6 @@ import org.tron.core.services.http.solidity.SolidityNodeHttpApiService; import org.tron.protos.Protocol.Block; import org.tron.protos.Protocol.DynamicProperties; -import org.tron.common.TestConstants; @Slf4j public class SolidityNodeTest extends BaseTest { diff --git a/framework/src/test/java/org/tron/program/SupplementTest.java b/framework/src/test/java/org/tron/program/SupplementTest.java index 2c08d7d1011..38a1b8426dd 100644 --- a/framework/src/test/java/org/tron/program/SupplementTest.java +++ b/framework/src/test/java/org/tron/program/SupplementTest.java @@ -15,6 +15,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.tron.common.BaseTest; +import org.tron.common.TestConstants; import org.tron.common.config.DbBackupConfig; import org.tron.common.entity.PeerInfo; import org.tron.common.utils.CompactEncoder; @@ -27,7 +28,6 @@ import org.tron.core.services.http.HttpSelfFormatFieldName; import org.tron.core.store.StorageRowStore; import org.tron.keystore.WalletUtils; -import org.tron.common.TestConstants; public class SupplementTest extends BaseTest { From dd46d22134297c4b3cca77cfa16d993261563f96 Mon Sep 17 00:00:00 2001 From: vividcoder Date: Thu, 26 Feb 2026 15:21:50 +0800 Subject: [PATCH 6/9] docs: fix formatting and consistency issues in README - Fix mixed full-width/half-width brackets in description and prerequisites - Add separator in hardware table for storage options - Fix incorrect Shasta link text (shastaex.io -> shasta.tronex.io) - Unify Resources section with consistent description format - Replace Gitter badge with Discord badge Co-Authored-By: Claude Opus 4.6 --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 0f8b30704bf..1e8e197ef71 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

- + @@ -31,14 +31,14 @@ TRON is building the foundational infrastructure for the decentralized internet ecosystem with a focus on high-performance, scalability, and security. -- TRON Protocol: High-throughput（2000+ TPS), scalable blockchain OS (DPoS consensus) powering the TRON ecosystem. +- TRON Protocol: High-throughput (2000+ TPS), scalable blockchain OS (DPoS consensus) powering the TRON ecosystem. - TRON Virtual Machine (TVM): EVM-compatible smart-contract engine for fast smart-contract execution. # Building the Source Code Before building java-tron, make sure you have: - Hardware with at least 4 CPU cores, 16 GB RAM, 10 GB free disk space for a smooth compilation process. - Operating system: `Linux` or `macOS` (`Windows` is not supported). -- Git and correct JDK（version `8` or `17`） installed based on your CPU architecture. +- Git and correct JDK (version `8` or `17`) installed based on your CPU architecture. There are two ways to install the required dependencies: @@ -84,7 +84,7 @@ The java-tron project comes with several runnable artifacts and helper scripts f | Deployment Tier | CPU Cores | Memory | High-performance SSD Storage | Network Downstream | |--------------------------|-------|--------|---------------------------|-----------------| | FullNode (Minimum) | 8 | 16 GB | 200 GB ([Lite](https://tronprotocol.github.io/documentation-en/using_javatron/litefullnode/#lite-fullnode)) | ≥ 5 MBit/sec | -| FullNode (Stable) | 8 | 32 GB | 200 GB (Lite) 3.5 TB (Full) | ≥ 5 MBit/sec | +| FullNode (Stable) | 8 | 32 GB | 200 GB (Lite) / 3.5 TB (Full) | ≥ 5 MBit/sec | | FullNode (Recommend) | 16+ | 32 GB+ | 4 TB | ≥ 50 MBit/sec | | Super Representative | 32+ | 64 GB+ | 4 TB | ≥ 50 MBit/sec | @@ -139,7 +139,7 @@ Nile resources: explorer, faucet, wallet, developer docs, and network statistics ### 3. Access Shasta test network Shasta does not accept public node peers. Programmatic access is available via TronGrid endpoints; see [TronGrid Service](https://developers.tron.network/docs/trongrid) for details. -Shasta resources: explorer, faucet, wallet, developer docs, and network statistics at [shastaex.io](https://shasta.tronex.io/). +Shasta resources: explorer, faucet, wallet, developer docs, and network statistics at [shasta.tronex.io](https://shasta.tronex.io/). ### 4. Set up a private network To set up a private network for testing or development, follow the [Private Network guidance](https://tronprotocol.github.io/documentation-en/using_javatron/private_network/). @@ -201,14 +201,14 @@ Thank you for considering to help out with the source code! If you'd like to con # Resources -- [Medium](https://medium.com/@coredevs) java-tron's official technical articles are published there. -- [Documentation](https://tronprotocol.github.io/documentation-en/) and [TRON Developer Hub](https://developers.tron.network/) serve as java-tron’s primary documentation websites. -- [TronScan](https://tronscan.org/#/) TRON main network blockchain browser. -- [Nile Test network](http://nileex.io/) A stable test network of TRON contributed by TRON community. -- [Shasta Test network](https://shasta.tronex.io/) A stable test network of TRON contributed by TRON community. -- [Wallet-cli](https://github.com/tronprotocol/wallet-cli) TRON network wallet using command line. -- [TIP](https://github.com/tronprotocol/tips) TRON Improvement Proposal (TIP) describes standards for the TRON network. -- [TP](https://github.com/tronprotocol/tips/tree/master/tp) TRON Protocol (TP) describes standards already implemented in TRON network but not published as a TIP. +- [Medium](https://medium.com/@coredevs) — Official technical articles from the java-tron core development team. +- [Documentation](https://tronprotocol.github.io/documentation-en/) and [TRON Developer Hub](https://developers.tron.network/) — Primary documentation for java-tron developers. +- [TronScan](https://tronscan.org/#/) — TRON mainnet blockchain explorer. +- [Nile Test Network](http://nileex.io/) — A stable test network for TRON development and testing. +- [Shasta Test Network](https://shasta.tronex.io/) — A stable test network mirroring mainnet features. +- [Wallet-cli](https://github.com/tronprotocol/wallet-cli) — Command-line wallet for the TRON network. +- [TIP](https://github.com/tronprotocol/tips) — TRON Improvement Proposals describing standards for the TRON network. +- [TP](https://github.com/tronprotocol/tips/tree/master/tp) — TRON Protocols already implemented but not yet published as TIPs. # Integrity Check From 9a003cd854a7562b8af2f2db6ca14a9c9a626d96 Mon Sep 17 00:00:00 2001 From: vividcoder Date: Fri, 27 Feb 2026 00:02:48 +0800 Subject: [PATCH 7/9] ci: add PR check workflow for build, checkstyle, tests and PR lint Add GitHub Actions workflow that runs on PRs to develop and release branches with four jobs: PR title/description lint, compilation check, checkstyle validation for framework and plugins modules, and unit tests with artifact upload on failure. --- .github/workflows/pr-check.yml | 161 +++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 .github/workflows/pr-check.yml diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml new file mode 100644 index 00000000000..136075758c2 --- /dev/null +++ b/.github/workflows/pr-check.yml @@ -0,0 +1,161 @@ +name: PR Check + +on: + pull_request: + branches: [ 'develop', 'release_**' ] + types: [ opened, edited, synchronize, reopened ] + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + cancel-in-progress: true + +jobs: + pr-lint: + name: PR Lint + runs-on: ubuntu-latest + + steps: + - name: Check PR title format + uses: actions/github-script@v7 + with: + script: | + const title = context.payload.pull_request.title; + + const errors = []; + + // Title should not be empty or too short + if (!title || title.trim().length < 10) { + errors.push('PR title is too short (minimum 10 characters).'); + } + + // Title should not exceed 72 characters + if (title.length > 72) { + errors.push(`PR title is too long (${title.length}/72 characters).`); + } + + // Title should follow conventional format: type: description + // Allowed types: feat, fix, refactor, docs, style, test, chore, ci, perf, build, revert + const conventionalRegex = /^(feat|fix|refactor|docs|style|test|chore|ci|perf|build|revert)(\(.+\))?:\s.+/; + if (!conventionalRegex.test(title)) { + errors.push( + 'PR title must follow conventional format: `type: description`\n' + + 'Allowed types: feat, fix, refactor, docs, style, test, chore, ci, perf, build, revert\n' + + 'Example: `feat: add new transaction validation`' + ); + } + + if (errors.length > 0) { + const message = '### PR Title Check Failed\n\n' + errors.map(e => `- ${e}`).join('\n'); + core.setFailed(message); + } else { + core.info('PR title format is valid.'); + } + + - name: Check PR description + uses: actions/github-script@v7 + with: + script: | + const body = context.payload.pull_request.body; + + if (!body || body.trim().length < 20) { + core.setFailed( + '### PR Description Check Failed\n\n' + + 'PR description is too short or empty. Please describe what this PR does and why.' + ); + } else { + core.info('PR description is valid.'); + } + + build: + name: Build + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-gradle- + + - name: Build + run: ./gradlew clean build -x test + + checkstyle: + name: Checkstyle + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-gradle- + + - name: Run Checkstyle + run: ./gradlew :framework:checkstyleMain :framework:checkstyleTest :plugins:checkstyleMain + + - name: Upload Checkstyle reports + if: failure() + uses: actions/upload-artifact@v4 + with: + name: checkstyle-reports + path: | + framework/build/reports/checkstyle/ + plugins/build/reports/checkstyle/ + + test: + name: Unit Tests + runs-on: ubuntu-latest + needs: build + timeout-minutes: 60 + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-gradle- + + - name: Run tests + run: ./gradlew test + + - name: Upload test reports + if: failure() + uses: actions/upload-artifact@v4 + with: + name: test-reports + path: | + **/build/reports/tests/ From 2365d2e86be1ef6c226ed2d80304a000df3995a1 Mon Sep 17 00:00:00 2001 From: vividcoder Date: Fri, 27 Feb 2026 00:02:48 +0800 Subject: [PATCH 8/9] ci: add PR check workflow for build, checkstyle, tests and PR lint Add GitHub Actions workflow that runs on PRs to develop and release branches with four jobs: PR title/description lint, multi-platform build (JDK 8/x86_64 + JDK 17/aarch64), checkstyle validation for framework and plugins modules, and unit tests with artifact upload on failure. --- .github/workflows/pr-check.yml | 171 +++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 .github/workflows/pr-check.yml diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml new file mode 100644 index 00000000000..7333c0a05ae --- /dev/null +++ b/.github/workflows/pr-check.yml @@ -0,0 +1,171 @@ +name: PR Check + +on: + pull_request: + branches: [ 'develop', 'release_**' ] + types: [ opened, edited, synchronize, reopened ] + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + cancel-in-progress: true + +jobs: + pr-lint: + name: PR Lint + runs-on: ubuntu-latest + + steps: + - name: Check PR title format + uses: actions/github-script@v7 + with: + script: | + const title = context.payload.pull_request.title; + + const errors = []; + + // Title should not be empty or too short + if (!title || title.trim().length < 10) { + errors.push('PR title is too short (minimum 10 characters).'); + } + + // Title should not exceed 72 characters + if (title.length > 72) { + errors.push(`PR title is too long (${title.length}/72 characters).`); + } + + // Title should follow conventional format: type: description + // Allowed types: feat, fix, refactor, docs, style, test, chore, ci, perf, build, revert + const conventionalRegex = /^(feat|fix|refactor|docs|style|test|chore|ci|perf|build|revert)(\(.+\))?:\s.+/; + if (!conventionalRegex.test(title)) { + errors.push( + 'PR title must follow conventional format: `type: description`\n' + + 'Allowed types: feat, fix, refactor, docs, style, test, chore, ci, perf, build, revert\n' + + 'Example: `feat: add new transaction validation`' + ); + } + + if (errors.length > 0) { + const message = '### PR Title Check Failed\n\n' + errors.map(e => `- ${e}`).join('\n'); + core.setFailed(message); + } else { + core.info('PR title format is valid.'); + } + + - name: Check PR description + uses: actions/github-script@v7 + with: + script: | + const body = context.payload.pull_request.body; + + if (!body || body.trim().length < 20) { + core.setFailed( + '### PR Description Check Failed\n\n' + + 'PR description is too short or empty. Please describe what this PR does and why.' + ); + } else { + core.info('PR description is valid.'); + } + + build: + name: Build (JDK ${{ matrix.java }} / ${{ matrix.arch }}) + runs-on: ${{ matrix.runner }} + strategy: + fail-fast: false + matrix: + include: + - java: '8' + runner: ubuntu-latest + arch: x86_64 + - java: '17' + runner: ubuntu-24.04-arm + arch: aarch64 + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-${{ matrix.arch }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-${{ matrix.arch }}-gradle- + + - name: Build + run: ./gradlew clean build -x test + + checkstyle: + name: Checkstyle + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-gradle- + + - name: Run Checkstyle + run: ./gradlew :framework:checkstyleMain :framework:checkstyleTest :plugins:checkstyleMain + + - name: Upload Checkstyle reports + if: failure() + uses: actions/upload-artifact@v4 + with: + name: checkstyle-reports + path: | + framework/build/reports/checkstyle/ + plugins/build/reports/checkstyle/ + + test: + name: Unit Tests + runs-on: ubuntu-latest + needs: build + timeout-minutes: 60 + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-gradle- + + - name: Run tests + run: ./gradlew test + + - name: Upload test reports + if: failure() + uses: actions/upload-artifact@v4 + with: + name: test-reports + path: | + **/build/reports/tests/ From cb647f6bbabc7cc115ad48bd809b96f8fb5e08a8 Mon Sep 17 00:00:00 2001 From: vividcoder Date: Fri, 27 Feb 2026 11:31:43 +0800 Subject: [PATCH 9/9] ci: add JDK 17/aarch64 to test matrix Co-Authored-By: Claude Opus 4.6 --- .github/workflows/pr-check.yml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 7333c0a05ae..f4d77147ddf 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -136,18 +136,28 @@ jobs: plugins/build/reports/checkstyle/ test: - name: Unit Tests - runs-on: ubuntu-latest + name: Unit Tests (JDK ${{ matrix.java }} / ${{ matrix.arch }}) + runs-on: ${{ matrix.runner }} needs: build timeout-minutes: 60 + strategy: + fail-fast: false + matrix: + include: + - java: '8' + runner: ubuntu-latest + arch: x86_64 + - java: '17' + runner: ubuntu-24.04-arm + arch: aarch64 steps: - uses: actions/checkout@v4 - - name: Set up JDK 8 + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: - java-version: '8' + java-version: ${{ matrix.java }} distribution: 'temurin' - name: Cache Gradle packages @@ -156,8 +166,8 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} - restore-keys: ${{ runner.os }}-gradle- + key: ${{ runner.os }}-${{ matrix.arch }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-${{ matrix.arch }}-gradle- - name: Run tests run: ./gradlew test @@ -166,6 +176,6 @@ jobs: if: failure() uses: actions/upload-artifact@v4 with: - name: test-reports + name: test-reports-${{ matrix.arch }} path: | **/build/reports/tests/