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

Demo now requires the setup steps if the configuration is not default. Documentation updated to reflect these changes.

Browse Source
This commit is contained in:
Clinton Alexander 2016-06-06 15:23:32 +01:00
parent 7b2214e888
commit 146f274dd0
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/source/running-the-demos.rst
View File

@ -20,6 +20,9 @@ Trader demo
Open two terminals, and in the first run: Open two terminals, and in the first run:
.. note:: If you are planning to use non-default configuration you will need to run with --role=SetupA and --role=SetupB
beforehand with the same parameters you plan to supply to the respective nodes.
**Windows**:: **Windows**::
gradlew.bat & .\build\install\r3prototyping\bin\trader-demo --role=BUYER gradlew.bat & .\build\install\r3prototyping\bin\trader-demo --role=BUYER

33
src/main/kotlin/com/r3corda/demos/IRSDemo.kt
View File

@ -36,6 +36,7 @@ import java.util.*
import kotlin.concurrent.fixedRateTimer import kotlin.concurrent.fixedRateTimer
import kotlin.system.exitProcess import kotlin.system.exitProcess
import org.apache.commons.io.IOUtils import org.apache.commons.io.IOUtils
import java.io.FileNotFoundException
// IRS DEMO // IRS DEMO
// //
@ -77,6 +78,10 @@ private class DemoArgs() {
lateinit var nonOptions: OptionSpec<String> lateinit var nonOptions: OptionSpec<String>
} }
private class NotSetupException: Throwable {
constructor(message: String): super(message) {}
}
fun main(args: Array<String>) { fun main(args: Array<String>) {
val parser = OptionParser() val parser = OptionParser()
val demoArgs = setupArgs(parser) val demoArgs = setupArgs(parser)
@ -133,13 +138,20 @@ fun main(args: Array<String>) {
exitProcess(1) exitProcess(1)
} }
} else { } else {
// If the directories are default assume both will be and ensure all config is created // If these directory and identity file arguments aren't specified then we can assume a default setup and
if(!options.has(demoArgs.dirArg)) { // create everything that is needed without needing to run setup.
if(!options.has(demoArgs.dirArg) && !options.has(demoArgs.fakeTradeWithIdentityFile)) {
createNodeConfig(createNodeAParams()); createNodeConfig(createNodeAParams());
createNodeConfig(createNodeBParams()); createNodeConfig(createNodeBParams());
} }
runNode(configureNodeParams(role, demoArgs, options)) try {
runNode(configureNodeParams(role, demoArgs, options))
} catch (e: NotSetupException) {
println(e.message)
exitProcess(1)
}
exitProcess(0) exitProcess(0)
} }
} }
@ -351,8 +363,21 @@ private fun createNodeConfig(params: NodeParams) : NodeConfiguration {
return config return config
} }
private fun getNodeConfig(params: NodeParams): NodeConfiguration {
if(!Files.exists(params.dir)) {
throw NotSetupException("Missing config directory. Please run node setup before running the node")
}
if(!Files.exists(params.dir.resolve(AbstractNode.PUBLIC_IDENTITY_FILE_NAME))) {
throw NotSetupException("Missing identity file. Please run node setup before running the node")
}
val configFile = params.dir.resolve("config").toFile()
return loadConfigFile(configFile, params.defaultLegalName)
}
private fun startNode(params : NodeParams) : Node { private fun startNode(params : NodeParams) : Node {
val config = createNodeConfig(params) val config = getNodeConfig(params)
val advertisedServices: Set<ServiceType> val advertisedServices: Set<ServiceType>
val myNetAddr = HostAndPort.fromString(params.address).withDefaultPort(Node.DEFAULT_PORT) val myNetAddr = HostAndPort.fromString(params.address).withDefaultPort(Node.DEFAULT_PORT)
val networkMapId = if (params.mapAddress.equals(params.address)) { val networkMapId = if (params.mapAddress.equals(params.address)) {