feat(conf): make compatible with old configurations

Author: lxcmyf

common/src/main/java/org/tron/core/Constant.java

@@ -40,7 +40,7 @@ public class Constant {
   public static final long PB_DEFAULT_ENERGY_LIMIT = 0L;
   public static final long CREATOR_DEFAULT_ENERGY_LIMIT = 1000 * 10_000L;
   public static final long MIN_PROPOSAL_EXPIRE_TIME = 0L; // 0 ms
-  public static final long MAX_PROPOSAL_EXPIRE_TIME = 31536000000L; // ms of 365 days
+  public static final long MAX_PROPOSAL_EXPIRE_TIME = 31536003000L; // ms of 365 days + 3000 ms
   public static final long DEFAULT_PROPOSAL_EXPIRE_TIME = 259200000L; // ms of 3 days
 
 

framework/src/test/java/org/tron/core/services/ProposalServiceTest.java

@@ -141,14 +141,14 @@ public void testProposalExpireTime() {
     Assert.assertEquals(proposalExpireTime, defaultWindow);
 
     Proposal proposal = Proposal.newBuilder().putParameters(PROPOSAL_EXPIRE_TIME.getCode(),
-        MAX_PROPOSAL_EXPIRE_TIME).build();
+        31536000000L).build();
     ProposalCapsule proposalCapsule = new ProposalCapsule(proposal);
     proposalCapsule.setExpirationTime(1627279200000L);
     boolean result = ProposalService.process(dbManager, proposalCapsule);
     Assert.assertTrue(result);
 
     long window = dbManager.getDynamicPropertiesStore().getProposalExpireTime();
-    Assert.assertEquals(MAX_PROPOSAL_EXPIRE_TIME, window);
+    Assert.assertEquals(MAX_PROPOSAL_EXPIRE_TIME - 3000, window);
   }
 
 }