update notary selection BM

Author: peterli-r3

BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/IssuePolicy.java

@@ -10,6 +10,7 @@
 import net.corda.core.contracts.*;
 import net.corda.core.crypto.SecureHash;
 import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.identity.Party;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.core.transactions.TransactionBuilder;
@@ -45,7 +46,9 @@ public IssuePolicyInitiator(String networkId, Party careProvider, String insuree
         @Override
         @Suspendable
         public SignedTransaction call() throws FlowException {
-            Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+            // Obtain a reference to a notary we wish to use.
+            /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+            final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
             businessNetworkFullVerification(this.networkId, getOurIdentity(), this.careProvider);
             InsuranceState outputState = new InsuranceState(getOurIdentity(), this.insuree, this.careProvider, networkId, "Initiating Policy");
             BNService bnService = getServiceHub().cordaService(BNService.class);

BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/ActiveMembers.java

@@ -6,6 +6,7 @@
 import net.corda.core.flows.FlowException;
 import net.corda.core.flows.FlowLogic;
 import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.identity.Party;
 
 @StartableByRPC
@@ -20,7 +21,9 @@ public ActiveMembers(UniqueIdentifier membershipId) {
     @Override
     @Suspendable
     public String call() throws FlowException {
-        Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+        // Obtain a reference to a notary we wish to use.
+        /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+        final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
         subFlow(new ActivateMembershipFlow(this.membershipId,notary));
         return "\nMember("+ this.membershipId.toString()+")'s network membership has been activated.";
     }

BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignBNIdentity.java

@@ -6,6 +6,7 @@
 import net.corda.core.flows.FlowException;
 import net.corda.core.flows.FlowLogic;
 import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.identity.Party;
 import net.corda.samples.businessmembership.states.CareProviderIdentity;
 import net.corda.samples.businessmembership.states.InsurerIdentity;
@@ -26,7 +27,9 @@ public AssignBNIdentity(String firmType, UniqueIdentifier membershipId, String b
     @Override
     @Suspendable
     public String call() throws FlowException {
-        Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+        // Obtain a reference to a notary we wish to use.
+        /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+        final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
         if(this.firmType.equals("InsuranceFirm")){
             InsurerIdentity insuranceIdty = new InsurerIdentity(bnIdentity);
             if(!insuranceIdty.isValid()){

BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignOrthodonticsRole.java

@@ -9,6 +9,7 @@
 import net.corda.core.flows.FlowException;
 import net.corda.core.flows.FlowLogic;
 import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.identity.Party;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.samples.businessmembership.states.CareProviderIdentity;
@@ -31,7 +32,9 @@ public AssignOrthodonticsRole(UniqueIdentifier membershipId, String networkId) {
     @Suspendable
     public SignedTransaction call() throws FlowException {
 
-        Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+        // Obtain a reference to a notary we wish to use.
+        /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+        final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
         BNService bnService = getServiceHub().cordaService(BNService.class);
         MembershipState membershipState = bnService.getMembership(membershipId).getState().getData();
         Set<BNRole> roles = new HashSet<>();

BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignPolicyIssuerRole.java

@@ -9,6 +9,7 @@
 import net.corda.core.flows.FlowException;
 import net.corda.core.flows.FlowLogic;
 import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.identity.Party;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.samples.businessmembership.states.InsurerIdentity;
@@ -30,7 +31,9 @@ public AssignPolicyIssuerRole(UniqueIdentifier membershipId, String networkId) {
     @Override
     @Suspendable
     public SignedTransaction call() throws FlowException {
-        Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+        // Obtain a reference to a notary we wish to use.
+        /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+        final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
         BNService bnService = getServiceHub().cordaService(BNService.class);
         MembershipState membershipState = bnService.getMembership(this.membershipId).getState().getData();
         Set<BNRole> roles = new HashSet<>();

BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/CreateNetworkSubGroup.java

@@ -6,6 +6,7 @@
 import net.corda.core.flows.FlowException;
 import net.corda.core.flows.FlowLogic;
 import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.identity.Party;
 
 import java.util.Set;
@@ -26,7 +27,9 @@ public CreateNetworkSubGroup(String networkId, String groupName, Set<UniqueIdent
     @Override
     @Suspendable
     public String call() throws FlowException {
-        Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+        // Obtain a reference to a notary we wish to use.
+        /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+        final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
         UniqueIdentifier groupId = new UniqueIdentifier();
         subFlow(new CreateGroupFlow(this.networkId,groupId,this.groupName,this.groupParticipants,notary));
         String result = "\n "+ this.groupName+ " has created under BN network ("+this.networkId+")"+

BusinessNetworks/insurancebusinessnetwork/workflows/src/test/java/net/corda/samples/businessmembership/FlowTests.java

@@ -3,13 +3,11 @@
 import com.google.common.collect.ImmutableList;
 import net.corda.bn.states.MembershipState;
 import net.corda.core.contracts.StateAndRef;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.node.services.Vault;
 import net.corda.core.node.services.vault.QueryCriteria;
 import net.corda.samples.businessmembership.flows.membershipFlows.CreateNetwork;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,7 +27,9 @@ public void setup() {
                 TestCordapp.findCordapp("net.corda.samples.businessmembership.contracts"),
                 TestCordapp.findCordapp("net.corda.samples.businessmembership.flows"),
                 TestCordapp.findCordapp("net.corda.bn.flows"),
-                TestCordapp.findCordapp("net.corda.bn.states"))));
+                TestCordapp.findCordapp("net.corda.bn.states")))
+                .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
+        );
         a = network.createPartyNode(null);
         b = network.createPartyNode(null);
         network.runNetwork();