ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-11 15:04:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-3738: Upgrade to DJVM 1.1-RC03. (#6219)

Browse Source
This commit is contained in:
Chris Rankin 2020-05-05 17:32:39 +01:00 committed by GitHub
parent 54e4503866
commit 9a5be9e47d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants.properties
View File

@ -30,7 +30,7 @@ snakeYamlVersion=1.19
caffeineVersion=2.7.0 caffeineVersion=2.7.0
metricsVersion=4.1.0 metricsVersion=4.1.0
metricsNewRelicVersion=1.1.1 metricsNewRelicVersion=1.1.1
djvmVersion=1.1-RC02 djvmVersion=1.1-RC03
deterministicRtVersion=1.0-RC02 deterministicRtVersion=1.0-RC02
openSourceBranch=https://github.com/corda/corda/blob/release/os/4.4 openSourceBranch=https://github.com/corda/corda/blob/release/os/4.4
openSourceSamplesBranch=https://github.com/corda/samples/blob/release-V4 openSourceSamplesBranch=https://github.com/corda/samples/blob/release-V4

2
node/src/main/kotlin/net/corda/node/services/transactions/DeterministicVerifierFactoryService.kt
View File

@ -13,7 +13,6 @@ import net.corda.core.serialization.SingletonSerializeAsToken
import net.corda.core.transactions.LedgerTransaction import net.corda.core.transactions.LedgerTransaction
import net.corda.djvm.SandboxConfiguration import net.corda.djvm.SandboxConfiguration
import net.corda.djvm.analysis.AnalysisConfiguration import net.corda.djvm.analysis.AnalysisConfiguration
import net.corda.djvm.analysis.Whitelist
import net.corda.djvm.execution.ExecutionProfile import net.corda.djvm.execution.ExecutionProfile
import net.corda.djvm.rewiring.ByteCode import net.corda.djvm.rewiring.ByteCode
import net.corda.djvm.rewiring.ByteCodeKey import net.corda.djvm.rewiring.ByteCodeKey
@ -39,7 +38,6 @@ class DeterministicVerifierFactoryService(
init { init {
val baseAnalysisConfiguration = AnalysisConfiguration.createRoot( val baseAnalysisConfiguration = AnalysisConfiguration.createRoot(
userSource = cordaSource, userSource = cordaSource,
whitelist = Whitelist.MINIMAL,
visibleAnnotations = setOf( visibleAnnotations = setOf(
CordaSerializable::class.java, CordaSerializable::class.java,
CordaSerializationTransformEnumDefault::class.java, CordaSerializationTransformEnumDefault::class.java,

2
serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/TestBase.kt
View File

@ -10,7 +10,6 @@ import net.corda.core.serialization.DeprecatedConstructorForDeserialization
import net.corda.djvm.SandboxConfiguration import net.corda.djvm.SandboxConfiguration
import net.corda.djvm.SandboxRuntimeContext import net.corda.djvm.SandboxRuntimeContext
import net.corda.djvm.analysis.AnalysisConfiguration import net.corda.djvm.analysis.AnalysisConfiguration
import net.corda.djvm.analysis.Whitelist.Companion.MINIMAL
import net.corda.djvm.messages.Severity import net.corda.djvm.messages.Severity
import net.corda.djvm.messages.Severity.WARNING import net.corda.djvm.messages.Severity.WARNING
import net.corda.djvm.source.BootstrapClassLoader import net.corda.djvm.source.BootstrapClassLoader
@ -52,7 +51,6 @@ abstract class TestBase(type: SandboxType) {
bootstrapClassLoader = BootstrapClassLoader(DETERMINISTIC_RT) bootstrapClassLoader = BootstrapClassLoader(DETERMINISTIC_RT)
val rootConfiguration = AnalysisConfiguration.createRoot( val rootConfiguration = AnalysisConfiguration.createRoot(
userSource = UserPathSource(emptyList()), userSource = UserPathSource(emptyList()),
whitelist = MINIMAL,
visibleAnnotations = setOf( visibleAnnotations = setOf(
CordaSerializable::class.java, CordaSerializable::class.java,
CordaSerializationTransformEnumDefault::class.java, CordaSerializationTransformEnumDefault::class.java,