fix sonar

Author: CodeNinjaEvan

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

@@ -315,10 +315,8 @@ public long getTotalEnergyLimitWithFixRatio(AccountCapsule creator, AccountCapsu
   public long getTotalEnergyLimit(AccountCapsule creator, AccountCapsule caller,
       TriggerSmartContract contract, long feeLimit, long callValue)
       throws ContractValidateException {
-    if (VMConfig.allowTvmConstantinople()) {
-      if (Objects.isNull(creator)) {
-        return getAccountEnergyLimitWithFixRatio(caller, feeLimit, callValue);
-      }
+    if (VMConfig.allowTvmConstantinople() && Objects.isNull(creator)) {
+      return getAccountEnergyLimitWithFixRatio(caller, feeLimit, callValue);
     }
     //  according to version
     if (VMConfig.getEnergyLimitHardFork()) {
@@ -690,7 +688,7 @@ public void go() {
       runtimeError = result.getException().getMessage();
       logger.info("timeout: {}", result.getException().getMessage());
     } catch (Throwable e) {
-      if (! (e instanceof TransferException)) {
+      if (!(e instanceof TransferException)) {
         program.spendAllEnergy();
       }
       result = program.getResult();

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

@@ -106,11 +106,9 @@ public void payEnergyBill(Manager manager, AccountCapsule origin, AccountCapsule
       return;
     }
 
-    if (VMConfig.allowTvmConstantinople()) {
-      if (Objects.isNull(origin)) {
-        payEnergyBill(manager, caller, receipt.getEnergyUsageTotal(), energyProcessor, now);
-        return;
-      }
+    if (VMConfig.allowTvmConstantinople() && Objects.isNull(origin)) {
+      payEnergyBill(manager, caller, receipt.getEnergyUsageTotal(), energyProcessor, now);
+      return;
     }
 
     if (caller.getAddress().equals(origin.getAddress())) {