Applying suggestions from review

rsksmart · Sep 5, 2024 · 91ea7d1 · 91ea7d1
1 parent bc5c05f
commit 91ea7d1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 40 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/net/handler/TxTimestamp.java b/rskj-core/src/main/java/co/rsk/net/handler/TxTimestamp.java
diff --git a/rskj-core/src/main/java/org/ethereum/cost/InitcodeCostCalculator.java b/rskj-core/src/main/java/org/ethereum/cost/InitcodeCostCalculator.java
@@ -26,7 +26,7 @@
 import static org.ethereum.vm.GasCost.INITCODE_WORD_COST;
 
 public class InitcodeCostCalculator implements CostCalculator {
-    private static final InitcodeCostCalculator INSTANCE = new InitcodeCostCalculator();
+    private static InitcodeCostCalculator INSTANCE;
 
     private InitcodeCostCalculator() {}
 
@@ -39,7 +39,7 @@ public static InitcodeCostCalculator getInstance() {
 
     @Override
     public long calculateCost(byte[] data, ActivationConfig.ForBlock activations) {
-        if ( dataLength > 0 && activations.isActive(ConsensusRule.RSKIP438) ) {
+        if ( data.length > 0 && activations.isActive(ConsensusRule.RSKIP438) ) {
             return  INITCODE_WORD_COST  *  ( (long) Math.ceil( ( (double) getLength(data) ) / 32 ) );
         }
         return 0;

diff --git a/rskj-core/src/main/java/org/ethereum/vm/program/Program.java b/rskj-core/src/main/java/org/ethereum/vm/program/Program.java
@@ -1613,7 +1613,7 @@ public static RuntimeException tooLargeInitCodeSize(@Nonnull Program program, in
         }
 
         public static AddressCollisionException addressCollisionException(@Nonnull Program program, RskAddress address) {
-            return new AddressCollisionException("Tried to create a contract with an already existing contract address: 0x" + address + ", tx: " + extractTxHash(program));
+            return new AddressCollisionException("Trying to create a contract with existing contract address: 0x" + address + ", tx: " + extractTxHash(program));
         }
 
         @Nonnull

diff --git a/...ava/co/rsk/net/handler/TxsPerAccount.java → ...ava/co/rsk/net/handler/TxsPerAccount.java b/...ava/co/rsk/net/handler/TxsPerAccount.java → ...ava/co/rsk/net/handler/TxsPerAccount.java
@@ -25,7 +25,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-//TODO: Maybe move this to a test class?
 public class TxsPerAccount {
 
     private List<Transaction> txs = new LinkedList<>();
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             public static AddressCollisionException addressCollisionException(@Nonnull Program program, RskAddress address) {
-                return new AddressCollisionException("Tried to create a contract with an already existing contract address: 0x" + address + ", tx: " + extractTxHash(program));
+                return new AddressCollisionException("Trying to create a contract with existing contract address: 0x" + address + ", tx: " + extractTxHash(program));
             }
             @Nonnull
@@ Expand Down @@