From 91cda5f18a5c0529850bf185866ab7ecf1e4e302 Mon Sep 17 00:00:00 2001 From: igor nitto Date: Wed, 21 Mar 2018 14:21:09 +0000 Subject: [PATCH 1/3] Reintroduce accidentally removed RPC addresses print (#2857) [CORDA-1244] --- node/src/main/kotlin/net/corda/node/internal/Node.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/node/src/main/kotlin/net/corda/node/internal/Node.kt b/node/src/main/kotlin/net/corda/node/internal/Node.kt index 8fb3e583d5..4879d5868b 100644 --- a/node/src/main/kotlin/net/corda/node/internal/Node.kt +++ b/node/src/main/kotlin/net/corda/node/internal/Node.kt @@ -173,6 +173,8 @@ open class Node(configuration: NodeConfiguration, printBasicNodeInfo("Advertised P2P messaging addresses", info.addresses.joinToString()) rpcServerAddresses?.let { rpcMessagingClient = RPCMessagingClient(configuration.rpcOptions.sslConfig, it.admin, /*networkParameters.maxMessageSize*/MAX_FILE_SIZE) + printBasicNodeInfo("RPC connection address", it.primary.toString()) + printBasicNodeInfo("RPC admin connection address", it.admin.toString()) } verifierMessagingClient = when (configuration.verifierType) { VerifierType.OutOfProcess -> throw IllegalArgumentException("OutOfProcess verifier not supported") //VerifierMessagingClient(configuration, serverAddress, services.monitoringService.metrics, /*networkParameters.maxMessageSize*/MAX_FILE_SIZE) From 9b981c2755daa182da16233fad8f1659b97c8996 Mon Sep 17 00:00:00 2001 From: Joel Dudley Date: Wed, 21 Mar 2018 15:35:55 +0000 Subject: [PATCH 2/3] Corrects bootstrapper JAR name. --- docs/source/setting-up-a-corda-network.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/setting-up-a-corda-network.rst b/docs/source/setting-up-a-corda-network.rst index 9d6ba6c7f5..2ce2fe2b9c 100644 --- a/docs/source/setting-up-a-corda-network.rst +++ b/docs/source/setting-up-a-corda-network.rst @@ -67,7 +67,7 @@ is the major Corda version and ``Y`` is the minor Corda version. To use it, create a directory containing a node config file, ending in "_node.conf", for each node you want to create. Then run the following command: -``java -jar network-bootstrapper.jar `` +``java -jar network-bootstrapper-corda-X.Y.jar `` For example running the command on a directory containing these files : From 4d15e17027bc6b114be610731c32eb8adbb2fd8f Mon Sep 17 00:00:00 2001 From: Joel Dudley Date: Wed, 21 Mar 2018 15:39:16 +0000 Subject: [PATCH 3/3] Documents TestIdentity in the testing API docs. --- docs/source/api-testing.rst | 51 +++++++++++++++++++ .../tutorial/testdsl/CommercialPaperTest.java | 2 + .../docs/tutorial/testdsl/TutorialTestDSL.kt | 2 + 3 files changed, 55 insertions(+) diff --git a/docs/source/api-testing.rst b/docs/source/api-testing.rst index 4281d32347..d8a2511ccc 100644 --- a/docs/source/api-testing.rst +++ b/docs/source/api-testing.rst @@ -304,6 +304,57 @@ Contract testing The Corda test framework includes the ability to create a test ledger by calling the ``ledger`` function on an implementation of the ``ServiceHub`` interface. +Test identities +^^^^^^^^^^^^^^^ + +You can create dummy identities to use in test transactions using the ``TestIdentity`` class: + +.. container:: codeset + + .. literalinclude:: ../../docs/source/example-code/src/test/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt + :language: kotlin + :start-after: DOCSTART 14 + :end-before: DOCEND 14 + :dedent: 8 + + .. literalinclude:: ../../docs/source/example-code/src/test/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java + :language: java + :start-after: DOCSTART 14 + :end-before: DOCEND 14 + :dedent: 4 + +``TestIdentity`` exposes the following fields and methods: + +.. container:: codeset + + .. sourcecode:: kotlin + + val identityParty: Party = bigCorp.party + val identityName: CordaX500Name = bigCorp.name + val identityPubKey: PublicKey = bigCorp.publicKey + val identityKeyPair: KeyPair = bigCorp.keyPair + val identityPartyAndCertificate: PartyAndCertificate = bigCorp.identity + + .. sourcecode:: java + + Party identityParty = bigCorp.getParty(); + CordaX500Name identityName = bigCorp.getName(); + PublicKey identityPubKey = bigCorp.getPublicKey(); + KeyPair identityKeyPair = bigCorp.getKeyPair(); + PartyAndCertificate identityPartyAndCertificate = bigCorp.getIdentity(); + +You can also create a unique ``TestIdentity`` using the ``fresh`` method: + +.. container:: codeset + + .. sourcecode:: kotlin + + val uniqueTestIdentity: TestIdentity = TestIdentity.fresh("orgName") + + .. sourcecode:: java + + TestIdentity uniqueTestIdentity = TestIdentity.Companion.fresh("orgName"); + MockServices ^^^^^^^^^^^^ diff --git a/docs/source/example-code/src/test/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java b/docs/source/example-code/src/test/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java index 7952b07fbe..07ef61b49e 100644 --- a/docs/source/example-code/src/test/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java +++ b/docs/source/example-code/src/test/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java @@ -27,7 +27,9 @@ import static net.corda.testing.node.NodeTestUtils.transaction; public class CommercialPaperTest { private static final TestIdentity alice = new TestIdentity(ALICE_NAME, 70L); + // DOCSTART 14 private static final TestIdentity bigCorp = new TestIdentity(new CordaX500Name("BigCorp", "New York", "GB")); + // DOCEND 14 private static final TestIdentity bob = new TestIdentity(BOB_NAME, 80L); private static final TestIdentity megaCorp = new TestIdentity(new CordaX500Name("MegaCorp", "London", "GB")); private final byte[] defaultRef = {123}; diff --git a/docs/source/example-code/src/test/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt b/docs/source/example-code/src/test/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt index 4197ffc96e..c114399410 100644 --- a/docs/source/example-code/src/test/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt +++ b/docs/source/example-code/src/test/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt @@ -28,7 +28,9 @@ class CommercialPaperTest { private companion object { val alice = TestIdentity(ALICE_NAME, 70) val bob = TestIdentity(BOB_NAME, 80) + // DOCSTART 14 val bigCorp = TestIdentity((CordaX500Name("BigCorp", "New York", "GB"))) + // DOCEND 14 val dummyNotary = TestIdentity(DUMMY_NOTARY_NAME, 20) val megaCorp = TestIdentity(CordaX500Name("MegaCorp", "London", "GB")) val TEST_TX_TIME: Instant = Instant.parse("2015-04-17T12:00:00.00Z")