mirror of
https://github.com/corda/corda.git
synced 2025-01-20 19:49:25 +00:00
Fixed merge issues
This commit is contained in:
parent
24deb5a79c
commit
d4da633b1e
@ -26,10 +26,7 @@ import com.typesafe.config.ConfigFactory
|
|||||||
import joptsimple.OptionParser
|
import joptsimple.OptionParser
|
||||||
import joptsimple.OptionSet
|
import joptsimple.OptionSet
|
||||||
import org.apache.commons.io.IOUtils
|
import org.apache.commons.io.IOUtils
|
||||||
import java.io.DataOutputStream
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.net.HttpURLConnection
|
|
||||||
import java.net.SocketTimeoutException
|
|
||||||
import java.net.URL
|
import java.net.URL
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
@ -37,7 +34,6 @@ import java.nio.file.Paths
|
|||||||
import java.util.*
|
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 com.r3corda.demos.utilities.*
|
import com.r3corda.demos.utilities.*
|
||||||
|
|
||||||
// IRS DEMO
|
// IRS DEMO
|
||||||
@ -423,8 +419,6 @@ private fun runUploadRates(host: HostAndPort) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun getNodeConfig(cliParams: CliParams.RunNode): NodeConfiguration {
|
private fun getNodeConfig(cliParams: CliParams.RunNode): NodeConfiguration {
|
||||||
if (!Files.exists(cliParams.dir)) {
|
if (!Files.exists(cliParams.dir)) {
|
||||||
throw NotSetupException("Missing config directory. Please run node setup before running the node")
|
throw NotSetupException("Missing config directory. Please run node setup before running the node")
|
||||||
|
Loading…
Reference in New Issue
Block a user