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

Minor changes made in ENT which should have been ported over (#3932)

Browse Source
This commit is contained in:
Shams Asari
2018-09-12 11:26:37 +01:00
committed by GitHub
parent f5768348ee
commit ca5d88e65a
28 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/SchemaFields.kt
View File

@ -1,9 +1,9 @@
package net.corda.serialization.internal.carpenter
import jdk.internal.org.objectweb.asm.Opcodes.*
import net.corda.core.DeleteForDJVM
import org.objectweb.asm.ClassWriter
import org.objectweb.asm.MethodVisitor
import org.objectweb.asm.Opcodes.*
import org.objectweb.asm.Type
abstract class Field(val field: Class<out Any?>) {

6
serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt
View File

@ -544,11 +544,11 @@ class EvolvabilityTests {
}
//
// This test uses a NetworkParameters signed set of bytes generated by R3 Corda and
// This test uses a NetworkParameters signed set of bytes generated by Corda Enterprise and
// is here to ensure we can still read them. This test exists because of the break in
// being able to deserialize an object serialized prior to some fixes to the fingerprinter.
//
// The file itself was generated from R3 Corda at commit
// The file itself was generated from Corda Enterprise at commit
// 6a6b6f256 Skip cache invalidation during init() - caches are still null.
//
// To regenerate the file un-ignore the test below this one (regenerate broken network parameters),
@ -565,7 +565,7 @@ class EvolvabilityTests {
//
// filename breakdown
// networkParams - because this is a serialised set of network parameters
// r3corda - generated by R3 Corda instead of Corda
// r3corda - generated by Corda Enterprise instead of Corda
// 6a6b6f256 - Commit sha of the build that generated the file we're testing against
//
val resource = "networkParams.r3corda.6a6b6f256"