Merge pull request #612 from tronprotocol/feature/rm_division

remove division in calculateBandwidth()

Author: nanfengpo

src/main/java/org/tron/core/actuator/FreezeBalanceActuator.java

@@ -60,7 +60,7 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
 
   private long calculateBandwidth(FreezeBalanceContract freezeBalanceContract) {
 
-    return freezeBalanceContract.getFrozenBalance() / 1_000_000L
+    return freezeBalanceContract.getFrozenBalance()
         * freezeBalanceContract.getFrozenDuration()
         * dbManager.getDynamicPropertiesStore().getBandwidthPerCoinday();
   }

src/main/java/org/tron/core/db/DynamicPropertiesStore.java

@@ -151,13 +151,13 @@ private DynamicPropertiesStore(@Qualifier("properties") String dbName) {
     try {
       this.getBandwidthPerTransaction();
     } catch (IllegalArgumentException e) {
-      this.saveBandwidthPerTransaction(1);
+      this.saveBandwidthPerTransaction(100_000);
     }
 
     try {
       this.getBandwidthPerCoinday();
     } catch (IllegalArgumentException e) {
-      this.saveBandwidthPerCoinday(10);
+      this.saveBandwidthPerCoinday(1);
     }
 
     try {

src/main/java/org/tron/core/db/Manager.java

@@ -424,7 +424,6 @@ public synchronized boolean pushTransactions(final TransactionCapsule trx)
     if (!trx.validateSignature()) {
       throw new ValidateSignatureException("trans sig validate failed");
     }
-    consumeBandwidth(trx);
 
     validateTapos(trx);
 
@@ -435,6 +434,7 @@ public synchronized boolean pushTransactions(final TransactionCapsule trx)
     }
 
     try (RevokingStore.Dialog tmpDialog = revokingStore.buildDialog()) {
+      consumeBandwidth(trx);
       processTransaction(trx);
       pendingTransactions.add(trx);
       tmpDialog.merge();
@@ -457,7 +457,10 @@ public void consumeBandwidth(TransactionCapsule trx) throws ValidateBandwidthExc
       long bandwidth = accountCapsule.getBandwidth();
       long now = Time.getCurrentMillis();
       long latestOperationTime = accountCapsule.getLatestOperationTime();
-      if (now - latestOperationTime >= 5 * 60 * 1000) {
+      //5 * 60 * 1000
+      if (now - latestOperationTime >= 300_000L) {
+        accountCapsule.setLatestOperationTime(now);
+        this.getAccountStore().put(accountCapsule.createDbKey(), accountCapsule);
         return;
       }
       long bandwidthPerTransaction = getDynamicPropertiesStore().getBandwidthPerTransaction();

src/test/java/org/tron/core/actuator/FreezeBalanceActuatorTest.java

@@ -114,7 +114,7 @@ public void testFreezeBalance() {
       Assert.assertEquals(owner.getBalance(), initBalance - frozenBalance
           - ChainConstant.TRANSFER_FEE);
       Assert.assertEquals(owner.getFrozenBalance(), frozenBalance);
-      Assert.assertEquals(owner.getBandwidth(), frozenBalance / 1_000_000
+      Assert.assertEquals(owner.getBandwidth(), frozenBalance
           * duration
           * dbManager.getDynamicPropertiesStore().getBandwidthPerCoinday());
     } catch (ContractValidateException e) {