update notary selection TokenSDk

peterli-r3 · peterli-r3 · commit a306e4a6a0c0 · 2021-12-03T17:16:04.000+08:00
diff --git a/Tokens/bikemarket/workflows/src/main/java/net/corda/samples/bikemarket/flows/CreateFrameToken.java b/Tokens/bikemarket/workflows/src/main/java/net/corda/samples/bikemarket/flows/CreateFrameToken.java
@@ -1,6 +1,7 @@
 package net.corda.samples.bikemarket.flows;
 
 import com.r3.corda.lib.tokens.workflows.flows.rpc.CreateEvolvableTokens;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.samples.bikemarket.states.FrameTokenState;
 import net.corda.core.contracts.TransactionState;
 import net.corda.core.contracts.UniqueIdentifier;
@@ -22,13 +23,8 @@ public CreateFrameToken(String frameSerial) {
     public String call() throws FlowException {
 
         // Obtain a reference to a notary we wish to use.
-        /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
-         *  METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
-         *
-         *  * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
-         */
-        final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
-        // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+        /** 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"));
 
         //create non-fungible frame token
         UniqueIdentifier uuid = new UniqueIdentifier();
diff --git a/Tokens/bikemarket/workflows/src/main/java/net/corda/samples/bikemarket/flows/CreateWheelToken.java b/Tokens/bikemarket/workflows/src/main/java/net/corda/samples/bikemarket/flows/CreateWheelToken.java
@@ -1,6 +1,7 @@
 package net.corda.samples.bikemarket.flows;
 
 import com.r3.corda.lib.tokens.workflows.flows.rpc.CreateEvolvableTokens;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.samples.bikemarket.states.WheelsTokenState;
 import net.corda.core.contracts.TransactionState;
 import net.corda.core.contracts.UniqueIdentifier;
@@ -22,13 +23,8 @@ public CreateWheelToken(String wheelsSerial) {
     public String call() throws FlowException {
 
         // Obtain a reference to a notary we wish to use.
-        /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
-         *  METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
-         *
-         *  * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
-         */
-        final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
-        // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+        /** 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"));
 
         //create non-fungible frame token
         UniqueIdentifier uuid = new UniqueIdentifier();
diff --git a/Tokens/bikemarket/workflows/src/main/java/net/corda/samples/bikemarket/flows/TransferBikeTokens.java b/Tokens/bikemarket/workflows/src/main/java/net/corda/samples/bikemarket/flows/TransferBikeTokens.java
@@ -7,6 +7,7 @@
 import com.r3.corda.lib.tokens.workflows.internal.flows.distribution.UpdateDistributionListFlow;
 import com.r3.corda.lib.tokens.workflows.internal.flows.finality.ObserverAwareFinalityFlow;
 import com.r3.corda.lib.tokens.workflows.utilities.NotaryUtilities;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.transactions.TransactionBuilder;
 import net.corda.samples.bikemarket.states.FrameTokenState;
 import net.corda.samples.bikemarket.states.WheelsTokenState;
@@ -61,9 +62,12 @@ public String call() throws FlowException {
             //get the pointer to the wheel
             TokenPointer wheeltokenPointer = wheeltokentype.toPointer(wheeltokentype.getClass());
 
+            // 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"));
 
             FlowSession sellerSession = initiateFlow(holder);
-            TransactionBuilder txBuilder = new TransactionBuilder(NotaryUtilities.getPreferredNotary(getServiceHub()));
+            TransactionBuilder txBuilder = new TransactionBuilder(notary);
             MoveTokensUtilities.addMoveNonFungibleTokens(txBuilder, getServiceHub(), frametokenPointer, holder);
             MoveTokensUtilities.addMoveNonFungibleTokens(txBuilder, getServiceHub(), wheeltokenPointer, holder);
 
diff --git a/Tokens/bikemarket/workflows/src/main/java/net/corda/samples/bikemarket/flows/TransferPartTokens.java b/Tokens/bikemarket/workflows/src/main/java/net/corda/samples/bikemarket/flows/TransferPartTokens.java
@@ -7,6 +7,7 @@
 import com.r3.corda.lib.tokens.workflows.internal.flows.distribution.UpdateDistributionListFlow;
 import com.r3.corda.lib.tokens.workflows.internal.flows.finality.ObserverAwareFinalityFlow;
 import com.r3.corda.lib.tokens.workflows.utilities.NotaryUtilities;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.transactions.TransactionBuilder;
 import net.corda.samples.bikemarket.states.FrameTokenState;
 import net.corda.samples.bikemarket.states.WheelsTokenState;
@@ -57,8 +58,12 @@ public String call() throws FlowException {
                 //get the pointer to the frame
                 TokenPointer frametokenPointer = frametokentype.toPointer(frametokentype.getClass());
 
+                // 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"));
+
                 FlowSession sellerSession = initiateFlow(holder);
-                TransactionBuilder txBuilder = new TransactionBuilder(NotaryUtilities.getPreferredNotary(getServiceHub()));
+                TransactionBuilder txBuilder = new TransactionBuilder(notary);
                 MoveTokensUtilities.addMoveNonFungibleTokens(txBuilder, getServiceHub(), frametokenPointer, holder);
 
                 SignedTransaction ptx = getServiceHub().signInitialTransaction(txBuilder);
diff --git a/Tokens/bikemarket/workflows/src/test/java/net/corda/samples/bikemarket/FlowTests.java b/Tokens/bikemarket/workflows/src/test/java/net/corda/samples/bikemarket/FlowTests.java
@@ -2,17 +2,16 @@
 
 import com.google.common.collect.ImmutableList;
 import net.corda.core.contracts.StateAndRef;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.samples.bikemarket.flows.CreateFrameToken;
 import net.corda.samples.bikemarket.flows.CreateWheelToken;
 import net.corda.samples.bikemarket.states.FrameTokenState;
 import net.corda.samples.bikemarket.states.WheelsTokenState;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import net.corda.testing.node.StartedMockNode;
+
 import java.util.concurrent.Future;
 
 public class FlowTests {
@@ -27,7 +26,9 @@ public void setup() {
                 TestCordapp.findCordapp("net.corda.samples.bikemarket.contracts"),
                 TestCordapp.findCordapp("net.corda.samples.bikemarket.flows"),
                 TestCordapp.findCordapp("com.r3.corda.lib.tokens.contracts"),
-                TestCordapp.findCordapp("com.r3.corda.lib.tokens.workflows"))));
+                TestCordapp.findCordapp("com.r3.corda.lib.tokens.workflows")))
+                .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
+        );
         a = network.createPartyNode(null);
         b = network.createPartyNode(null);
         network.runNetwork();
diff --git a/Tokens/dollartohousetoken/workflows/src/main/java/net/corda/samples/dollartohousetoken/flows/HouseSaleInitiatorFlow.java b/Tokens/dollartohousetoken/workflows/src/main/java/net/corda/samples/dollartohousetoken/flows/HouseSaleInitiatorFlow.java
@@ -2,6 +2,7 @@
 
 import co.paralleluniverse.fibers.Suspendable;
 import com.r3.corda.lib.tokens.workflows.flows.move.MoveTokensUtilities;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.samples.dollartohousetoken.states.HouseState;
 import com.google.common.collect.ImmutableList;
 import com.r3.corda.lib.tokens.contracts.states.FungibleToken;
@@ -39,13 +40,8 @@ public HouseSaleInitiatorFlow(String houseId, Party buyer) {
     public String call() throws FlowException {
 
         // Obtain a reference to a notary we wish to use.
-        /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
-         *  METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
-         *
-         *  * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
-         */
-        final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
-        // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+        /** 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"));
 
         /* Get the UUID from the houseId parameter */
         UUID uuid = UUID.fromString(houseId);
diff --git a/Tokens/dollartohousetoken/workflows/src/main/java/net/corda/samples/dollartohousetoken/flows/HouseTokenCreateAndIssueFlow.java b/Tokens/dollartohousetoken/workflows/src/main/java/net/corda/samples/dollartohousetoken/flows/HouseTokenCreateAndIssueFlow.java
@@ -2,6 +2,7 @@
 
 import co.paralleluniverse.fibers.Suspendable;
 import com.r3.corda.lib.tokens.workflows.utilities.NonFungibleTokenBuilder;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.samples.dollartohousetoken.states.HouseState;
 import com.google.common.collect.ImmutableList;
 import com.r3.corda.lib.tokens.contracts.states.NonFungibleToken;
@@ -49,16 +50,9 @@ public HouseTokenCreateAndIssueFlow(Party owner, Amount<Currency> valuation,
     @Suspendable
     public String call() throws FlowException {
 
-        /* Choose the notary for the transaction */
-
         // Obtain a reference to a notary we wish to use.
-        /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
-         *  METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
-         *
-         *  * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
-         */
-        final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
-        // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+        /** 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"));
 
         /* Get a reference of own identity */
         Party issuer = getOurIdentity();
diff --git a/Tokens/dollartohousetoken/workflows/src/test/java/net/corda/samples/dollartohousetoken/FlowTests.java b/Tokens/dollartohousetoken/workflows/src/test/java/net/corda/samples/dollartohousetoken/FlowTests.java
@@ -4,18 +4,16 @@
 import com.r3.corda.lib.tokens.contracts.states.NonFungibleToken;
 import net.corda.core.contracts.Amount;
 import net.corda.core.contracts.StateAndRef;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.node.NetworkParameters;
 import net.corda.core.node.services.Vault;
 import net.corda.core.node.services.vault.QueryCriteria;
 import net.corda.samples.dollartohousetoken.flows.HouseTokenCreateAndIssueFlow;
 import net.corda.samples.dollartohousetoken.states.HouseState;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import net.corda.testing.node.StartedMockNode;
 
 import java.time.Instant;
 import java.util.Arrays;
@@ -42,7 +40,9 @@ public void setup() {
                 TestCordapp.findCordapp("net.corda.samples.dollartohousetoken.contracts"),
                 TestCordapp.findCordapp("net.corda.samples.dollartohousetoken.flows"),
                 TestCordapp.findCordapp("com.r3.corda.lib.tokens.contracts"),
-                TestCordapp.findCordapp("com.r3.corda.lib.tokens.workflows"))).withNetworkParameters(testNetworkParameters));
+                TestCordapp.findCordapp("com.r3.corda.lib.tokens.workflows"))).withNetworkParameters(testNetworkParameters)
+                .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
+        );
         a = network.createPartyNode(null);
         b = network.createPartyNode(null);
         network.runNetwork();
diff --git a/Tokens/fungiblehousetoken/workflows/src/main/java/net/corda/samples/tokenizedhouse/flows/RealEstateEvolvableFungibleTokenFlow.java b/Tokens/fungiblehousetoken/workflows/src/main/java/net/corda/samples/tokenizedhouse/flows/RealEstateEvolvableFungibleTokenFlow.java
@@ -6,6 +6,7 @@
 import com.r3.corda.lib.tokens.contracts.types.TokenType;
 import com.r3.corda.lib.tokens.workflows.flows.rpc.*;
 import com.r3.corda.lib.tokens.workflows.utilities.FungibleTokenBuilder;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.samples.tokenizedhouse.states.FungibleHouseTokenState;
 import kotlin.Unit;
 import net.corda.core.contracts.*;
@@ -38,14 +39,8 @@ public CreateHouseTokenFlow(String symbol, int valuation) {
         @Suspendable
         public SignedTransaction call() throws FlowException {
             // Obtain a reference to a notary we wish to use.
-            /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
-             *  METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
-             *
-             *  * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
-             */
-            final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
-            // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
-
+            /** 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"));
             //create token type
             FungibleHouseTokenState evolvableTokenType = new FungibleHouseTokenState(valuation, getOurIdentity(),
                     new UniqueIdentifier(), 0, this.symbol);
diff --git a/Tokens/fungiblehousetoken/workflows/src/test/java/net/corda/samples/tokenizedhouse/FlowTests.java b/Tokens/fungiblehousetoken/workflows/src/test/java/net/corda/samples/tokenizedhouse/FlowTests.java
@@ -3,16 +3,14 @@
 import com.google.common.collect.ImmutableList;
 import net.corda.core.contracts.Amount;
 import net.corda.core.contracts.StateAndRef;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.node.NetworkParameters;
 import net.corda.core.node.services.Vault;
 import net.corda.core.node.services.vault.QueryCriteria;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.samples.tokenizedhouse.flows.RealEstateEvolvableFungibleTokenFlow;
 import net.corda.samples.tokenizedhouse.states.FungibleHouseTokenState;
-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;
@@ -39,7 +37,9 @@ public void setup() {
                 TestCordapp.findCordapp("net.corda.samples.tokenizedhouse.contracts"),
                 TestCordapp.findCordapp("net.corda.samples.tokenizedhouse.flows"),
                 TestCordapp.findCordapp("com.r3.corda.lib.tokens.contracts"),
-                TestCordapp.findCordapp("com.r3.corda.lib.tokens.workflows"))).withNetworkParameters(testNetworkParameters));
+                TestCordapp.findCordapp("com.r3.corda.lib.tokens.workflows"))).withNetworkParameters(testNetworkParameters)
+                .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
+        );
         a = network.createPartyNode(null);
         b = network.createPartyNode(null);
         network.runNetwork();
diff --git a/Tokens/spaceships-javaAPIs/workflows/src/main/java/net/corda/samples/spaceships/flows/BuySpaceshipFlows.java b/Tokens/spaceships-javaAPIs/workflows/src/main/java/net/corda/samples/spaceships/flows/BuySpaceshipFlows.java
@@ -16,6 +16,7 @@
 import net.corda.core.contracts.Amount;
 import net.corda.core.contracts.StateAndRef;
 import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.identity.Party;
 import net.corda.core.node.StatesToRecord;
 import net.corda.core.node.services.VaultService;
@@ -58,7 +59,10 @@ public BuySpaceshipInitiator(String shipId, Party seller) {
         @Override
         @SuppressWarnings("unchecked")
         public SignedTransaction call() throws FlowException {
-            Party notary = NotaryUtilities.getPreferredNotary(getServiceHub());
+
+            // 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"));
             FlowSession sellerSession = initiateFlow(seller);
             VaultService vaultService = getServiceHub().getVaultService();
             boolean processSale = false;
diff --git a/Tokens/spaceships-javaAPIs/workflows/src/test/java/net/corda/samples/spaceships/FlowTests.java b/Tokens/spaceships-javaAPIs/workflows/src/test/java/net/corda/samples/spaceships/FlowTests.java
@@ -15,16 +15,14 @@
 import net.corda.core.contracts.Amount;
 import net.corda.core.contracts.StateAndRef;
 import net.corda.core.contracts.TransactionResolutionException;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.core.identity.Party;
 import net.corda.core.node.services.VaultService;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.samples.spaceships.flows.*;
 import net.corda.samples.spaceships.states.SpaceshipTokenType;
 import net.corda.testing.common.internal.ParametersUtilitiesKt;
-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;
@@ -53,6 +51,7 @@ public void setup() {
                         .withNetworkParameters(ParametersUtilitiesKt.testNetworkParameters(
                                 Collections.emptyList(), 4
                         ))
+                        .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
         );
         a = network.createPartyNode(null);
         b = network.createPartyNode(null);
diff --git a/Tokens/tokentofriend/workflows/src/main/java/net/corda/samples/tokentofriend/flows/CreateMyToken.java b/Tokens/tokentofriend/workflows/src/main/java/net/corda/samples/tokentofriend/flows/CreateMyToken.java
@@ -2,6 +2,7 @@
 
 import co.paralleluniverse.fibers.Suspendable;
 import com.r3.corda.lib.tokens.workflows.flows.rpc.CreateEvolvableTokens;
+import net.corda.core.identity.CordaX500Name;
 import net.corda.samples.tokentofriend.states.CustomTokenState;
 import net.corda.core.contracts.TransactionState;
 import net.corda.core.contracts.UniqueIdentifier;
@@ -28,15 +29,9 @@ public CreateMyToken(String myEmail, String recipients, String msg) {
     @Suspendable
     public UniqueIdentifier call() throws FlowException {
 
-        // Obtain a reference from a notary we wish to use.
-        /**
-         *  METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
-         *  METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
-         *
-         *  * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
-         */
-        Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
-        // val notary = serviceHub.networkMapCache.getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")) // METHOD 2
+        // 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 uuid = new UniqueIdentifier();
         CustomTokenState tokenState = new CustomTokenState(myEmail,recipients,msg,getOurIdentity(),0,uuid);
diff --git a/Tokens/tokentofriend/workflows/src/test/java/net/corda/samples/tokentofriend/FlowTests.java b/Tokens/tokentofriend/workflows/src/test/java/net/corda/samples/tokentofriend/FlowTests.java
