Merge pull request tronprotocol#1079 from tronprotocol/feature/revert_calculation_for_transaction_size

revert calculation for transaction size

Author: zhaohong

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

@@ -86,7 +86,7 @@ public void consumeBandwidth(TransactionCapsule trx, TransactionResultCapsule re
         trx.getInstance().getRawData().getContractList();
 
     for (Contract contract : contracts) {
-      long bytes = trx.getInstance().getRawData().getSerializedSize();
+      long bytes = trx.getSerializedSize();
       logger.debug("trxId {},bandwidth cost :{}", trx.getTransactionId(), bytes);
       byte[] address = TransactionCapsule.getOwner(contract);
       AccountCapsule accountCapsule = dbManager.getAccountStore().get(address);

src/test/java/org/tron/core/BandwidthTest.java

@@ -153,12 +153,12 @@ public void testCreateNewAccount() throws Exception {
     ownerCapsule.setFrozen(10_000_000L, 0L);
 
     Assert.assertEquals(true, processor.contractCreateNewAccount(contract));
-    long bytes = trx.getInstance().getRawData().getSerializedSize();
+    long bytes = trx.getSerializedSize();
     processor.consumeBandwidthForCreateNewAccount(ownerCapsule, bytes, 1526647838000L);
 
     AccountCapsule ownerCapsuleNew = dbManager.getAccountStore()
         .get(ByteArray.fromHexString(OWNER_ADDRESS));
-    Assert.assertEquals(120L, ownerCapsuleNew.getNetUsage());
+    Assert.assertEquals(122L, ownerCapsuleNew.getNetUsage());
 
   }
 
@@ -180,10 +180,10 @@ public void testFree() throws Exception {
     AccountCapsule ownerCapsuleNew = dbManager.getAccountStore()
         .get(ByteArray.fromHexString(OWNER_ADDRESS));
 
-    Assert.assertEquals(120L, ownerCapsuleNew.getFreeNetUsage());
+    Assert.assertEquals(122L, ownerCapsuleNew.getFreeNetUsage());
     Assert.assertEquals(508882612L, ownerCapsuleNew.getLatestConsumeFreeTime());//slot
     Assert.assertEquals(1526647838000L, ownerCapsuleNew.getLatestOperationTime());
-    Assert.assertEquals(120L, dbManager.getDynamicPropertiesStore().getPublicNetUsage());
+    Assert.assertEquals(122L, dbManager.getDynamicPropertiesStore().getPublicNetUsage());
     Assert.assertEquals(508882612L, dbManager.getDynamicPropertiesStore().getPublicNetTime());
     Assert.assertEquals(0L, ret.getFee());
 
@@ -193,11 +193,11 @@ public void testFree() throws Exception {
     ownerCapsuleNew = dbManager.getAccountStore()
         .get(ByteArray.fromHexString(OWNER_ADDRESS));
 
-    Assert.assertEquals(60L + 120L, ownerCapsuleNew.getFreeNetUsage());
+    Assert.assertEquals(61L + 122L, ownerCapsuleNew.getFreeNetUsage());
     Assert.assertEquals(508897012L,
         ownerCapsuleNew.getLatestConsumeFreeTime()); // 508882612L + 28800L/2
     Assert.assertEquals(1526691038000L, ownerCapsuleNew.getLatestOperationTime());
-    Assert.assertEquals(60L + 120L, dbManager.getDynamicPropertiesStore().getPublicNetUsage());
+    Assert.assertEquals(61L + 122L, dbManager.getDynamicPropertiesStore().getPublicNetUsage());
     Assert.assertEquals(508897012L, dbManager.getDynamicPropertiesStore().getPublicNetTime());
     Assert.assertEquals(0L, ret.getFee());
   }
@@ -228,11 +228,11 @@ public void testConsumeAssetAccount() throws Exception {
     AccountCapsule assetCapsuleNew = dbManager.getAccountStore()
         .get(ByteArray.fromHexString(ASSET_ADDRESS));
 
-    Assert.assertEquals(120L, assetCapsuleNew.getNetUsage());
+    Assert.assertEquals(122L, assetCapsuleNew.getNetUsage());
     Assert.assertEquals(508882612L, assetCapsuleNew.getLatestConsumeTime());
     Assert.assertEquals(1526647838000L, ownerCapsuleNew.getLatestOperationTime());
     Assert.assertEquals(508882612L, ownerCapsuleNew.getLatestAssetOperationTime(ASSET_NAME));
-    Assert.assertEquals(120L, ownerCapsuleNew.getFreeAssetNetUsage(ASSET_NAME));
+    Assert.assertEquals(122L, ownerCapsuleNew.getFreeAssetNetUsage(ASSET_NAME));
     Assert.assertEquals(0L, ret.getFee());
 
     dbManager.getDynamicPropertiesStore().saveLatestBlockHeaderTimestamp(1526691038000L); // + 12h
@@ -244,11 +244,11 @@ public void testConsumeAssetAccount() throws Exception {
     assetCapsuleNew = dbManager.getAccountStore()
         .get(ByteArray.fromHexString(ASSET_ADDRESS));
 
-    Assert.assertEquals(60L + 120L, assetCapsuleNew.getNetUsage());
+    Assert.assertEquals(61L + 122L, assetCapsuleNew.getNetUsage());
     Assert.assertEquals(508897012L, assetCapsuleNew.getLatestConsumeTime());
     Assert.assertEquals(1526691038000L, ownerCapsuleNew.getLatestOperationTime());
     Assert.assertEquals(508897012L, ownerCapsuleNew.getLatestAssetOperationTime(ASSET_NAME));
-    Assert.assertEquals(60L + 120L, ownerCapsuleNew.getFreeAssetNetUsage(ASSET_NAME));
+    Assert.assertEquals(61L + 122L, ownerCapsuleNew.getFreeAssetNetUsage(ASSET_NAME));
     Assert.assertEquals(0L, ret.getFee());
 
   }
@@ -277,7 +277,7 @@ public void testConsumeOwner() throws Exception {
     AccountCapsule assetCapsuleNew = dbManager.getAccountStore()
         .get(ByteArray.fromHexString(ASSET_ADDRESS));
 
-    Assert.assertEquals(120L, ownerCapsuleNew.getNetUsage());
+    Assert.assertEquals(122L, ownerCapsuleNew.getNetUsage());
     Assert.assertEquals(1526647838000L, ownerCapsuleNew.getLatestOperationTime());
     Assert.assertEquals(508882612L, ownerCapsuleNew.getLatestConsumeTime());
     Assert.assertEquals(0L, ret.getFee());
@@ -289,7 +289,7 @@ public void testConsumeOwner() throws Exception {
     ownerCapsuleNew = dbManager.getAccountStore()
         .get(ByteArray.fromHexString(OWNER_ADDRESS));
 
-    Assert.assertEquals(60L + 120L, ownerCapsuleNew.getNetUsage());
+    Assert.assertEquals(61L + 122L, ownerCapsuleNew.getNetUsage());
     Assert.assertEquals(1526691038000L, ownerCapsuleNew.getLatestOperationTime());
     Assert.assertEquals(508897012L, ownerCapsuleNew.getLatestConsumeTime());
     Assert.assertEquals(0L, ret.getFee());
@@ -328,7 +328,7 @@ public void testUsingFee() throws Exception {
     AccountCapsule ownerCapsuleNew = dbManager.getAccountStore()
         .get(ByteArray.fromHexString(OWNER_ADDRESS));
 
-    long transactionFee = 120L * dbManager.getDynamicPropertiesStore().getTransactionFee();
+    long transactionFee = 122L * dbManager.getDynamicPropertiesStore().getTransactionFee();
     Assert.assertEquals(transactionFee,
         dbManager.getDynamicPropertiesStore().getTotalTransactionCost());
     Assert.assertEquals(
@@ -346,7 +346,7 @@ public void testUsingFee() throws Exception {
         dbManager.getDynamicPropertiesStore().getTotalCreateAccountCost());
     Assert.assertEquals(
         10_000_000L - transactionFee - createAccountFee, ownerCapsuleNew.getBalance());
-    Assert.assertEquals(101200L, ret.getFee());
+    Assert.assertEquals(101220L, ret.getFee());
 
   }