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

ENT-11267: Introducing VerificationService, which implements VerificationSupport in terms of node-based services

Browse Source
This commit is contained in:
Shams Asari
2023-12-12 15:01:48 +00:00
parent b375c7da21
commit a34932e887
10 changed files with 196 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
node/src/main/kotlin/net/corda/node/internal/cordapp/CordappProviderImpl.kt
View File

@ -27,7 +27,8 @@ open class CordappProviderImpl(val cordappLoader: CordappLoader,
private val attachmentStorage: AttachmentStorage) : SingletonSerializeAsToken(), CordappProviderInternal {
private val contextCache = ConcurrentHashMap<Cordapp, CordappContext>()
private val cordappAttachments = HashBiMap.create<SecureHash, URL>()
private val attachmentFixups = AttachmentFixups()
override val attachmentFixups = AttachmentFixups()
override val appClassLoader: ClassLoader get() = cordappLoader.appClassLoader
@ -99,10 +100,6 @@ open class CordappProviderImpl(val cordappLoader: CordappLoader,
}
}
override fun fixupAttachmentIds(attachmentIds: Collection<AttachmentId>): Set<AttachmentId> {
return attachmentFixups.fixupAttachmentIds(attachmentIds)
}
/**
* Get the current cordapp context for the given CorDapp
*

26
node/src/test/kotlin/net/corda/node/internal/cordapp/CordappProviderImplTests.kt
View File

@ -10,15 +10,15 @@ import net.corda.testing.core.internal.SelfCleaningDir
import net.corda.testing.internal.MockCordappConfigProvider
import net.corda.testing.services.MockAttachmentStorage
import org.assertj.core.api.Assertions.assertThat
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Before
import org.junit.Test
import java.io.File
import java.io.FileOutputStream
import java.lang.IllegalStateException
import java.net.URL
import java.nio.file.Files
import java.util.Arrays.asList
import java.util.jar.JarOutputStream
import java.util.zip.Deflater.NO_COMPRESSION
import java.util.zip.ZipEntry
@ -28,10 +28,10 @@ import kotlin.test.assertFailsWith
class CordappProviderImplTests {
private companion object {
val isolatedJAR: URL = this::class.java.getResource("/isolated.jar")
val isolatedJAR: URL = this::class.java.getResource("/isolated.jar")!!
// TODO: Cordapp name should differ from the JAR name
const val isolatedCordappName = "isolated"
val emptyJAR: URL = this::class.java.getResource("empty.jar")
val emptyJAR: URL = this::class.java.getResource("empty.jar")!!
val validConfig: Config = ConfigFactory.parseString("key=value")
@JvmField
@ -122,7 +122,7 @@ class CordappProviderImplTests {
.writeFixupRules("$ID1 => $ID2, $ID3")
val fixedIDs = with(newCordappProvider(fixupJar.toURI().toURL())) {
start()
fixupAttachmentIds(listOf(ID1))
attachmentFixups.fixupAttachmentIds(listOf(ID1))
}
assertThat(fixedIDs).containsExactly(ID2, ID3)
}
@ -133,7 +133,7 @@ class CordappProviderImplTests {
.writeFixupRules("$ID1 =>")
val fixedIDs = with(newCordappProvider(fixupJar.toURI().toURL())) {
start()
fixupAttachmentIds(listOf(ID1))
attachmentFixups.fixupAttachmentIds(listOf(ID1))
}
assertThat(fixedIDs).isEmpty()
}
@ -187,21 +187,20 @@ class CordappProviderImplTests {
)
val fixedIDs = with(newCordappProvider(fixupJar.toURI().toURL())) {
start()
fixupAttachmentIds(listOf(ID2, ID1))
attachmentFixups.fixupAttachmentIds(listOf(ID2, ID1))
}
assertThat(fixedIDs).containsExactlyInAnyOrder(ID2, ID4)
}
@Test(timeout=300_000)
fun `test an exception is raised when we have two jars with the same hash`() {
SelfCleaningDir().use { file ->
val jarAndSigner = ContractJarTestUtils.makeTestSignedContractJar(file.path, "com.example.MyContract")
val signedJarPath = jarAndSigner.first
val duplicateJarPath = signedJarPath.parent.resolve("duplicate-" + signedJarPath.fileName)
Files.copy(signedJarPath, duplicateJarPath)
val urls = asList(signedJarPath.toUri().toURL(), duplicateJarPath.toUri().toURL())
val urls = listOf(signedJarPath.toUri().toURL(), duplicateJarPath.toUri().toURL())
JarScanningCordappLoader.fromJarUrls(urls, VersionInfo.UNKNOWN).use {
assertFailsWith<DuplicateCordappsInstalledException> {
CordappProviderImpl(it, stubConfigProvider, attachmentStore).apply { start() }
@ -212,11 +211,10 @@ class CordappProviderImplTests {
@Test(timeout=300_000)
fun `test an exception is raised when two jars share a contract`() {
SelfCleaningDir().use { file ->
val jarA = ContractJarTestUtils.makeTestContractJar(file.path, listOf("com.example.MyContract", "com.example.AnotherContractForA"), generateManifest = false, jarFileName = "sampleA.jar")
val jarB = ContractJarTestUtils.makeTestContractJar(file.path, listOf("com.example.MyContract", "com.example.AnotherContractForB"), generateManifest = false, jarFileName = "sampleB.jar")
val urls = asList(jarA.toUri().toURL(), jarB.toUri().toURL())
val urls = listOf(jarA.toUri().toURL(), jarB.toUri().toURL())
JarScanningCordappLoader.fromJarUrls(urls, VersionInfo.UNKNOWN).use {
assertFailsWith<IllegalStateException> {
CordappProviderImpl(it, stubConfigProvider, attachmentStore).apply { start() }
@ -233,8 +231,8 @@ class CordappProviderImplTests {
jar.putNextEntry(fileEntry("META-INF/Corda-Fixups"))
for (line in lines) {
jar.write(line.toByteArray())
jar.write('\r'.toInt())
jar.write('\n'.toInt())
jar.write('\r'.code)
jar.write('\n'.code)
}
}
return this