Merge remote-tracking branch 'open/master' into colljos-merge-171117

This commit is contained in:
josecoll
2017-11-17 15:38:25 +00:00
3 changed files with 13 additions and 5 deletions

View File

@ -169,7 +169,7 @@ class MockNetwork(defaultParameters: MockNetworkParameters = MockNetworkParamete
* @see defaultNotaryNode
*/
val defaultNotaryIdentityAndCert: PartyAndCertificate get() {
return defaultNotaryNode.info.legalIdentitiesAndCerts.singleOrNull() ?: throw IllegalStateException("Default notary has multiple identities")
return defaultNotaryNode.info.legalIdentitiesAndCerts[1] // TODO Resolve once network parameters is merged back in
}
/**