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

CORDA-1414: node should continue with parameters from file when network map not available (#3061)

Browse Source 
Fix CORDA-1414

If network map is not available or returns exception on network
parameters reading, node should continue with parameters from file.
This commit is contained in:
Katarzyna Streich
2018-05-04 14:42:10 +01:00
committed by GitHub
parent 907031e840
commit e564303869
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
node/src/main/kotlin/net/corda/node/internal/NetworkParametersReader.kt
View File

@ -10,7 +10,6 @@ import net.corda.nodeapi.internal.network.NETWORK_PARAMS_FILE_NAME
import net.corda.nodeapi.internal.network.NETWORK_PARAMS_UPDATE_FILE_NAME import net.corda.nodeapi.internal.network.NETWORK_PARAMS_UPDATE_FILE_NAME
import net.corda.nodeapi.internal.network.SignedNetworkParameters import net.corda.nodeapi.internal.network.SignedNetworkParameters
import net.corda.nodeapi.internal.network.verifiedNetworkMapCert import net.corda.nodeapi.internal.network.verifiedNetworkMapCert
import java.net.ConnectException
import java.nio.file.Path import java.nio.file.Path
import java.nio.file.StandardCopyOption import java.nio.file.StandardCopyOption
import java.security.cert.X509Certificate import java.security.cert.X509Certificate
@ -29,8 +28,8 @@ class NetworkParametersReader(private val trustRoot: X509Certificate,
private fun retrieveNetworkParameters(): NetworkParameters { private fun retrieveNetworkParameters(): NetworkParameters {
val advertisedParametersHash = try { val advertisedParametersHash = try {
networkMapClient?.getNetworkMap()?.payload?.networkParameterHash networkMapClient?.getNetworkMap()?.payload?.networkParameterHash
} catch (e: ConnectException) { } catch (e: Exception) {
logger.info("Couldn't connect to NetworkMap", e) logger.info("Unable to download network map", e)
// If NetworkMap is down while restarting the node, we should be still able to continue with parameters from file // If NetworkMap is down while restarting the node, we should be still able to continue with parameters from file
null null
} }

14
node/src/test/kotlin/net/corda/node/services/network/NetworkParametersReaderTest.kt
View File

@ -14,6 +14,7 @@ import net.corda.testing.core.SerializationEnvironmentRule
import net.corda.testing.driver.PortAllocation import net.corda.testing.driver.PortAllocation
import net.corda.testing.internal.DEV_ROOT_CA import net.corda.testing.internal.DEV_ROOT_CA
import net.corda.testing.node.internal.network.NetworkMapServer import net.corda.testing.node.internal.network.NetworkMapServer
import org.assertj.core.api.Assertions.assertThat
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule
@ -27,6 +28,7 @@ class NetworkParametersReaderTest {
@JvmField @JvmField
val testSerialization = SerializationEnvironmentRule(true) val testSerialization = SerializationEnvironmentRule(true)
val fs = Jimfs.newFileSystem(Configuration.unix())
private val cacheTimeout = 100000.seconds private val cacheTimeout = 100000.seconds
private lateinit var server: NetworkMapServer private lateinit var server: NetworkMapServer
@ -42,11 +44,11 @@ class NetworkParametersReaderTest {
@After @After
fun tearDown() { fun tearDown() {
server.close() server.close()
fs.close()
} }
@Test @Test
fun `read correct set of parameters from file`() { fun `read correct set of parameters from file`() {
val fs = Jimfs.newFileSystem(Configuration.unix())
val baseDirectory = fs.getPath("/node").createDirectories() val baseDirectory = fs.getPath("/node").createDirectories()
val oldParameters = testNetworkParameters(epoch = 1) val oldParameters = testNetworkParameters(epoch = 1)
NetworkParametersCopier(oldParameters).install(baseDirectory) NetworkParametersCopier(oldParameters).install(baseDirectory)
@ -60,4 +62,14 @@ class NetworkParametersReaderTest {
.verifiedNetworkMapCert(DEV_ROOT_CA.certificate) .verifiedNetworkMapCert(DEV_ROOT_CA.certificate)
assertEquals(server.networkParameters, parametersFromFile) assertEquals(server.networkParameters, parametersFromFile)
} }
@Test
fun `read network parameters from file when network map server is down`() {
server.close()
val baseDirectory = fs.getPath("/node").createDirectories()
val fileParameters = testNetworkParameters(epoch = 1)
NetworkParametersCopier(fileParameters).install(baseDirectory)
val parameters = NetworkParametersReader(DEV_ROOT_CA.certificate, networkMapClient, baseDirectory).networkParameters
assertThat(parameters).isEqualTo(fileParameters)
}
} }