Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217

docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java

@@ -6,7 +6,9 @@ import net.corda.core.utilities.OpaqueBytes;
 import net.corda.finance.contracts.ICommercialPaperState;
 import net.corda.finance.contracts.JavaCommercialPaper;
 import net.corda.finance.contracts.asset.Cash;
+import net.corda.node.services.api.IdentityServiceInternal;
 import net.corda.testing.SerializationEnvironmentRule;
+import net.corda.testing.node.MockServices;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -19,11 +21,21 @@ import static net.corda.testing.CoreTestUtils.*;
 import static net.corda.testing.NodeTestUtils.ledger;
 import static net.corda.testing.NodeTestUtils.transaction;
 import static net.corda.testing.TestConstants.*;
+import static org.mockito.Mockito.doReturn;
 
 public class CommercialPaperTest {
     @Rule
     public final SerializationEnvironmentRule testSerialization = new SerializationEnvironmentRule();
     private final OpaqueBytes defaultRef = new OpaqueBytes(new byte[]{123});
+    private final MockServices ledgerServices;
+
+    {
+        IdentityServiceInternal identityService = rigorousMock(IdentityServiceInternal.class);
+        doReturn(getMEGA_CORP()).when(identityService).partyFromKey(getMEGA_CORP_PUBKEY());
+        doReturn(null).when(identityService).partyFromKey(getBIG_CORP_PUBKEY());
+        doReturn(null).when(identityService).partyFromKey(getALICE_PUBKEY());
+        ledgerServices = new MockServices(identityService, getMEGA_CORP().getName());
+    }
 
     // DOCSTART 1
     private ICommercialPaperState getPaper() {
@@ -40,7 +52,7 @@ public class CommercialPaperTest {
     @Test
     public void simpleCP() {
         ICommercialPaperState inState = getPaper();
-        ledger(l -> {
+        ledger(ledgerServices, getDUMMY_NOTARY(), l -> {
             l.transaction(tx -> {
                 tx.attachments(JCP_PROGRAM_ID);
                 tx.input(JCP_PROGRAM_ID, inState);
@@ -55,7 +67,7 @@ public class CommercialPaperTest {
     @Test
     public void simpleCPMove() {
         ICommercialPaperState inState = getPaper();
-        ledger(l -> {
+        ledger(ledgerServices, getDUMMY_NOTARY(), l -> {
             l.transaction(tx -> {
                 tx.input(JCP_PROGRAM_ID, inState);
                 tx.command(getMEGA_CORP_PUBKEY(), new JavaCommercialPaper.Commands.Move());
@@ -71,7 +83,7 @@ public class CommercialPaperTest {
     @Test
     public void simpleCPMoveFails() {
         ICommercialPaperState inState = getPaper();
-        ledger(l -> {
+        ledger(ledgerServices, getDUMMY_NOTARY(), l -> {
             l.transaction(tx -> {
                 tx.input(JCP_PROGRAM_ID, inState);
                 tx.command(getMEGA_CORP_PUBKEY(), new JavaCommercialPaper.Commands.Move());
@@ -87,7 +99,7 @@ public class CommercialPaperTest {
     @Test
     public void simpleCPMoveSuccess() {
         ICommercialPaperState inState = getPaper();
-        ledger(l -> {
+        ledger(ledgerServices, getDUMMY_NOTARY(), l -> {
             l.transaction(tx -> {
                 tx.input(JCP_PROGRAM_ID, inState);
                 tx.command(getMEGA_CORP_PUBKEY(), new JavaCommercialPaper.Commands.Move());
@@ -104,7 +116,7 @@ public class CommercialPaperTest {
     // DOCSTART 6
     @Test
     public void simpleIssuanceWithTweak() {
-        ledger(l -> {
+        ledger(ledgerServices, getDUMMY_NOTARY(), l -> {
             l.transaction(tx -> {
                 tx.output(JCP_PROGRAM_ID, "paper", getPaper()); // Some CP is issued onto the ledger by MegaCorp.
                 tx.attachments(JCP_PROGRAM_ID);
@@ -125,7 +137,7 @@ public class CommercialPaperTest {
     // DOCSTART 7
     @Test
     public void simpleIssuanceWithTweakTopLevelTx() {
-        transaction(tx -> {
+        transaction(ledgerServices, getDUMMY_NOTARY(), tx -> {
             tx.output(JCP_PROGRAM_ID, "paper", getPaper()); // Some CP is issued onto the ledger by MegaCorp.
             tx.attachments(JCP_PROGRAM_ID);
             tx.tweak(tw -> {
@@ -144,7 +156,7 @@ public class CommercialPaperTest {
     @Test
     public void chainCommercialPaper() {
         PartyAndReference issuer = getMEGA_CORP().ref(defaultRef);
-        ledger(l -> {
+        ledger(ledgerServices, getDUMMY_NOTARY(), l -> {
             l.unverifiedTransaction(tx -> {
                 tx.output(Cash.PROGRAM_ID, "alice's $900",
                         new Cash.State(issuedBy(DOLLARS(900), issuer), getALICE()));
@@ -180,7 +192,7 @@ public class CommercialPaperTest {
     @Test
     public void chainCommercialPaperDoubleSpend() {
         PartyAndReference issuer = getMEGA_CORP().ref(defaultRef);
-        ledger(l -> {
+        ledger(ledgerServices, getDUMMY_NOTARY(), l -> {
             l.unverifiedTransaction(tx -> {
                 tx.output(Cash.PROGRAM_ID, "alice's $900",
                         new Cash.State(issuedBy(DOLLARS(900), issuer), getALICE()));
@@ -226,7 +238,7 @@ public class CommercialPaperTest {
     @Test
     public void chainCommercialPaperTweak() {
         PartyAndReference issuer = getMEGA_CORP().ref(defaultRef);
-        ledger(l -> {
+        ledger(ledgerServices, getDUMMY_NOTARY(), l -> {
             l.unverifiedTransaction(tx -> {
                 tx.output(Cash.PROGRAM_ID, "alice's $900",
                         new Cash.State(issuedBy(DOLLARS(900), issuer), getALICE()));

docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt

@@ -1,5 +1,7 @@
 package net.corda.docs.tutorial.testdsl
 
+import com.nhaarman.mockito_kotlin.doReturn
+import com.nhaarman.mockito_kotlin.whenever
 import net.corda.core.utilities.days
 import net.corda.finance.DOLLARS
 import net.corda.finance.`issued by`
@@ -8,7 +10,9 @@ import net.corda.finance.contracts.CommercialPaper
 import net.corda.finance.contracts.ICommercialPaperState
 import net.corda.finance.contracts.asset.CASH
 import net.corda.finance.contracts.asset.Cash
+import net.corda.node.services.api.IdentityServiceInternal
 import net.corda.testing.*
+import net.corda.testing.node.MockServices
 import org.junit.Rule
 import org.junit.Test
 
@@ -16,6 +20,11 @@ class CommercialPaperTest {
     @Rule
     @JvmField
     val testSerialization = SerializationEnvironmentRule()
+    private val ledgerServices = MockServices(rigorousMock<IdentityServiceInternal>().also {
+        doReturn(MEGA_CORP).whenever(it).partyFromKey(MEGA_CORP_PUBKEY)
+        doReturn(null).whenever(it).partyFromKey(BIG_CORP_PUBKEY)
+        doReturn(null).whenever(it).partyFromKey(ALICE_PUBKEY)
+    }, MEGA_CORP.name)
 
     // DOCSTART 1
     fun getPaper(): ICommercialPaperState = CommercialPaper.State(
@@ -30,7 +39,7 @@ class CommercialPaperTest {
     @Test
     fun simpleCP() {
         val inState = getPaper()
-        ledger {
+        ledgerServices.ledger(DUMMY_NOTARY) {
             transaction {
                 attachments(CP_PROGRAM_ID)
                 input(CP_PROGRAM_ID, inState)
@@ -44,7 +53,7 @@ class CommercialPaperTest {
     @Test
     fun simpleCPMove() {
         val inState = getPaper()
-        ledger {
+        ledgerServices.ledger(DUMMY_NOTARY) {
             transaction {
                 input(CP_PROGRAM_ID, inState)
                 command(MEGA_CORP_PUBKEY, CommercialPaper.Commands.Move())
@@ -59,7 +68,7 @@ class CommercialPaperTest {
     @Test
     fun simpleCPMoveFails() {
         val inState = getPaper()
-        ledger {
+        ledgerServices.ledger(DUMMY_NOTARY) {
             transaction {
                 input(CP_PROGRAM_ID, inState)
                 command(MEGA_CORP_PUBKEY, CommercialPaper.Commands.Move())
@@ -74,7 +83,7 @@ class CommercialPaperTest {
     @Test
     fun simpleCPMoveSuccess() {
         val inState = getPaper()
-        ledger {
+        ledgerServices.ledger(DUMMY_NOTARY) {
             transaction {
                 input(CP_PROGRAM_ID, inState)
                 command(MEGA_CORP_PUBKEY, CommercialPaper.Commands.Move())
@@ -90,7 +99,7 @@ class CommercialPaperTest {
     // DOCSTART 6
     @Test
     fun `simple issuance with tweak`() {
-        ledger {
+        ledgerServices.ledger(DUMMY_NOTARY) {
             transaction {
                 output(CP_PROGRAM_ID, "paper", getPaper()) // Some CP is issued onto the ledger by MegaCorp.
                 attachments(CP_PROGRAM_ID)
@@ -111,7 +120,7 @@ class CommercialPaperTest {
     // DOCSTART 7
     @Test
     fun `simple issuance with tweak and top level transaction`() {
-        transaction {
+        ledgerServices.transaction(DUMMY_NOTARY) {
             output(CP_PROGRAM_ID, "paper", getPaper()) // Some CP is issued onto the ledger by MegaCorp.
             attachments(CP_PROGRAM_ID)
             tweak {
@@ -131,8 +140,7 @@ class CommercialPaperTest {
     @Test
     fun `chain commercial paper`() {
         val issuer = MEGA_CORP.ref(123)
-
-        ledger {
+        ledgerServices.ledger(DUMMY_NOTARY) {
             unverifiedTransaction {
                 attachments(Cash.PROGRAM_ID)
                 output(Cash.PROGRAM_ID, "alice's $900", 900.DOLLARS.CASH issuedBy issuer ownedBy ALICE)
@@ -165,7 +173,7 @@ class CommercialPaperTest {
     @Test
     fun `chain commercial paper double spend`() {
         val issuer = MEGA_CORP.ref(123)
-        ledger {
+        ledgerServices.ledger(DUMMY_NOTARY) {
             unverifiedTransaction {
                 attachments(Cash.PROGRAM_ID)
                 output(Cash.PROGRAM_ID, "alice's $900", 900.DOLLARS.CASH issuedBy issuer ownedBy ALICE)
@@ -207,7 +215,7 @@ class CommercialPaperTest {
     @Test
     fun `chain commercial tweak`() {
         val issuer = MEGA_CORP.ref(123)
-        ledger {
+        ledgerServices.ledger(DUMMY_NOTARY) {
             unverifiedTransaction {
                 attachments(Cash.PROGRAM_ID)
                 output(Cash.PROGRAM_ID, "alice's $900", 900.DOLLARS.CASH issuedBy issuer ownedBy ALICE)

docs/source/example-code/src/main/resources/example-node.conf

@@ -10,14 +10,9 @@ dataSourceProperties : {
 p2pAddress : "my-corda-node:10002"
 rpcAddress : "my-corda-node:10003"
 webAddress : "localhost:10004"
-networkMapService : {
-    address : "my-network-map:10000"
-    legalName : "O=Network Map Service,OU=corda,L=London,C=GB"
-}
 useHTTPS : false
 rpcUsers : [
     { username=user1, password=letmein, permissions=[ StartProtocol.net.corda.protocols.CashProtocol ] }
 ]
 devMode : true
-// Certificate signing service will be hosted by R3 in the near future.
-//certificateSigningService : "https://testnet.certificate.corda.net"
+// certificateSigningService : "https://testnet.certificate.corda.net"