ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 21:17:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Bugfix: register SwapIdentitiesHandler again. (#4789)

Browse Source
This commit is contained in:
Mike Hearn 2019-02-19 19:42:32 +01:00 committed by Tommy Lillehagen
parent 36665e114b
commit 96134c8cfa
6 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/rpc/build.gradle
View File

@ -62,9 +62,6 @@ processSmokeTestResources {
from(project(':finance:contracts').tasks['jar']) {
rename '.*finance-contracts-.*', 'cordapp-finance-contracts.jar'
}
from(project(':confidential-identities').tasks['jar']) {
rename '.*confidential-identities-.*', 'cordapp-confidential-identities.jar'
}
}
// To find potential version conflicts, run "gradle htmlDependencyReport" and then look in
@ -90,7 +87,6 @@ dependencies {
smokeTestCompile project(':smoke-test-utils')
smokeTestCompile project(':finance:contracts')
smokeTestCompile project(':finance:workflows')
smokeTestCompile project(':confidential-identities')
smokeTestCompile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
smokeTestCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
smokeTestCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"

2
node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
View File

@ -4,6 +4,7 @@ import com.codahale.metrics.MetricRegistry
import com.google.common.collect.MutableClassToInstanceMap
import com.google.common.util.concurrent.MoreExecutors
import com.zaxxer.hikari.pool.HikariPool
import net.corda.confidential.SwapIdentitiesFlow
import net.corda.core.CordaException
import net.corda.core.concurrent.CordaFuture
import net.corda.core.context.InvocationContext
@ -684,6 +685,7 @@ abstract class AbstractNode<S>(val configuration: NodeConfiguration,
installFinalityHandler()
flowManager.registerInitiatedCoreFlowFactory(NotaryChangeFlow::class, NotaryChangeHandler::class, ::NotaryChangeHandler)
flowManager.registerInitiatedCoreFlowFactory(ContractUpgradeFlow.Initiate::class, NotaryChangeHandler::class, ::ContractUpgradeHandler)
flowManager.registerInitiatedCoreFlowFactory(SwapIdentitiesFlow::class, SwapIdentitiesHandler::class, ::SwapIdentitiesHandler)
}
// Ideally we should be disabling the FinalityHandler if it's not needed, to prevent any party from submitting transactions to us without

2
node/src/main/kotlin/net/corda/node/internal/SwapIdentitiesHandler.kt
View File

@ -12,7 +12,7 @@ import net.corda.core.internal.warnOnce
* but it is a complex versioning problem because we don't know which peers we might interact with. Disabling it will probably have to be
* gated on a minPlatformVersion bump.
*/
@InitiatedBy(SwapIdentitiesFlow::class)
//@InitiatedBy(SwapIdentitiesFlow::class)
class SwapIdentitiesHandler(private val otherSide: FlowSession) : FlowLogic<Unit>() {
@Suspendable
override fun call() {

4
samples/irs-demo/cordapp/build.gradle
View File

@ -20,7 +20,7 @@ sourceSets {
dependencies {
cordapp project(':finance:contracts')
cordapp project(':finance:workflows')
cordapp project(':confidential-identities')
// Corda integration dependencies
cordaRuntime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
cordaCompile project(':core')
@ -52,7 +52,6 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask])
}
cordapp project(':samples:irs-demo:cordapp:contracts-irs')
cordapp project(':samples:irs-demo:cordapp:workflows-irs')
cordapp project(':confidential-identities')
}
node {
name "O=Notary Service,L=Zurich,C=CH"
@ -111,7 +110,6 @@ task prepareDockerNodes(type: net.corda.plugins.Dockerform, dependsOn: ['jar', n
nodeDefaults{
cordapp project(':samples:irs-demo:cordapp:contracts-irs')
cordapp project(':samples:irs-demo:cordapp:workflows-irs')
cordapp project(':confidential-identities')
}
node {
name "O=Notary Service,L=Zurich,C=CH"

2
samples/simm-valuation-demo/build.gradle
View File

@ -33,7 +33,6 @@ dependencies {
cordapp project(':finance:workflows')
cordapp project(path: ':samples:simm-valuation-demo:contracts-states', configuration: 'shrinkArtifacts')
cordapp project(':samples:simm-valuation-demo:flows')
cordapp project(':confidential-identities')
// Corda integration dependencies
cordaRuntime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
@ -72,7 +71,6 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask,
cordapp project(':finance:workflows')
cordapp project(':samples:simm-valuation-demo:contracts-states')
cordapp project(':samples:simm-valuation-demo:flows')
cordapp project(':confidential-identities')
rpcUsers = [['username': "default", 'password': "default", 'permissions': [ 'ALL' ]]]
}
node {

1
samples/trader-demo/workflows-trader/build.gradle
View File

@ -24,7 +24,6 @@ dependencies {
// The trader demo CorDapp depends upon Cash CorDapp features
cordapp project(':finance:contracts')
cordapp project(':finance:workflows')
cordapp project(':confidential-identities')
cordapp project(':samples:bank-of-corda-demo')
// Corda integration dependencies