update bandwidth consume

src/main/java/org/tron/common/runtime/Runtime.java

@@ -75,7 +75,6 @@ public class Runtime {
   private Deposit deposit;
   private ProgramInvokeFactory programInvokeFactory = null;
   private String runtimeError;
-  private boolean readyToExecute = false;
 
   private EnergyProcessor energyProcessor = null;
   private StorageMarket storageMarket = null;
@@ -200,27 +199,6 @@ public void precompiled() throws ContractValidateException, ContractExeException
     }
   }
 
-  /**
-   */
-  public void init() {
-    readyToExecute = true;
-    // switch (trxType) {
-    //   case TRX_PRECOMPILED_TYPE:
-    //     readyToExecute = true;
-    //     break;
-    //   case TRX_CONTRACT_CREATION_TYPE:
-    //   case TRX_CONTRACT_CALL_TYPE:
-    //     // if (!curENERGYLimitReachedBlockENERGYLimit()) {
-    //     //   readyToExecute = true;
-    //     // }
-    //     readyToExecute = true;
-    //     break;
-    //   default:
-    //     readyToExecute = true;
-    //     break;
-    // }
-  }
-
 
   public BigInteger getBlockCPULeftInUs() {
 
@@ -261,10 +239,6 @@ public boolean curCPULimitReachedBlockCPULimit() {
   }
 
   public void execute() throws ContractValidateException, ContractExeException {
-
-    if (!readyToExecute) {
-      return;
-    }
     switch (trxType) {
       case TRX_PRECOMPILED_TYPE:
         precompiled();
@@ -276,7 +250,7 @@ public void execute() throws ContractValidateException, ContractExeException {
         call();
         break;
       default:
-        break;
+        throw new ContractValidateException("Unknown contract type");
     }
   }
 
@@ -517,9 +491,6 @@ private void call()
   }
 
   public void go() throws OutOfSlotTimeException {
-    if (!readyToExecute) {
-      return;
-    }
 
     try {
       if (vm != null) {

src/main/java/org/tron/core/Wallet.java

@@ -851,7 +851,6 @@ public Transaction triggerContract(TriggerSmartContract triggerSmartContract,
 
         Runtime runtime = new Runtime(trxCap.getInstance(), headBlock, deposit,
             new ProgramInvokeFactoryImpl());
-        runtime.init();
         runtime.execute();
         runtime.go();
         runtime.finalization();

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

@@ -101,9 +101,9 @@ public void setNetBill(long netUsage, long netFee) {
   public void exec(Runtime runtime)
       throws ContractExeException, ContractValidateException, OutOfSlotTimeException {
     /**  VM execute  **/
-    runtime.init();
     runtime.execute();
     runtime.go();
+    pay();
     runtime.finalization();
   }
 

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

@@ -727,16 +727,16 @@ private void onHandleBlockMessage(PeerConnection peer, BlockMessage blkMsg) {
           isFetchSyncActive = true;
         }
       }
-    }
-
-    if (advObjWeRequested.containsKey(item)) {
+    } else if (advObjWeRequested.containsKey(item)) {
       advObjWeRequested.remove(item);
       if (!syncFlag) {
         processAdvBlock(peer, blkMsg.getBlockCapsule());
         startFetchItem();
       }
     } else {
       if (!syncFlag) {//not we request and not sync,disconnect
+        logger.error("not we request and not sync, disconnect : {}, block : {}",
+            peer.getInetAddress(), blockId.getString());
         banTraitorPeer(peer, ReasonCode.BAD_PROTOCOL);
       }
     }

src/test/java/org/tron/common/runtime/TVMTestUtils.java

@@ -147,8 +147,6 @@ public static TVMTestResult processTransactionAndReturnTVMTestResult(Transaction
     //exec
     trace.exec(runtime);
 
-    trace.pay();
-
     return new TVMTestResult(runtime, trace.getReceipt(), null);
   }
 

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

@@ -150,7 +150,6 @@ public void testUseFee() throws InvalidProtocolBufferException {
         new ProgramInvokeFactoryImpl());
     try {
       trace.exec(runtime);
-      trace.pay();
       Assert.assertEquals(0, trace.getReceipt().getEnergyUsage());
       Assert.assertEquals(49503930, trace.getReceipt().getEnergyFee());
       // Assert.assertEquals(deployStorageDelta, trace.getReceipt().getStorageDelta());