Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb

docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt

@@ -18,10 +18,10 @@ import net.corda.node.services.Permissions.Companion.startFlow
 import net.corda.testing.core.*
 import net.corda.testing.driver.DriverParameters
 import net.corda.testing.driver.driver
-import net.corda.testing.node.User
 import net.corda.testing.internal.IntegrationTest
 import net.corda.testing.internal.IntegrationTestSchemas
 import net.corda.testing.internal.toDatabaseSchemaName
+import net.corda.testing.node.User
 import org.junit.ClassRule
 import org.junit.Test
 import kotlin.test.assertEquals

docs/source/example-code/src/main/java/net/corda/docs/FlowCookbookJava.java

@@ -540,12 +540,21 @@ public class FlowCookbookJava {
                 // DOCEND 35
 
                 // If the transaction is only partially signed, we have to pass in
-                // a list of the public keys corresponding to the missing
+                // a vararg of the public keys corresponding to the missing
                 // signatures, explicitly telling the system not to check them.
                 // DOCSTART 36
                 onceSignedTx.verifySignaturesExcept(counterpartyPubKey);
                 // DOCEND 36
 
+                // There is also an overload of ``verifySignaturesExcept`` which accepts
+                // a ``Collection`` of the public keys corresponding to the missing
+                // signatures. In the example below, we could also use
+                // ``Arrays.asList(counterpartyPubKey)`` instead of
+                // ``Collections.singletonList(counterpartyPubKey)``.
+                // DOCSTART 54
+                onceSignedTx.verifySignaturesExcept(Collections.singletonList(counterpartyPubKey));
+                // DOCEND 54
+
                 // We can also choose to only check the signatures that are
                 // present. BE VERY CAREFUL - this function provides no guarantees
                 // that the signatures are correct, or that none are missing.

docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt

@@ -522,12 +522,19 @@ class InitiatorFlow(val arg1: Boolean, val arg2: Int, private val counterparty:
         // DOCEND 35
 
         // If the transaction is only partially signed, we have to pass in
-        // a list of the public keys corresponding to the missing
+        // a vararg of the public keys corresponding to the missing
         // signatures, explicitly telling the system not to check them.
         // DOCSTART 36
         onceSignedTx.verifySignaturesExcept(counterpartyPubKey)
         // DOCEND 36
 
+        // There is also an overload of ``verifySignaturesExcept`` which accepts
+        // a ``Collection`` of the public keys corresponding to the missing
+        // signatures.
+        // DOCSTART 54
+        onceSignedTx.verifySignaturesExcept(listOf(counterpartyPubKey))
+        // DOCEND 54
+
         // We can also choose to only check the signatures that are
         // present. BE VERY CAREFUL - this function provides no guarantees
         // that the signatures are correct, or that none are missing.

docs/source/example-code/src/test/kotlin/net/corda/docs/CustomVaultQueryTest.kt

@@ -74,16 +74,14 @@ class CustomVaultQueryTest {
 
     private fun getBalances(): Pair<Map<Currency, Amount<Currency>>, Map<Currency, Amount<Currency>>> {
         // Print out the balances
-        val balancesNodesA =
-            nodeA.database.transaction {
-                nodeA.services.getCashBalances()
-            }
+        val balancesNodesA = nodeA.transaction {
+            nodeA.services.getCashBalances()
+        }
         println("BalanceA\n" + balancesNodesA)
 
-        val balancesNodesB =
-            nodeB.database.transaction {
-                nodeB.services.getCashBalances()
-            }
+        val balancesNodesB = nodeB.transaction {
+            nodeB.services.getCashBalances()
+        }
         println("BalanceB\n" + balancesNodesB)
 
         return Pair(balancesNodesA, balancesNodesB)

docs/source/example-code/src/test/kotlin/net/corda/docs/FxTransactionBuildTutorialTest.kt

@@ -68,13 +68,14 @@ class FxTransactionBuildTutorialTest {
         doIt.getOrThrow()
         // Get the balances when the vault updates
         nodeAVaultUpdate.get()
-        val balancesA = nodeA.database.transaction {
+        val balancesA = nodeA.transaction {
             nodeA.services.getCashBalances()
         }
         nodeBVaultUpdate.get()
-        val balancesB = nodeB.database.transaction {
+        val balancesB = nodeB.transaction {
             nodeB.services.getCashBalances()
         }
+
         println("BalanceA\n" + balancesA)
         println("BalanceB\n" + balancesB)
         // Verify the transfers occurred as expected
@@ -86,10 +87,10 @@ class FxTransactionBuildTutorialTest {
 
     private fun printBalances() {
         // Print out the balances
-        nodeA.database.transaction {
+        nodeA.transaction {
             println("BalanceA\n" + nodeA.services.getCashBalances())
         }
-        nodeB.database.transaction {
+        nodeB.transaction {
             println("BalanceB\n" + nodeB.services.getCashBalances())
         }
     }

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

@@ -38,11 +38,11 @@ class CommercialPaperTest {
     @Rule
     @JvmField
     val testSerialization = SerializationEnvironmentRule()
-    private val ledgerServices = MockServices(emptyList(), rigorousMock<IdentityService>().also {
+    private val ledgerServices = MockServices(emptyList(), MEGA_CORP.name, rigorousMock<IdentityService>().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(