Merge pull request #638 from tronprotocol/fix_estimate_size

use trx.getSerializedSize for estimate block size

Author: olenheim

src/main/java/org/tron/core/capsule/TransactionCapsule.java

@@ -360,6 +360,10 @@ public byte[] getData() {
     return this.transaction.toByteArray();
   }
 
+  public long getSerializedSize() {
+    return this.transaction.getSerializedSize();
+  }
+
   @Override
   public Transaction getInstance() {
     return this.transaction;

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

@@ -861,7 +861,7 @@ public synchronized BlockCapsule generateBlock(
     Iterator iterator = pendingTransactions.iterator();
     while (iterator.hasNext()) {
       TransactionCapsule trx = (TransactionCapsule) iterator.next();
-      currentTrxSize += RamUsageEstimator.sizeOf(trx);
+      currentTrxSize += trx.getSerializedSize();
       // judge block size
       if (currentTrxSize > ChainConstant.TRXS_SIZE) {
         postponedTrxCount++;