Refactoring of branch to merge it to master

In order to fix the jmh benchmarking test, we need to refactor and remove some changes made to run test locally.
rsksmart · Feb 26, 2024 · 16b94de · 16b94de
1 parent 5e5ce38
commit 16b94de
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 78 deletions.
diff --git a/rskj-core/src/jmh/java/co/rsk/jmh/web3/BenchmarkWeb3.java b/rskj-core/src/jmh/java/co/rsk/jmh/web3/BenchmarkWeb3.java
@@ -198,7 +198,7 @@ public void traceFilterBetweenBlockRange(TracePlan plan) throws BenchmarkWeb3Exc
     }
 
     @Benchmark
-    @Timeout(time = 60)
+    @Timeout(time = 100)
     public void traceFilterBetweenAddresses(TracePlan plan) throws BenchmarkWeb3Exception {
         plan.getWeb3Connector().traceFilter(plan.getFromBlock(), plan.getToBlock(), plan.getFromAddresses(), plan.getToAddresses());
     }

diff --git a/rskj-core/src/jmh/java/co/rsk/jmh/web3/plan/EthCallPlan.java b/rskj-core/src/jmh/java/co/rsk/jmh/web3/plan/EthCallPlan.java
@@ -44,11 +44,11 @@ public void setUp(BenchmarkParams params) throws BenchmarkWeb3Exception {
     private RskModuleWeb3j.EthCallArguments buildEthCallArguments() {
         RskModuleWeb3j.EthCallArguments args = new RskModuleWeb3j.EthCallArguments();
 
+        args.setGasLimit(configuration.getString("eth_call.gasLimit"));
         args.setFrom(configuration.getString("eth_call.transaction.from"));
         args.setTo(configuration.getString("eth_call.transaction.to"));
         args.setGas(configuration.getString("eth_call.transaction.gas"));
         args.setGasPrice(configuration.getString("eth_call.transaction.gasPrice"));
-        args.setGasLimit(configuration.getString("eth_call.transaction.gasLimit"));
         args.setValue(configuration.getString("eth_call.transaction.value"));
         args.setData(configuration.getString("eth_call.transaction.input"));
 

diff --git a/rskj-core/src/jmh/resources/conf/testnet-3_860_000.conf b/rskj-core/src/jmh/resources/conf/testnet-3_860_000.conf
@@ -69,12 +69,12 @@ trace.fromAddresses=0x0000000000000000000000000000000000000000
 ############################
 # eth_call
 ############################
+eth_call.gasLimit=0x4e252e0
 eth_call.transaction.blockNumber=0x362193
 eth_call.transaction.from=0x4a727d7943b563462c96d40689836600d20b983b
 eth_call.transaction.to=0x19f64674d8a5b4e652319f5e239efd3bc969a1fe
 eth_call.transaction.gas=0x13069
 eth_call.transaction.gasPrice=0x3e252e0
-eth_call.transaction.gasLimit=0x4e252e0
 eth_call.transaction.value=0x0
 eth_call.transaction.input=0xa9059cbb000000000000000000000000318bb57758207dc202bb78748e39eec8f269c6e10000000000000000000000000000000000000000000000056bc75e2d63100000
 

diff --git a/rskj-core/src/main/resources/config/main.conf b/rskj-core/src/main/resources/config/main.conf
@@ -92,10 +92,4 @@ hello.phrase = MainNet
 wallet {
     enabled = false
     accounts = []
-}
-
-cache {
-  states {
-    max-elements = 4000000
-  }
-}
+}
diff --git a/rskj-core/src/test/java/org/ethereum/datasource/DataSourceWithCacheProfilingMemoryTest.java b/rskj-core/src/test/java/org/ethereum/datasource/DataSourceWithCacheProfilingMemoryTest.java