sonarcloud fixes

rsksmart · Aug 26, 2021 · b5a8d51 · b5a8d51
1 parent 63e3cab
commit b5a8d51
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/config/RskSystemProperties.java b/rskj-core/src/main/java/co/rsk/config/RskSystemProperties.java
@@ -377,8 +377,4 @@ public long getPeerScoringSummaryTime() {
     public boolean fastBlockPropagation() {
         return configFromFiles.getBoolean("peer.fastBlockPropagation");
     }
-
-    public long getGasEstimationCap() {
-        return configFromFiles.getLong("rpc.gasEstimationCap");
-    }
 }
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
@@ -44,7 +44,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;

diff --git a/rskj-core/src/main/java/org/ethereum/config/SystemProperties.java b/rskj-core/src/main/java/org/ethereum/config/SystemProperties.java
@@ -668,4 +668,8 @@ private Optional<List<BtcECKey>> getGenesisFederationPublicKeys() {
                         .map(key -> BtcECKey.fromPublicOnly(Hex.decode(key))).collect(Collectors.toList())
         );
     }
+
+    public long getGasEstimationCap() {
+        return configFromFiles.getLong(PROPERTY_RPC_GAS_ESTIMATION_CAP);
+    }
 }
diff --git a/rskj-core/src/main/java/org/ethereum/core/TransactionExecutor.java b/rskj-core/src/main/java/org/ethereum/core/TransactionExecutor.java
@@ -493,7 +493,7 @@ public TransactionReceipt getReceipt() {
     }
 
     public boolean getProgramCallWithValuePerformed() {
-        return program != null ? program.getCallWithValuePerformed() : false;
+        return program != null && program.getCallWithValuePerformed();
     }
 
     private void finalization() {

diff --git a/rskj-core/src/main/java/org/ethereum/rpc/converters/CallArgumentsToByteArray.java b/rskj-core/src/main/java/org/ethereum/rpc/converters/CallArgumentsToByteArray.java
@@ -20,13 +20,10 @@
 
 import co.rsk.core.RskAddress;
 import org.ethereum.rpc.CallArguments;
-import org.ethereum.rpc.TypeConverter;
 import org.ethereum.util.ByteUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigInteger;
-
 import static org.ethereum.rpc.TypeConverter.stringHexToByteArray;
 
 /**