Sonar suggested improvements

BitEigen · Nov 23, 2021 · 81b7d0d · 81b7d0d
1 parent 361ff2e
commit 81b7d0d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/rpc/modules/eth/EthModule.java b/rskj-core/src/main/java/co/rsk/rpc/modules/eth/EthModule.java
@@ -158,7 +158,8 @@ public String estimateGas(CallArguments args) {
             if (res.getCallWithValuePerformed()) {
                 gasNeeded += GasCost.STIPEND_CALL;
             }
-            return s = TypeConverter.toQuantityJsonHex(gasNeeded);
+            s = TypeConverter.toQuantityJsonHex(gasNeeded);
+            return s;
         } finally {
             LOGGER.debug("eth_estimateGas(): {}", s);
         }

diff --git a/rskj-core/src/main/java/org/ethereum/core/TransactionExecutor.java b/rskj-core/src/main/java/org/ethereum/core/TransactionExecutor.java
@@ -522,8 +522,7 @@ private void finalization() {
         long gasRefund = Math.min(result.getFutureRefund(), result.getGasUsed() / 2);
         result.addDeductedRefund(gasRefund);
 
-        if (program != null) {
-            if (program.getCallWithValuePerformed())
+        if ((program != null) && (program.getCallWithValuePerformed())) {
                 result.markCallWithValuePerformed();
         }
 

diff --git a/rskj-core/src/main/java/org/ethereum/vm/program/ProgramResult.java b/rskj-core/src/main/java/org/ethereum/vm/program/ProgramResult.java
@@ -52,6 +52,14 @@ public class ProgramResult {
     private long deductedRefund =0;
     private boolean callWithValuePerformed;
 
+
+    /*
+     * for testing runs ,
+     * call/create is not executed
+     * but dummy recorded
+     */
+    private List<CallCreate> callCreateList;
+
     public boolean getCallWithValuePerformed() {
         return callWithValuePerformed;
     }
@@ -60,12 +68,6 @@ public void markCallWithValuePerformed() {
         callWithValuePerformed =true;
     }
 
-    /*
-     * for testing runs ,
-     * call/create is not executed
-     * but dummy recorded
-     */
-    private List<CallCreate> callCreateList;
 
     public void clearUsedGas() {
         gasUsed = 0;