Fix consumerBandwidth method that didn't work

Author: sean-liu55

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

@@ -420,7 +420,6 @@ public synchronized boolean pushTransactions(final TransactionCapsule trx)
       throw new DupTransactionException("dup trans");
     }
 
-
     if (!trx.validateSignature()) {
       throw new ValidateSignatureException("trans sig validate failed");
     }
@@ -465,7 +464,7 @@ public void consumeBandwidth(TransactionCapsule trx) throws ValidateBandwidthExc
       }
       long bandwidthPerTransaction = getDynamicPropertiesStore().getBandwidthPerTransaction();
       if (bandwidth < bandwidthPerTransaction) {
-          throw new ValidateBandwidthException("bandwidth is not enough");
+        throw new ValidateBandwidthException("bandwidth is not enough");
       }
       accountCapsule.setBandwidth(bandwidth - bandwidthPerTransaction);
       accountCapsule.setLatestOperationTime(Time.getCurrentMillis());
@@ -525,7 +524,7 @@ public void eraseBlock() throws BadItemException, ItemNotFoundException {
   }
 
   private void applyBlock(BlockCapsule block)
-      throws ContractValidateException, ContractExeException, ValidateSignatureException {
+      throws ContractValidateException, ContractExeException, ValidateSignatureException, ValidateBandwidthException {
     processBlock(block);
     this.blockStore.put(block.getBlockId().getBytes(), block);
     this.blockIndexStore.put(block.getBlockId());
@@ -559,6 +558,8 @@ private void switchFork(BlockCapsule newHead) {
             try (Dialog tmpDialog = revokingStore.buildDialog()) {
               applyBlock(item);
               tmpDialog.commit();
+            } catch (ValidateBandwidthException e) {
+              logger.error("high freq", e);
             } catch (ValidateSignatureException e) {
               logger.debug(e.getMessage(), e);
             } catch (ContractValidateException e) {
@@ -583,7 +584,7 @@ private synchronized void filterPendingTrx(List<TransactionCapsule> listTrx) {
    */
   public synchronized void pushBlock(final BlockCapsule block)
       throws ValidateSignatureException, ContractValidateException, ContractExeException,
-      UnLinkedBlockException, ValidateScheduleException {
+      UnLinkedBlockException, ValidateScheduleException, ValidateBandwidthException {
 
     try (PendingManager pm = new PendingManager(this)) {
 
@@ -798,7 +799,7 @@ public boolean hasBlocks() {
    * Process transaction.
    */
   public boolean processTransaction(final TransactionCapsule trxCap)
-      throws ValidateSignatureException, ContractValidateException, ContractExeException {
+      throws ValidateSignatureException, ContractValidateException, ContractExeException, ValidateBandwidthException {
 
     if (trxCap == null) {
       return false;
@@ -809,6 +810,8 @@ public boolean processTransaction(final TransactionCapsule trxCap)
     final List<Actuator> actuatorList = ActuatorFactory.createActuator(trxCap, this);
     TransactionResultCapsule ret = new TransactionResultCapsule();
 
+    consumeBandwidth(trxCap);
+
     for (Actuator act : actuatorList) {
       act.validate();
       act.execute(ret);
@@ -835,7 +838,7 @@ public BlockCapsule getBlockByNum(final long num) throws ItemNotFoundException,
   public synchronized BlockCapsule generateBlock(
       final WitnessCapsule witnessCapsule, final long when, final byte[] privateKey)
       throws ValidateSignatureException, ContractValidateException, ContractExeException,
-      UnLinkedBlockException, ValidateScheduleException {
+      UnLinkedBlockException, ValidateScheduleException, ValidateBandwidthException {
 
     final long timestamp = this.dynamicPropertiesStore.getLatestBlockHeaderTimestamp();
     final long number = this.dynamicPropertiesStore.getLatestBlockHeaderNumber();
@@ -936,7 +939,7 @@ private void setUtxoStore(final UtxoStore utxoStore) {
    * process block.
    */
   public void processBlock(BlockCapsule block)
-      throws ValidateSignatureException, ContractValidateException, ContractExeException {
+      throws ValidateSignatureException, ContractValidateException, ContractExeException, ValidateBandwidthException {
     // todo set revoking db max size.
     this.updateDynamicProperties(block);
     this.updateSignedWitness(block);

src/main/java/org/tron/core/net/node/NodeDelegateImpl.java

@@ -62,6 +62,8 @@ public synchronized LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boole
         return null;
       }
 
+    } catch (ValidateBandwidthException e) {
+      throw new BadBlockException("Validate Bandwidth exception");
     } catch (ValidateScheduleException e) {
       throw new BadBlockException("validate schedule exception");
     } catch (ValidateSignatureException e) {

src/test/java/org/tron/core/db/ManagerTest.java

@@ -30,6 +30,7 @@
 import org.tron.core.exception.HeaderNotFound;
 import org.tron.core.exception.ItemNotFoundException;
 import org.tron.core.exception.UnLinkedBlockException;
+import org.tron.core.exception.ValidateBandwidthException;
 import org.tron.core.exception.ValidateScheduleException;
 import org.tron.core.exception.ValidateSignatureException;
 import org.tron.core.witness.WitnessController;
@@ -82,7 +83,7 @@ public static void removeDb() {
   @Test
   public void setBlockReference()
       throws ContractExeException, UnLinkedBlockException, ValidateScheduleException,
-      ContractValidateException, ValidateSignatureException, BadItemException, ItemNotFoundException {
+      ContractValidateException, ValidateSignatureException, BadItemException, ItemNotFoundException, ValidateBandwidthException {
 
     BlockCapsule blockCapsule =
         new BlockCapsule(
@@ -207,7 +208,7 @@ public void updateWits() {
   public void fork()
       throws ValidateSignatureException, ContractValidateException, ContractExeException,
       UnLinkedBlockException, ValidateScheduleException, BadItemException,
-      ItemNotFoundException, HeaderNotFound {
+      ItemNotFoundException, HeaderNotFound, ValidateBandwidthException {
     Args.setParam(new String[]{"--witness"}, Constant.TEST_CONF);
     long size = dbManager.getBlockStore().dbSource.allKeys().size();
     System.out.print("block store size:" + size + "\n");