Add warining message when using old confidential identities

Author: kasiastreich

workflows/src/main/kotlin/com/r3/corda/lib/tokens/workflows/internal/flows/FlowVersionUtilities.kt

@@ -34,13 +34,10 @@ internal const val INITIATING_TOKENS_FLOW = "com.r3.corda.lib.tokens.workflows.f
 @Suspendable
 internal fun FlowLogic<*>.provideKeyVersion(session: FlowSession): AbstractParty {
     val otherFlowVersion = session.getCounterpartyFlowInfo().flowVersion
-    val topLevelName = FlowLogic.currentTopLevel?.let { it::class.java.canonicalName } ?: ""
     // This will work only for initiating flow
     return if (otherFlowVersion == 1) {
-        if (!topLevelName.startsWith(INITIATING_TOKENS_FLOW)) {
-            logger.warn("Your CorDapp is using new confidential identities, but other party flow has version 1. Falling back to old CI." +
-                    "If this is not intended behaviour version your flows with version >= 2")
-        }
+        logger.warn("Your CorDapp is using new confidential identities, but other party flow has version 1. Falling back to old CI." +
+                "If this is not intended behaviour version your flows with version >= 2")
         // Old Confidential Identities case
         subFlow(RequestConfidentialIdentityFlowHandler(session))
     } else {
@@ -52,13 +49,10 @@ internal fun FlowLogic<*>.provideKeyVersion(session: FlowSession): AbstractParty
 @Suspendable
 internal fun FlowLogic<*>.requestKeyVersion(session: FlowSession): AnonymousParty {
     val otherFlowVersion = session.getCounterpartyFlowInfo().flowVersion
-    val topLevelName = FlowLogic.currentTopLevel?.let { it::class.java.canonicalName } ?: ""
     // This will work only for initiating flow
     return if (otherFlowVersion == 1) {
-        if (!topLevelName.startsWith(INITIATING_TOKENS_FLOW)) {
-            logger.warn("Your CorDapp is using new confidential identities, but other party flow has version 1. Falling back to old CI." +
-                    "If this is not intended behaviour version your flows with version >= 2")
-        }
+        logger.warn("Your CorDapp is using new confidential identities, but other party flow has version 1. Falling back to old CI." +
+                "If this is not intended behaviour version your flows with version >= 2")
         // Old Confidential Identities case
         val key = subFlow(RequestConfidentialIdentityFlow(session)).owningKey
         AnonymousParty(key)
@@ -71,13 +65,10 @@ internal fun FlowLogic<*>.requestKeyVersion(session: FlowSession): AnonymousPart
 @Suspendable
 internal fun FlowLogic<*>.syncKeyVersionHandler(session: FlowSession) {
     val otherFlowVersion = session.getCounterpartyFlowInfo().flowVersion
-    val topLevelName = FlowLogic.currentTopLevel?.let { it::class.java.canonicalName } ?: ""
     // This will work only for initiating flow
     if (otherFlowVersion == 1) {
-        if (!topLevelName.startsWith(INITIATING_TOKENS_FLOW)) {
-            logger.warn("Your CorDapp is using new confidential identities, but other party flow has version 1. Falling back to old CI." +
-                    "If this is not intended behaviour version your flows with version >= 2")
-        }
+        logger.warn("Your CorDapp is using new confidential identities, but other party flow has version 1. Falling back to old CI." +
+                "If this is not intended behaviour version your flows with version >= 2")
         // Old Confidential Identities case
         subFlow(IdentitySyncFlow.Receive(session))
     } else {
@@ -89,13 +80,10 @@ internal fun FlowLogic<*>.syncKeyVersionHandler(session: FlowSession) {
 @Suspendable
 internal fun FlowLogic<*>.syncKeyVersion(session: FlowSession, txBuilder: TransactionBuilder) {
     val otherFlowVersion = session.getCounterpartyFlowInfo().flowVersion
-    val topLevelName = FlowLogic.currentTopLevel?.let { it::class.java.canonicalName } ?: ""
     // This will work only for initiating flow
     if (otherFlowVersion == 1) {
-        if (!topLevelName.startsWith(INITIATING_TOKENS_FLOW)) {
-            logger.warn("Your CorDapp is using new confidential identities, but other party flow has version 1. Falling back to old CI." +
-                    "If this is not intended behaviour version your flows with version >= 2")
-        }
+        logger.warn("Your CorDapp is using new confidential identities, but other party flow has version 1. Falling back to old CI." +
+                "If this is not intended behaviour version your flows with version >= 2")
         // Old Confidential Identities case
         subFlow(IdentitySyncFlow.Send(session, txBuilder.toWireTransaction(serviceHub)))
     } else {