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

Refactoring related to BFT notary demo (#680)

Browse Source 
* Fix: Add missing @StartableByRPC to fix the Raft notary demo
* Make loadConfig take a Config object, for cordformation Node
* Unduplicate User.toMap
* Unduplicate WHITESPACE regex, choose possessive form
* Use slash to make a Path
* Remove Companion where redundant
* Remove unused code
This commit is contained in:
Andrzej Cichocki
2017-05-16 11:30:50 +01:00
committed by GitHub
parent 42d0a3c638
commit d3bb040355
23 changed files with 86 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test-utils/src/main/kotlin/net/corda/testing/node/NodeBasedTest.kt
View File

@ -12,6 +12,8 @@ import net.corda.node.driver.addressMustNotBeBound
import net.corda.node.internal.Node
import net.corda.node.services.config.ConfigHelper
import net.corda.node.services.config.FullNodeConfiguration
import net.corda.node.services.config.configOf
import net.corda.node.services.config.plus
import net.corda.node.services.transactions.RaftValidatingNotaryService
import net.corda.node.utilities.ServiceIdentityGenerator
import net.corda.nodeapi.User
@ -141,18 +143,12 @@ abstract class NodeBasedTest {
val config = ConfigHelper.loadConfig(
baseDirectory = baseDirectory,
allowMissingConfig = true,
configOverrides = mapOf(
configOverrides = configOf(
"myLegalName" to legalName.toString(),
"p2pAddress" to localPort[0].toString(),
"rpcAddress" to localPort[1].toString(),
"extraAdvertisedServiceIds" to advertisedServices.map { it.toString() },
"rpcUsers" to rpcUsers.map {
mapOf(
"username" to it.username,
"password" to it.password,
"permissions" to it.permissions
)
}
"rpcUsers" to rpcUsers.map { it.toMap() }
) + configOverrides
)