fix suspendable issue in FlowTests

Author: anixon604

Features/confidentialidentity-whistleblower/workflows/src/main/java/net/corda/examples/whistleblower/flows/BlowWhistleFlow.java

@@ -83,9 +83,15 @@ public ProgressTracker getProgressTracker() {
     public SignedTransaction call() throws FlowException {
         progressTracker.setCurrentStep(GENERATE_CONFIDENTIAL_IDS);
         FlowSession investigatorSession = initiateFlow(investigator);
-        Pair<AnonymousParty, AnonymousParty> confidentialPairMeAndInvestigator = generateConfidentialIdentities(investigatorSession);
-        AnonymousParty anonymousMe = confidentialPairMeAndInvestigator.getFirst();
-        AnonymousParty anonymousInvestigator = confidentialPairMeAndInvestigator.getSecond();
+
+        /** Generates confidential identities for the whistle-blower and the investigator. */
+        LinkedHashMap<Party, AnonymousParty> confidentialIdentities = subFlow(new SwapIdentitiesFlow(
+                investigatorSession,
+                GENERATE_CONFIDENTIAL_IDS.childProgressTracker()
+        ));
+
+        AnonymousParty anonymousMe = confidentialIdentities.get(getOurIdentity());
+        AnonymousParty anonymousInvestigator = confidentialIdentities.get(investigator);
 
         progressTracker.setCurrentStep(BUILD_TRANSACTION);
         BlowWhistleState output = new BlowWhistleState(badCompany, anonymousMe, anonymousInvestigator);
@@ -111,16 +117,4 @@ public SignedTransaction call() throws FlowException {
         progressTracker.setCurrentStep(FINALISE_TRANSACTION);
         return subFlow(new FinalityFlow(ftx, ImmutableList.of(investigatorSession), FINALISE_TRANSACTION.childProgressTracker()));
     }
-
-    /** Generates confidential identities for the whistle-blower and the investigator. */
-    @Suspendable
-    private Pair<AnonymousParty, AnonymousParty> generateConfidentialIdentities(FlowSession counterpartySession) throws FlowException {
-        LinkedHashMap<Party, AnonymousParty> confidentialIdentities = subFlow(new SwapIdentitiesFlow(
-                counterpartySession,
-                GENERATE_CONFIDENTIAL_IDS.childProgressTracker()
-        ));
-        AnonymousParty anonymousMe = confidentialIdentities.get(getOurIdentity());
-        AnonymousParty anonymousInvestigator = confidentialIdentities.get(counterpartySession.getCounterparty());
-        return new Pair<AnonymousParty, AnonymousParty>(anonymousMe, anonymousInvestigator);
-    }
 }

Features/confidentialidentity-whistleblower/workflows/src/test/java/net/corda/examples/whistleblower/FlowTests.java

@@ -35,7 +35,7 @@ public void setUp() throws Exception {
 
     @After
     public void tearDown() {
-//        network.stopNodes();
+        network.stopNodes();
     }
 
     //simple unit test to check the public keys that used in the transaction