Update usvm version and related updates in ClassScorer usages

Author: EgorkaKulikov

gradle.properties

@@ -109,7 +109,7 @@ springBootVersion=2.7.13
 springSecurityVersion=5.8.5
 
 approximationsVersion=bfce4eedde
-usvmVersion=89797677a7
+usvmVersion=7b45e18b0e
 
 # configuration for build server
 #

utbot-framework/src/main/kotlin/org/utbot/engine/UsvmSymbolicEngine.kt

@@ -14,6 +14,7 @@ import org.usvm.machine.state.JcState
 import org.usvm.types.ClassScorer
 import org.usvm.types.TypeScorer
 import org.usvm.types.scoreClassNode
+import org.usvm.util.ApproximationPaths
 import org.utbot.common.utBotTempDirectory
 import org.utbot.framework.UtSettings
 import org.utbot.framework.codegen.domain.builtin.UtilMethodProviderPlaceholder
@@ -22,7 +23,6 @@ import org.utbot.framework.fuzzer.ReferencePreservingIntIdGenerator
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.InstrumentedProcessDeathException
 import org.utbot.framework.plugin.api.UtConcreteExecutionFailure
-import org.utbot.framework.plugin.api.UtConcreteExecutionProcessedFailure
 import org.utbot.framework.plugin.api.UtError
 import org.utbot.framework.plugin.api.UtFailedExecution
 import org.utbot.framework.plugin.api.UtResult
@@ -38,6 +38,7 @@ import org.utbot.usvm.converter.UtUsvmExecution
 import org.utbot.usvm.converter.toExecutableId
 import org.utbot.usvm.jc.JcContainer
 import org.utbot.usvm.jc.JcExecution
+import org.utbot.usvm.jc.JcJars
 import org.utbot.usvm.jc.JcTestExecutor
 import org.utbot.usvm.jc.findMethodOrNull
 import org.utbot.usvm.jc.typedMethod
@@ -201,11 +202,14 @@ object UsvmSymbolicEngine {
         classpath = classpathFiles,
         javaHome = JdkInfoService.provide().path.toFile(),
     ) {
+        val approximationPaths = ApproximationPaths(
+            usvmApiJarPath = JcJars.approximationsApiJar.absolutePath,
+            usvmApproximationsJarPath = JcJars.approximationsJar.absolutePath,
+        )
         installFeatures(
             InMemoryHierarchy,
             Approximations,
-            // ApproximationPaths(JcJars.approximationsJar, ...)
-            ClassScorer(TypeScorer, ::scoreClassNode)
+            ClassScorer(TypeScorer, ::scoreClassNode, approximationPaths)
         )
         loadByteCode(classpathFiles)
     }

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/ContestUsvm.kt

@@ -14,6 +14,7 @@ import org.usvm.machine.JcMachine
 import org.usvm.types.ClassScorer
 import org.usvm.types.TypeScorer
 import org.usvm.types.scoreClassNode
+import org.usvm.util.ApproximationPaths
 import org.utbot.common.info
 import org.utbot.common.measureTime
 import org.utbot.contest.ClassUnderTest
@@ -50,6 +51,7 @@ import org.utbot.usvm.converter.SimpleInstructionIdProvider
 import org.utbot.usvm.converter.toExecutableId
 import org.utbot.usvm.jc.JcContainer
 import org.utbot.usvm.jc.JcContainer.Companion.TEST_EXECUTION_TIMEOUT
+import org.utbot.usvm.jc.JcJars
 import org.utbot.usvm.jc.JcTestExecutor
 import org.utbot.usvm.jc.findMethodOrNull
 import org.utbot.usvm.jc.typedMethod
@@ -261,8 +263,11 @@ fun createJcContainer(
 ) {
     // TODO usvm-sbft: we may want to tune these JcSettings for contest
     // TODO: require usePersistence=false for ClassScorer
-    // ApproximationPaths(JcJars.approximationsJar, ...) в ClassScorer
-    installFeatures(InMemoryHierarchy, Approximations, ClassScorer(TypeScorer, ::scoreClassNode))
+    val approximationPaths = ApproximationPaths(
+        usvmApiJarPath = JcJars.approximationsApiJar.absolutePath,
+        usvmApproximationsJarPath = JcJars.approximationsJar.absolutePath,
+    )
+    installFeatures(InMemoryHierarchy, Approximations, ClassScorer(TypeScorer, ::scoreClassNode, approximationPaths))
     loadByteCode(classpathFiles)
 }