ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-18 15:18:16 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41

Browse Source 
# Conflicts:
#	client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
This commit is contained in:
sollecitom
2018-03-19 15:17:49 +00:00
parent a26c5c1483 8591ae2dc9
commit 8a561cddbf
43 changed files with 783 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
network-management/src/test/kotlin/com/r3/corda/networkmanage/common/persistence/PersistentCertificateRevocationRequestStorageTest.kt
View File

@ -96,7 +96,7 @@ class PersistentCertificateRevocationRequestStorageTest : TestBase() {
}
@Test
fun `Certificate revocation request is not persisted if a valid certificate cannot be found`() {
fun `revocation request fails if a valid certificate cannot be found`() {
// given
// then

2
network-management/src/test/kotlin/com/r3/corda/networkmanage/common/persistence/PersistentNetworkMapStorageTest.kt
View File

@ -55,7 +55,7 @@ class PersistentNetworkMapStorageTest : TestBase() {
}
@Test
fun `saveNetworkParameters and then saveNewActiveNetworkMap creates the active network map`() {
fun `create active network map`() {
// given
// Create node info.
val (signedNodeInfo) = createValidSignedNodeInfo("Test", requestStorage)