From 78500205dfb5fd05161b07e8a97f07b60464c28b Mon Sep 17 00:00:00 2001
From: Ross Nicoll <ross.nicoll@r3.com>
Date: Thu, 21 Sep 2017 11:22:01 +0100
Subject: [PATCH] Move IdentitySyncFlow into confidential-identities (#1583)

---
 .../main/kotlin/net/corda/confidential}/IdentitySyncFlow.kt  | 3 ++-
 .../kotlin/net/corda/confidential}/IdentitySyncFlowTests.kt  | 5 ++++-
 .../main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename {core/src/main/kotlin/net/corda/core/flows => confidential-identities/src/main/kotlin/net/corda/confidential}/IdentitySyncFlow.kt (98%)
 rename {core/src/test/kotlin/net/corda/core/flows => confidential-identities/src/test/kotlin/net/corda/confidential}/IdentitySyncFlowTests.kt (95%)

diff --git a/core/src/main/kotlin/net/corda/core/flows/IdentitySyncFlow.kt b/confidential-identities/src/main/kotlin/net/corda/confidential/IdentitySyncFlow.kt
similarity index 98%
rename from core/src/main/kotlin/net/corda/core/flows/IdentitySyncFlow.kt
rename to confidential-identities/src/main/kotlin/net/corda/confidential/IdentitySyncFlow.kt
index 9e694e42e7..127e93bc3c 100644
--- a/core/src/main/kotlin/net/corda/core/flows/IdentitySyncFlow.kt
+++ b/confidential-identities/src/main/kotlin/net/corda/confidential/IdentitySyncFlow.kt
@@ -1,7 +1,8 @@
-package net.corda.core.flows
+package net.corda.confidential
 
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.ContractState
+import net.corda.core.flows.FlowLogic
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.Party
 import net.corda.core.identity.PartyAndCertificate
diff --git a/core/src/test/kotlin/net/corda/core/flows/IdentitySyncFlowTests.kt b/confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt
similarity index 95%
rename from core/src/test/kotlin/net/corda/core/flows/IdentitySyncFlowTests.kt
rename to confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt
index f75635d418..5d8ca6c4f6 100644
--- a/core/src/test/kotlin/net/corda/core/flows/IdentitySyncFlowTests.kt
+++ b/confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt
@@ -1,6 +1,9 @@
-package net.corda.core.flows
+package net.corda.confidential
 
 import co.paralleluniverse.fibers.Suspendable
+import net.corda.core.flows.FlowLogic
+import net.corda.core.flows.InitiatedBy
+import net.corda.core.flows.InitiatingFlow
 import net.corda.core.identity.Party
 import net.corda.core.transactions.WireTransaction
 import net.corda.core.utilities.OpaqueBytes
diff --git a/finance/src/main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt b/finance/src/main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt
index 991a95d464..fd83370c6f 100644
--- a/finance/src/main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt
+++ b/finance/src/main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt
@@ -1,11 +1,11 @@
 package net.corda.finance.flows
 
 import co.paralleluniverse.fibers.Suspendable
+import net.corda.confidential.IdentitySyncFlow
 import net.corda.core.contracts.*
 import net.corda.core.flows.*
 import net.corda.core.identity.Party
 import net.corda.core.identity.PartyAndCertificate
-import net.corda.core.node.NodeInfo
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.TransactionBuilder