CORDA-3738: Upgrade to DJVM 1.1-RC02. (corda#6195)

* CORDA-3738: Upgrade to DJVM 1.1-RC02. * Update comment for DJVM 1.1's new requirements.
DrMatrixBMC · Apr 30, 2020 · 83dd9a9 · 83dd9a9
1 parent 9bcb9b2
commit 83dd9a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/constants.properties b/constants.properties
@@ -30,7 +30,7 @@ snakeYamlVersion=1.19
 caffeineVersion=2.7.0
 metricsVersion=4.1.0
 metricsNewRelicVersion=1.1.1
-djvmVersion=1.1-RC01
+djvmVersion=1.1-RC02
 deterministicRtVersion=1.0-RC02
 openSourceBranch=https://github.com/corda/corda/blob/release/os/4.4
 openSourceSamplesBranch=https://github.com/corda/samples/blob/release-V4

diff --git a/core/src/main/kotlin/net/corda/core/internal/TransactionVerifierServiceInternal.kt b/core/src/main/kotlin/net/corda/core/internal/TransactionVerifierServiceInternal.kt
@@ -401,16 +401,15 @@ class ContractVerifier(private val transactionClassLoader: ClassLoader) : Functi
 
     override fun apply(ltx: LedgerTransaction) {
         val contractClassNames = (ltx.inputs.map(StateAndRef<ContractState>::state) + ltx.outputs)
-            .map(TransactionState<*>::contract)
-            .toSet()
+            .mapTo(LinkedHashSet(), TransactionState<*>::contract)
 
         contractClassNames.associateBy(
             { it }, { createContractClass(ltx.id, it) }
         ).map { (contractClassName, contractClass) ->
             try {
                 /**
                  * This function must execute with the DJVM's sandbox, which does not
-                 * permit user code to access [java.lang.reflect.Constructor] objects.
+                 * permit user code to invoke [java.lang.Class.getDeclaredConstructor].
                  *
                  * [Class.newInstance] is deprecated as of Java 9.
                  */

diff --git a/...src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt b/...src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt
@@ -75,7 +75,7 @@ class NonDeterministicContractVerifyTest {
                         .returnValue.getOrThrow()
             }
             assertThat(ex)
-                .hasMessageMatching("^NoSuchMethodError: .*\\Qsandbox.java.lang.System.currentTimeMillis()\\E.*\$")
+                .hasMessageStartingWith("RuleViolationError: Disallowed reference to API; java.lang.System.currentTimeMillis(), ")
         }
     }
 
@@ -88,7 +88,7 @@ class NonDeterministicContractVerifyTest {
                         .returnValue.getOrThrow()
             }
             assertThat(ex)
-                .hasMessageMatching("^NoSuchMethodError: .*\\Qsandbox.java.lang.System.nanoTime()\\E.*\$")
+                .hasMessageStartingWith("RuleViolationError: Disallowed reference to API; java.lang.System.nanoTime(), ")
         }
     }