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

Merge branch 'release/os/4.7' into aga/make-recordDependencies-suspendable-4.8

Browse Source
This commit is contained in:
Agnieszka Szczepanska 2021-04-27 15:08:13 +01:00
commit 0b9513ffa3
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/kotlin/net/corda/core/internal/ServiceHubCoreInternal.kt
View File

@ -30,5 +30,6 @@ interface TransactionsResolver {
@Suspendable @Suspendable
fun downloadDependencies(batchMode: Boolean) fun downloadDependencies(batchMode: Boolean)
@Suspendable
fun recordDependencies(usedStatesToRecord: StatesToRecord) fun recordDependencies(usedStatesToRecord: StatesToRecord)
} }

2
docs/build.gradle
View File

@ -43,7 +43,7 @@ task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
includes = ['packages.md'] includes = ['packages.md']
jdkVersion = 8 jdkVersion = 8
externalDocumentationLink { externalDocumentationLink {
url = new URL("http://fasterxml.github.io/jackson-core/javadoc/2.9/") url = new URL("https://fasterxml.github.io/jackson-core/javadoc/2.9/")
} }
externalDocumentationLink { externalDocumentationLink {
url = new URL("https://docs.oracle.com/javafx/2/api/") url = new URL("https://docs.oracle.com/javafx/2/api/")

32
node/src/integration-test/kotlin/net/corda/node/flows/FlowWithClientIdTest.kt
View File

@ -62,7 +62,7 @@ class FlowWithClientIdTest {
} }
@Test(timeout = 300_000) @Test(timeout = 300_000)
fun `start flow with client id permissions`() { fun `start flow with client id permissions - StartFlow`() {
val user = User("TonyStark", "I AM IRONMAN", setOf("StartFlow.net.corda.node.flows.FlowWithClientIdTest\$ResultFlow")) val user = User("TonyStark", "I AM IRONMAN", setOf("StartFlow.net.corda.node.flows.FlowWithClientIdTest\$ResultFlow"))
driver(DriverParameters(startNodesInProcess = true, cordappsForAllNodes = emptySet())) { driver(DriverParameters(startNodesInProcess = true, cordappsForAllNodes = emptySet())) {
val nodeA = startNode(rpcUsers = listOf(user)).getOrThrow() val nodeA = startNode(rpcUsers = listOf(user)).getOrThrow()
@ -75,9 +75,37 @@ class FlowWithClientIdTest {
} }
} }
@Test(timeout = 300_000)
fun `start flow with client id permissions - InvokeRpc-startFlowWithClientId`() {
val user = User("TonyStark", "I AM IRONMAN", setOf("InvokeRpc.startFlowWithClientId"))
driver(DriverParameters(startNodesInProcess = true, cordappsForAllNodes = emptySet())) {
val nodeA = startNode(rpcUsers = listOf(user)).getOrThrow()
nodeA.rpc.startFlowWithClientId(UUID.randomUUID().toString(), ::ResultFlow, 5).returnValue.getOrThrow(20.seconds)
nodeA.rpc.startFlowDynamicWithClientId(
UUID.randomUUID().toString(),
ResultFlow::class.java,
5
).returnValue.getOrThrow(20.seconds)
}
}
@Test(timeout = 300_000)
fun `start flow with client id permissions - InvokeRpc-startFlowDynamicWithClientId`() {
val user = User("TonyStark", "I AM IRONMAN", setOf("InvokeRpc.startFlowDynamicWithClientId"))
driver(DriverParameters(startNodesInProcess = true, cordappsForAllNodes = emptySet())) {
val nodeA = startNode(rpcUsers = listOf(user)).getOrThrow()
nodeA.rpc.startFlowWithClientId(UUID.randomUUID().toString(), ::ResultFlow, 5).returnValue.getOrThrow(20.seconds)
nodeA.rpc.startFlowDynamicWithClientId(
UUID.randomUUID().toString(),
ResultFlow::class.java,
5
).returnValue.getOrThrow(20.seconds)
}
}
@Test(timeout = 300_000) @Test(timeout = 300_000)
fun `start flow with client id without permissions`() { fun `start flow with client id without permissions`() {
val user = User("TonyStark", "I AM IRONMAN", setOf()) val user = User("TonyStark", "I AM IRONMAN", setOf("InvokeRpc.startFlow"))
driver(DriverParameters(startNodesInProcess = true, cordappsForAllNodes = emptySet())) { driver(DriverParameters(startNodesInProcess = true, cordappsForAllNodes = emptySet())) {
val nodeA = startNode(rpcUsers = listOf(user)).getOrThrow() val nodeA = startNode(rpcUsers = listOf(user)).getOrThrow()
assertFailsWith<PermissionException> { assertFailsWith<PermissionException> {

1
node/src/main/kotlin/net/corda/node/services/DbTransactionsResolver.kt
View File

@ -94,6 +94,7 @@ class DbTransactionsResolver(private val flow: ResolveTransactionsFlow) : Transa
logger.debug { "Downloaded ${sortedDependencies?.size} dependencies from remote peer for transactions ${flow.txHashes}" } logger.debug { "Downloaded ${sortedDependencies?.size} dependencies from remote peer for transactions ${flow.txHashes}" }
} }
@Suspendable
override fun recordDependencies(usedStatesToRecord: StatesToRecord) { override fun recordDependencies(usedStatesToRecord: StatesToRecord) {
val sortedDependencies = checkNotNull(this.sortedDependencies) val sortedDependencies = checkNotNull(this.sortedDependencies)
logger.trace { "Recording ${sortedDependencies.size} dependencies for ${flow.txHashes.size} transactions" } logger.trace { "Recording ${sortedDependencies.size} dependencies for ${flow.txHashes.size} transactions" }