Skip to content

Commit f6373f1

Browse files
halibobo1205halibobo1205
committed
chore(deps): remove joda-time and use JDK time APIs
1. drop the joda-time 2.3 dependency and its verification-metadata entries; no source file imports org.joda and nothing else in the dependency graph requests it 2. replace the six new DateTime(millis) log-formatting call sites in DynamicPropertiesStore, DposTask and DposService with the existing Time.getTimeString helper, converging on the Timestamp format that surrounding logs (BlockCapsule, Manager, StateManager) already use; the printed form changes from 2026-08-25T14:32:11.123+08:00 to 2026-08-25 14:32:11.123 3. replace DateTime.now() arithmetic in five test classes with System.currentTimeMillis() and fixed 86_400_000L day offsets, matching the millisecond style those tests already use elsewhere
1 parent 678c3f6 commit f6373f1

10 files changed

Lines changed: 54 additions & 66 deletions

File tree

‎build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ subprojects {
9999
implementation group: 'org.springframework', name: 'spring-context', version: "${springVersion}"
100100
implementation "org.apache.commons:commons-lang3:3.20.0"
101101
implementation "org.apache.commons:commons-collections4:4.6.0"
102-
implementation group: 'joda-time', name: 'joda-time', version: '2.3'
103102
implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.84'
104103

105104
compileOnly 'org.projectlombok:lombok:1.18.34'

‎chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
import java.util.stream.IntStream;
1313
import lombok.Getter;
1414
import lombok.extern.slf4j.Slf4j;
15-
import org.joda.time.DateTime;
1615
import org.springframework.beans.factory.annotation.Autowired;
1716
import org.springframework.beans.factory.annotation.Value;
1817
import org.springframework.stereotype.Component;
1918
import org.tron.common.parameter.CommonParameter;
2019
import org.tron.common.utils.ByteArray;
2120
import org.tron.common.utils.Sha256Hash;
21+
import org.tron.common.utils.Time;
2222
import org.tron.core.capsule.BytesCapsule;
2323
import org.tron.core.config.Parameter.ChainConstant;
2424
import org.tron.core.db.TronStoreWithRevoking;
@@ -2261,8 +2261,8 @@ public void updateNextMaintenanceTime(long blockTime) {
22612261
logger.info(
22622262
"Do update nextMaintenanceTime, currentMaintenanceTime: {}, blockTime: {}, "
22632263
+ "nextMaintenanceTime: {}.",
2264-
new DateTime(currentMaintenanceTime), new DateTime(blockTime),
2265-
new DateTime(nextMaintenanceTime)
2264+
Time.getTimeString(currentMaintenanceTime), Time.getTimeString(blockTime),
2265+
Time.getTimeString(nextMaintenanceTime)
22662266
);
22672267
}
22682268

‎consensus/src/main/java/org/tron/consensus/dpos/DposService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
import lombok.Getter;
1515
import lombok.Setter;
1616
import lombok.extern.slf4j.Slf4j;
17-
import org.joda.time.DateTime;
1817
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.stereotype.Component;
2019
import org.tron.common.args.GenesisBlock;
2120
import org.tron.common.parameter.CommonParameter;
2221
import org.tron.common.utils.ByteArray;
22+
import org.tron.common.utils.Time;
2323
import org.tron.consensus.ConsensusDelegate;
2424
import org.tron.consensus.base.BlockHandle;
2525
import org.tron.consensus.base.ConsensusInterface;
@@ -134,14 +134,14 @@ public boolean validBlock(BlockCapsule blockCapsule) {
134134
if (slot == 0
135135
&& consensusDelegate.getDynamicPropertiesStore().allowConsensusLogicOptimization()) {
136136
logger.warn("ValidBlock failed: slot error, witness: {}, timeStamp: {}",
137-
ByteArray.toHexString(witnessAddress.toByteArray()), new DateTime(timeStamp));
137+
ByteArray.toHexString(witnessAddress.toByteArray()), Time.getTimeString(timeStamp));
138138
return false;
139139
}
140140
final ByteString scheduledWitness = dposSlot.getScheduledWitness(slot);
141141
if (!scheduledWitness.equals(witnessAddress)) {
142142
logger.warn("ValidBlock failed: sWitness: {}, bWitness: {}, bTimeStamp: {}, slot: {}",
143143
ByteArray.toHexString(scheduledWitness.toByteArray()),
144-
ByteArray.toHexString(witnessAddress.toByteArray()), new DateTime(timeStamp), slot);
144+
ByteArray.toHexString(witnessAddress.toByteArray()), Time.getTimeString(timeStamp), slot);
145145
return false;
146146
}
147147

‎consensus/src/main/java/org/tron/consensus/dpos/DposTask.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.util.concurrent.ExecutorService;
77
import lombok.Setter;
88
import lombok.extern.slf4j.Slf4j;
9-
import org.joda.time.DateTime;
109
import org.springframework.beans.factory.annotation.Autowired;
1110
import org.springframework.stereotype.Component;
1211
import org.springframework.util.ObjectUtils;
@@ -15,6 +14,7 @@
1514
import org.tron.common.parameter.CommonParameter;
1615
import org.tron.common.utils.ByteArray;
1716
import org.tron.common.utils.Sha256Hash;
17+
import org.tron.common.utils.Time;
1818
import org.tron.consensus.ConsensusDelegate;
1919
import org.tron.consensus.base.Param.Miner;
2020
import org.tron.consensus.base.State;
@@ -123,7 +123,7 @@ private State produceBlock() {
123123
BlockHeader.raw raw = blockCapsule.getInstance().getBlockHeader().getRawData();
124124
logger.info("Produce block successfully, num: {}, time: {}, witness: {}, ID:{}, parentID:{}",
125125
raw.getNumber(),
126-
new DateTime(raw.getTimestamp()),
126+
Time.getTimeString(raw.getTimestamp()),
127127
ByteArray.toHexString(raw.getWitnessAddress().toByteArray()),
128128
new Sha256Hash(raw.getNumber(), Sha256Hash.of(CommonParameter
129129
.getInstance().isECKeyCryptoEngine(), raw.toByteArray())),

‎framework/src/test/java/org/tron/common/utils/RandomGeneratorTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.util.List;
1010
import java.util.stream.Collectors;
1111
import lombok.extern.slf4j.Slf4j;
12-
import org.joda.time.DateTime;
1312
import org.junit.Before;
1413
import org.junit.Ignore;
1514
import org.junit.Test;
@@ -42,7 +41,7 @@ public void shuffle() {
4241
final List<WitnessCapsule> witnessCapsuleListBefore = this.getWitnessList();
4342
logger.info("updateWitnessSchedule,before: " + getWitnessStringList(witnessCapsuleListBefore));
4443
final List<WitnessCapsule> witnessCapsuleListAfter = new RandomGenerator<WitnessCapsule>()
45-
.shuffle(witnessCapsuleListBefore, DateTime.now().getMillis());
44+
.shuffle(witnessCapsuleListBefore, System.currentTimeMillis());
4645
logger.info("updateWitnessSchedule,after: " + getWitnessStringList(witnessCapsuleListAfter));
4746
}
4847

‎framework/src/test/java/org/tron/core/BandwidthProcessorTest.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.google.protobuf.ByteString;
77
import java.nio.charset.StandardCharsets;
88
import lombok.extern.slf4j.Slf4j;
9-
import org.joda.time.DateTime;
109
import org.junit.Assert;
1110
import org.junit.Before;
1211
import org.junit.Test;
@@ -64,8 +63,8 @@ public class BandwidthProcessorTest extends BaseTest {
6463
TO_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc";
6564
ASSET_ADDRESS = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a3456";
6665
ASSET_ADDRESS_V2 = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a7890";
67-
START_TIME = DateTime.now().minusDays(1).getMillis();
68-
END_TIME = DateTime.now().getMillis();
66+
START_TIME = System.currentTimeMillis() - 1 * 86_400_000L;
67+
END_TIME = System.currentTimeMillis();
6968
}
7069

7170
/**
@@ -616,7 +615,7 @@ public void sameTokenNameCloseConsumeSuccess() {
616615
AccountType.Normal,
617616
chainBaseManager.getDynamicPropertiesStore().getAssetIssueFee());
618617
ownerCapsule.setBalance(10_000_000L);
619-
long expireTime = DateTime.now().getMillis() + 6 * 86_400_000;
618+
long expireTime = System.currentTimeMillis() + 6 * 86_400_000;
620619
ownerCapsule.setFrozenForBandwidth(2_000_000L, expireTime);
621620
chainBaseManager.getAccountStore().put(ownerCapsule.getAddress().toByteArray(), ownerCapsule);
622621

@@ -627,7 +626,7 @@ public void sameTokenNameCloseConsumeSuccess() {
627626
AccountType.Normal,
628627
chainBaseManager.getDynamicPropertiesStore().getAssetIssueFee());
629628
toAddressCapsule.setBalance(10_000_000L);
630-
long expireTime2 = DateTime.now().getMillis() + 6 * 86_400_000;
629+
long expireTime2 = System.currentTimeMillis() + 6 * 86_400_000;
631630
toAddressCapsule.setFrozenForBandwidth(2_000_000L, expireTime2);
632631
chainBaseManager.getAccountStore().put(toAddressCapsule.getAddress().toByteArray(),
633632
toAddressCapsule);
@@ -731,7 +730,7 @@ public void sameTokenNameOpenConsumeSuccess() {
731730
AccountType.Normal,
732731
chainBaseManager.getDynamicPropertiesStore().getAssetIssueFee());
733732
ownerCapsule.setBalance(10_000_000L);
734-
long expireTime = DateTime.now().getMillis() + 6 * 86_400_000;
733+
long expireTime = System.currentTimeMillis() + 6 * 86_400_000;
735734
ownerCapsule.setFrozenForBandwidth(2_000_000L, expireTime);
736735
chainBaseManager.getAccountStore().put(ownerCapsule.getAddress().toByteArray(), ownerCapsule);
737736

@@ -742,7 +741,7 @@ public void sameTokenNameOpenConsumeSuccess() {
742741
AccountType.Normal,
743742
chainBaseManager.getDynamicPropertiesStore().getAssetIssueFee());
744743
toAddressCapsule.setBalance(10_000_000L);
745-
long expireTime2 = DateTime.now().getMillis() + 6 * 86_400_000;
744+
long expireTime2 = System.currentTimeMillis() + 6 * 86_400_000;
746745
toAddressCapsule.setFrozenForBandwidth(2_000_000L, expireTime2);
747746
chainBaseManager.getAccountStore().put(toAddressCapsule.getAddress().toByteArray(),
748747
toAddressCapsule);
@@ -816,7 +815,7 @@ public void sameTokenNameCloseTransferToAccountNotExist() {
816815
AccountType.Normal,
817816
chainBaseManager.getDynamicPropertiesStore().getAssetIssueFee());
818817
ownerCapsule.setBalance(10_000_000L);
819-
long expireTime = DateTime.now().getMillis() + 6 * 86_400_000;
818+
long expireTime = System.currentTimeMillis() + 6 * 86_400_000;
820819
ownerCapsule.setFrozenForBandwidth(2_000_000L, expireTime);
821820
chainBaseManager.getAccountStore().put(ownerCapsule.getAddress().toByteArray(), ownerCapsule);
822821

@@ -827,7 +826,7 @@ public void sameTokenNameCloseTransferToAccountNotExist() {
827826
AccountType.Normal,
828827
chainBaseManager.getDynamicPropertiesStore().getAssetIssueFee());
829828
toAddressCapsule.setBalance(10_000_000L);
830-
long expireTime2 = DateTime.now().getMillis() + 6 * 86_400_000;
829+
long expireTime2 = System.currentTimeMillis() + 6 * 86_400_000;
831830
toAddressCapsule.setFrozenForBandwidth(2_000_000L, expireTime2);
832831
chainBaseManager.getAccountStore().delete(toAddressCapsule.getAddress().toByteArray());
833832

‎framework/src/test/java/org/tron/core/WalletTest.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import javax.annotation.Resource;
3636
import lombok.SneakyThrows;
3737
import lombok.extern.slf4j.Slf4j;
38-
import org.joda.time.DateTime;
3938
import org.junit.Assert;
4039
import org.junit.Before;
4140
import org.junit.Ignore;
@@ -113,21 +112,23 @@ public class WalletTest extends BaseTest {
113112
public static final long BLOCK_NUM_THREE = 3;
114113
public static final long BLOCK_NUM_FOUR = 4;
115114
public static final long BLOCK_NUM_FIVE = 5;
116-
public static final long BLOCK_TIMESTAMP_ONE = DateTime.now().minusDays(4).getMillis();
117-
public static final long BLOCK_TIMESTAMP_TWO = DateTime.now().minusDays(3).getMillis();
118-
public static final long BLOCK_TIMESTAMP_THREE = DateTime.now().minusDays(2).getMillis();
119-
public static final long BLOCK_TIMESTAMP_FOUR = DateTime.now().minusDays(1).getMillis();
120-
public static final long BLOCK_TIMESTAMP_FIVE = DateTime.now().getMillis();
115+
public static final long BLOCK_TIMESTAMP_ONE = System.currentTimeMillis() - 4 * 86_400_000L;
116+
public static final long BLOCK_TIMESTAMP_TWO = System.currentTimeMillis() - 3 * 86_400_000L;
117+
public static final long BLOCK_TIMESTAMP_THREE = System.currentTimeMillis() - 2 * 86_400_000L;
118+
public static final long BLOCK_TIMESTAMP_FOUR = System.currentTimeMillis() - 1 * 86_400_000L;
119+
public static final long BLOCK_TIMESTAMP_FIVE = System.currentTimeMillis();
121120
public static final long BLOCK_WITNESS_ONE = 12;
122121
public static final long BLOCK_WITNESS_TWO = 13;
123122
public static final long BLOCK_WITNESS_THREE = 14;
124123
public static final long BLOCK_WITNESS_FOUR = 15;
125124
public static final long BLOCK_WITNESS_FIVE = 16;
126-
public static final long TRANSACTION_TIMESTAMP_ONE = DateTime.now().minusDays(4).getMillis();
127-
public static final long TRANSACTION_TIMESTAMP_TWO = DateTime.now().minusDays(3).getMillis();
128-
public static final long TRANSACTION_TIMESTAMP_THREE = DateTime.now().minusDays(2).getMillis();
129-
public static final long TRANSACTION_TIMESTAMP_FOUR = DateTime.now().minusDays(1).getMillis();
130-
public static final long TRANSACTION_TIMESTAMP_FIVE = DateTime.now().getMillis();
125+
public static final long TRANSACTION_TIMESTAMP_ONE = System.currentTimeMillis() - 4 * 86_400_000L;
126+
public static final long TRANSACTION_TIMESTAMP_TWO = System.currentTimeMillis() - 3 * 86_400_000L;
127+
public static final long TRANSACTION_TIMESTAMP_THREE =
128+
System.currentTimeMillis() - 2 * 86_400_000L;
129+
public static final long TRANSACTION_TIMESTAMP_FOUR =
130+
System.currentTimeMillis() - 1 * 86_400_000L;
131+
public static final long TRANSACTION_TIMESTAMP_FIVE = System.currentTimeMillis();
131132
@Resource
132133
private Wallet wallet;
133134
private static Block block1;

‎framework/src/test/java/org/tron/core/actuator/ParticipateAssetIssueActuatorTest.java‎

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

33
import com.google.protobuf.Any;
44
import com.google.protobuf.ByteString;
5-
import org.joda.time.DateTime;
65
import org.junit.Assert;
76
import org.junit.Before;
87
import org.junit.Test;
@@ -403,8 +402,8 @@ public void sameTokenNameOpenRightAssetIssue() {
403402
*/
404403
@Test
405404
public void sameTokenNameCloseAssetIssueTimeRight() {
406-
DateTime now = DateTime.now();
407-
initAssetIssue(now.minusDays(1).getMillis(), now.getMillis());
405+
long now = System.currentTimeMillis();
406+
initAssetIssue(now - 1 * 86_400_000L, now);
408407
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
409408
actuator.setChainBaseManager(chainBaseManager).setAny(getContract(1000L));
410409

@@ -436,8 +435,8 @@ public void sameTokenNameCloseAssetIssueTimeRight() {
436435
@Test
437436
public void sameTokenNameOpenAssetIssueTimeRight() {
438437
chainBaseManager.getDynamicPropertiesStore().saveAllowSameTokenName(1);
439-
DateTime now = DateTime.now();
440-
initAssetIssue(now.minusDays(1).getMillis(), now.getMillis());
438+
long now = System.currentTimeMillis();
439+
initAssetIssue(now - 1 * 86_400_000L, now);
441440
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
442441
actuator.setChainBaseManager(chainBaseManager).setAny(getContract(1000L));
443442

@@ -470,8 +469,8 @@ public void sameTokenNameOpenAssetIssueTimeRight() {
470469
*/
471470
@Test
472471
public void sameTokenNameCloseAssetIssueTimeLeft() {
473-
DateTime now = DateTime.now();
474-
initAssetIssue(now.minusDays(1).getMillis(), now.getMillis());
472+
long now = System.currentTimeMillis();
473+
initAssetIssue(now - 1 * 86_400_000L, now);
475474
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
476475
actuator.setChainBaseManager(chainBaseManager).setAny(getContract(1000L));
477476

@@ -504,8 +503,8 @@ public void sameTokenNameCloseAssetIssueTimeLeft() {
504503
@Test
505504
public void sameTokenNameOpenAssetIssueTimeLeft() {
506505
chainBaseManager.getDynamicPropertiesStore().saveAllowSameTokenName(1);
507-
DateTime now = DateTime.now();
508-
initAssetIssue(now.minusDays(1).getMillis(), now.getMillis());
506+
long now = System.currentTimeMillis();
507+
initAssetIssue(now - 1 * 86_400_000L, now);
509508
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
510509
actuator.setChainBaseManager(chainBaseManager).setAny(getContract(1000L));
511510

@@ -605,8 +604,8 @@ public void sameTokenNameOpenExchangeDevisibleTest() {
605604
*/
606605
@Test
607606
public void sameTokenNameCloseNegativeAmountTest() {
608-
DateTime now = DateTime.now();
609-
initAssetIssue(now.minusDays(1).getMillis(), now.plusDays(1).getMillis());
607+
long now = System.currentTimeMillis();
608+
initAssetIssue(now - 1 * 86_400_000L, now + 1 * 86_400_000L);
610609
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
611610
actuator.setChainBaseManager(chainBaseManager).setAny(getContract(-999L));
612611

@@ -639,8 +638,8 @@ public void sameTokenNameCloseNegativeAmountTest() {
639638
@Test
640639
public void sameTokenNameOpenNegativeAmountTest() {
641640
chainBaseManager.getDynamicPropertiesStore().saveAllowSameTokenName(1);
642-
DateTime now = DateTime.now();
643-
initAssetIssue(now.minusDays(1).getMillis(), now.plusDays(1).getMillis());
641+
long now = System.currentTimeMillis();
642+
initAssetIssue(now - 1 * 86_400_000L, now + 1 * 86_400_000L);
644643
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
645644
actuator.setChainBaseManager(chainBaseManager).setAny(getContract(-999L));
646645

@@ -675,8 +674,8 @@ public void sameTokenNameOpenNegativeAmountTest() {
675674
*/
676675
@Test
677676
public void sameTokenNameCloseZeroAmountTest() {
678-
DateTime now = DateTime.now();
679-
initAssetIssue(now.minusDays(1).getMillis(), now.plusDays(1).getMillis());
677+
long now = System.currentTimeMillis();
678+
initAssetIssue(now - 1 * 86_400_000L, now + 1 * 86_400_000L);
680679
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
681680
actuator.setChainBaseManager(chainBaseManager).setAny(getContract(0));
682681

@@ -709,8 +708,8 @@ public void sameTokenNameCloseZeroAmountTest() {
709708
@Test
710709
public void sameTokenNameOpenZeroAmountTest() {
711710
chainBaseManager.getDynamicPropertiesStore().saveAllowSameTokenName(1);
712-
DateTime now = DateTime.now();
713-
initAssetIssue(now.minusDays(1).getMillis(), now.plusDays(1).getMillis());
711+
long now = System.currentTimeMillis();
712+
initAssetIssue(now - 1 * 86_400_000L, now + 1 * 86_400_000L);
714713
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
715714
actuator.setChainBaseManager(chainBaseManager).setAny(getContract(0));
716715

@@ -746,8 +745,8 @@ public void sameTokenNameOpenZeroAmountTest() {
746745
*/
747746
@Test
748747
public void sameTokenNameCloseNoExitOwnerTest() {
749-
DateTime now = DateTime.now();
750-
initAssetIssue(now.minusDays(1).getMillis(), now.plusDays(1).getMillis());
748+
long now = System.currentTimeMillis();
749+
initAssetIssue(now - 1 * 86_400_000L, now + 1 * 86_400_000L);
751750
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
752751
actuator.setChainBaseManager(chainBaseManager)
753752
.setAny(getContractWithOwner(101, NOT_EXIT_ADDRESS));
@@ -782,8 +781,8 @@ public void sameTokenNameCloseNoExitOwnerTest() {
782781
@Test
783782
public void sameTokenNameOpenNoExitOwnerTest() {
784783
chainBaseManager.getDynamicPropertiesStore().saveAllowSameTokenName(1);
785-
DateTime now = DateTime.now();
786-
initAssetIssue(now.minusDays(1).getMillis(), now.plusDays(1).getMillis());
784+
long now = System.currentTimeMillis();
785+
initAssetIssue(now - 1 * 86_400_000L, now + 1 * 86_400_000L);
787786
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
788787
actuator.setChainBaseManager(chainBaseManager)
789788
.setAny(getContractWithOwner(101, NOT_EXIT_ADDRESS));
@@ -1310,8 +1309,8 @@ public void sameTokenNameOpenNotEnoughAssetTest() {
13101309
*/
13111310
@Test
13121311
public void sameTokenNameCloseNoneExistAssetTest() {
1313-
DateTime now = DateTime.now();
1314-
initAssetIssue(now.minusDays(1).getMillis(), now.plusDays(1).getMillis());
1312+
long now = System.currentTimeMillis();
1313+
initAssetIssue(now - 1 * 86_400_000L, now + 1 * 86_400_000L);
13151314
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
13161315
actuator.setChainBaseManager(chainBaseManager)
13171316
.setAny(getContract(1, "TTTTTTTTTTTT"));
@@ -1346,8 +1345,8 @@ public void sameTokenNameCloseNoneExistAssetTest() {
13461345
@Test
13471346
public void sameTokenNameOpenNoneExistAssetTest() {
13481347
chainBaseManager.getDynamicPropertiesStore().saveAllowSameTokenName(1);
1349-
DateTime now = DateTime.now();
1350-
initAssetIssue(now.minusDays(1).getMillis(), now.plusDays(1).getMillis());
1348+
long now = System.currentTimeMillis();
1349+
initAssetIssue(now - 1 * 86_400_000L, now + 1 * 86_400_000L);
13511350
ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator();
13521351
actuator.setChainBaseManager(chainBaseManager)
13531352
.setAny(getContract(1, "TTTTTTTTTTTT"));

‎framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import java.util.concurrent.RejectedExecutionException;
1515

1616
import lombok.Getter;
17-
import org.joda.time.DateTime;
1817
import org.junit.Assert;
1918
import org.junit.BeforeClass;
2019
import org.junit.Test;
@@ -67,7 +66,7 @@ public void testProcessMessage() {
6766
.setOwnerAddress(ByteString.copyFrom(ByteArray.fromHexString("121212a9cf")))
6867
.setToAddress(ByteString.copyFrom(ByteArray.fromHexString("232323a9cf"))).build();
6968

70-
long transactionTimestamp = DateTime.now().minusDays(4).getMillis();
69+
long transactionTimestamp = System.currentTimeMillis() - 4 * 86_400_000L;
7170
Protocol.Transaction trx = Protocol.Transaction.newBuilder().setRawData(
7271
Protocol.Transaction.raw.newBuilder().setTimestamp(transactionTimestamp)
7372
.setRefBlockNum(1)

0 commit comments

Comments
 (0)