Merge branch 'master' into json_rpc_param_validation

rsksmart · Oct 12, 2023 · bdc22a1 · bdc22a1
2 parents 59173f6 + 15ffd2c
commit bdc22a1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1318,12 +1318,12 @@
             <sha256 value="5b626a99e5734ba8d0c0c8c3fc6258afa0624f4ce61ae1192247d03c57463ded" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.rocksdb" name="rocksdbjni" version="6.27.3">
-         <artifact name="rocksdbjni-6.27.3.jar">
-            <sha256 value="a1ce1d0f64e978e490a29ea3ad757372266739d89baa2e153b16e4231eae659d" origin="Generated by Gradle"/>
+      <component group="org.rocksdb" name="rocksdbjni" version="7.10.2">
+         <artifact name="rocksdbjni-7.10.2.jar">
+            <sha256 value="613b6a84a61b74d9b83778697f25ce5b1e159bd517a3b05ee408ae0738f547aa" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="rocksdbjni-6.27.3.pom">
-            <sha256 value="42a868e107aeff1f15ec3e65e993c615ba87db736b8591a5b256cac4cbc2a3fc" origin="Generated by Gradle"/>
+         <artifact name="rocksdbjni-7.10.2.pom">
+            <sha256 value="edf496e83b697dbfb7d127a6c58f5951d4777b933ff8db252fbe8567f50206c1" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.slf4j" name="log4j-over-slf4j" version="1.7.36">

diff --git a/rskj-core/build.gradle b/rskj-core/build.gradle
@@ -112,7 +112,7 @@ ext {
             spongyCastleVer        : '1.58.0.0',
             bouncyCastleVer        : '1.59',
             ethereumLeveldbJniVer  : '1.18.3',
-            rocksdbJniVer          : '6.27.3',
+            rocksdbJniVer          : '7.10.2',
             slf4jVer               : '1.7.36',
             logbackVer             : '1.2.10',
             jacksonVer             : '2.13.3',

diff --git a/rskj-core/src/test/java/org/ethereum/datasource/RocksDbDataSourceTest.java b/rskj-core/src/test/java/org/ethereum/datasource/RocksDbDataSourceTest.java
@@ -109,15 +109,15 @@ void updateBatchRetriesOnDeleteError() {
         Set<ByteArrayWrapper> deleteKeys = ImmutableSet.of(ByteUtil.wrap(keyToDelete1), ByteUtil.wrap(keyToDelete2));
 
         try (MockedConstruction<WriteBatch> writeBatchMockedConstruction = Mockito.mockConstruction(WriteBatch.class,
-                (mock, context) -> doThrow(new RocksDBException(dbExceptionMessage)).when(mock).delete(any())
+                (mock, context) -> doThrow(new RocksDBException(dbExceptionMessage)).when(mock).delete(any(byte[].class))
         )) {
             RuntimeException updateException = assertThrows(RuntimeException.class, () -> dataSource.updateBatch(batch, deleteKeys));
             assertEquals(RocksDBException.class.getName() + ": " + dbExceptionMessage, updateException.getMessage());
 
             WriteBatch writeBatch1 = writeBatchMockedConstruction.constructed().get(1);
-            verify(writeBatch1, times(1)).delete(any());
+            verify(writeBatch1, times(1)).delete(any(byte[].class));
             WriteBatch writeBatch2 = writeBatchMockedConstruction.constructed().get(1);
-            verify(writeBatch2, times(1)).delete(any());
+            verify(writeBatch2, times(1)).delete(any(byte[].class));
         } catch (RocksDBException e) {
             throw new RuntimeException(e);
         }