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

Fix merge

Browse Source
This commit is contained in:
Oliver Knowles 2018-11-20 16:23:28 +00:00
parent b1982e5b55
commit aa27a51069
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/check-api-changes.sh
View File

@ -12,7 +12,7 @@ if [ ! -f $apiCurrent ]; then
fi
# Remove the two header lines from the diff output.
diffContents=`diff -u $apiCurrent $APIHOME/../build/api/api-corda-*.txt | tail -n +3`
diffContents=`diff --minimal -u $apiCurrent $APIHOME/../build/api/api-corda-*.txt | tail -n +3`
echo "Diff contents:"
echo "$diffContents"
echo

9
experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt
View File

@ -44,6 +44,7 @@ import net.corda.node.services.api.DummyAuditService
import net.corda.node.services.api.MonitoringService
import net.corda.node.services.api.ServiceHubInternal
import net.corda.node.services.api.WritableTransactionStorage
import net.corda.node.services.config.NetworkParameterAcceptanceSettings
import net.corda.node.services.config.NodeConfiguration
import net.corda.node.services.identity.PersistentIdentityService
import net.corda.node.services.keys.PersistentKeyManagementService
@ -417,7 +418,13 @@ class FlowWorkerServiceHub(override val configuration: NodeConfiguration,
val nodeInfoAndSigned = NodeInfoAndSigned(myInfo) { _, serialised ->
ourKeyPair.private.sign(serialised.bytes)
}
networkMapUpdater.start(trustRoot, signedNetworkParameters.signed.raw.hash, nodeInfoAndSigned.signed.raw.hash)
networkMapUpdater.start(
trustRoot,
signedNetworkParameters.signed.raw.hash,
nodeInfoAndSigned.signed,
networkParameters,
keyManagementService,
NetworkParameterAcceptanceSettings())
database.transaction {
identityService.loadIdentities(myInfo.legalIdentitiesAndCerts)

9
experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt
View File

@ -31,6 +31,7 @@ import net.corda.node.services.api.AuditService
import net.corda.node.services.api.MonitoringService
import net.corda.node.services.api.ServiceHubInternal
import net.corda.node.services.api.WritableTransactionStorage
import net.corda.node.services.config.NetworkParameterAcceptanceSettings
import net.corda.node.services.config.NodeConfiguration
import net.corda.node.services.identity.PersistentIdentityService
import net.corda.node.services.keys.PersistentKeyManagementService
@ -254,7 +255,13 @@ class RpcWorkerServiceHub(override val configuration: NodeConfiguration,
}
identityService.ourNames = myInfo.legalIdentities.map { it.name }.toSet()
networkMapUpdater.start(trustRoot, signedNetworkParameters.signed.raw.hash, nodeInfoAndSigned.signed.raw.hash)
networkMapUpdater.start(
trustRoot,
signedNetworkParameters.signed.raw.hash,
nodeInfoAndSigned.signed,
networkParameters,
keyManagementService,
NetworkParameterAcceptanceSettings())
database.transaction {
identityService.loadIdentities(myInfo.legalIdentitiesAndCerts)