sataterecovery: use decompressor that is ThreadSafe

Consensys · Feb 24, 2025 · 0177087 · 0177087
1 parent 41c8506
commit 0177087
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/jvm-libs/linea/blob-decompressor/build.gradle b/jvm-libs/linea/blob-decompressor/build.gradle
@@ -23,18 +23,11 @@ jar {
   dependsOn configurations.runtimeClasspath
 }
 
-test {
-  // we cannot have more 1 compressor per JVM, hence we disable parallel execution
-  // because multiple threads would cause issues with the native library
-  systemProperties["junit.jupiter.execution.parallel.enabled"] = false
-  maxParallelForks = 1
-}
-
 def libsZipDownloadOutputDir = project.parent.layout.buildDirectory.asFile.get().absolutePath
 
 task downloadNativeLibs {
   doLast {
-    fetchLibFromZip("https://github.com/Consensys/linea-monorepo/releases/download/blob-libs-v1.1.0-test9/linea-blob-libs-v1.1.0-test9.zip", "blob_decompressor", libsZipDownloadOutputDir)
+    fetchLibFromZip("https://github.com/Consensys/linea-monorepo/releases/download/blob-libs-v1.1.1/linea-blob-libs-v1.1.1.zip", "blob_decompressor", libsZipDownloadOutputDir)
   }
 }
 

diff --git a/...ea/blob-decompressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobDecompressor.kt b/...ea/blob-decompressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobDecompressor.kt
@@ -81,7 +81,7 @@ internal interface GoNativeBlobDecompressorJnaBinding {
 internal interface GoNativeBlobDecompressorJnaLib : GoNativeBlobDecompressorJnaBinding, Library
 
 enum class BlobDecompressorVersion(val version: String) {
-  V1_1_0("v1.1.0")
+  V1_1_0("v1.1.1")
 }
 
 class GoNativeBlobDecompressorFactory {

diff --git a/state-recovery/test-cases/build.gradle b/state-recovery/test-cases/build.gradle
@@ -9,31 +9,19 @@ group = 'build.linea.staterecover'
 
 dependencies {
   implementation("io.vertx:vertx-core:${libs.versions.vertx.get()}")
-  api(project(':jvm-libs:generic:extensions:kotlin'))
-  api(project(':jvm-libs:linea:core:domain-models'))
-  api(project(':jvm-libs:linea:core:long-running-service'))
-  api(project(':jvm-libs:linea:clients:interfaces'))
-  api(project(':jvm-libs:linea:clients:linea-l1-contract-client'))
-  api(project(':jvm-libs:linea:clients:linea-state-manager'))
-  api(project(':jvm-libs:linea:blob-decompressor'))
-  api(project(':state-recovery:appcore:clients-interfaces'))
-  api(project(':state-recovery:appcore:domain-models'))
-  api(project(':state-recovery:appcore:logic'))
-  api(project(':state-recovery:besu-plugin'))
-
+  implementation(project(':state-recovery:appcore:logic'))
+  implementation(project(':state-recovery:besu-plugin'))
+  implementation(project(':state-recovery:clients:eth-api'))
+  implementation(project(':state-recovery:clients:blobscan-client'))
+  implementation('build.linea:l1-rollup-contract-client:6.0.0')
   implementation project(':jvm-libs:generic:vertx-helper')
   implementation project(':jvm-libs:linea:besu-libs')
   implementation project(':jvm-libs:linea:testing:file-system')
-  implementation(testFixtures(project(':jvm-libs:generic:json-rpc')))
-  implementation(project(':state-recovery:clients:eth-api'))
-  implementation(project(':state-recovery:clients:blobscan-client'))
   implementation(project(':coordinator:clients:smart-contract-client'))
   implementation(project(':jvm-libs:linea:linea-contracts:l1-rollup'))
-  implementation('build.linea:l1-rollup-contract-client:6.0.0')
   implementation(project(':coordinator:core'))
   implementation(project(":coordinator:ethereum:test-utils"))
   implementation(project(":jvm-libs:linea:testing:l1-blob-and-proof-submission"))
-  implementation(testFixtures(project(":jvm-libs:linea:blob-compressor")))
   implementation(testFixtures(project(':jvm-libs:linea:web3j-extensions')))
   testImplementation("io.vertx:vertx-junit5")
   testImplementation(project(":jvm-libs:linea:metrics:micrometer"))
@@ -79,8 +67,6 @@ task integrationTest(type: Test) { test ->
   testClassesDirs = sourceSets.integrationTest.output.classesDirs
 
   dependsOn(":localStackForStateRecoveryComposeUp")
-  maxParallelForks = 1
-  systemProperties["junit.jupiter.execution.parallel.enabled"] = false
   // increase default timeout because this tests submit loads of blobs
   systemProperties["junit.jupiter.execution.timeout.default"] = "10 m" // 10 minutes