mirror of
https://github.com/corda/corda.git
synced 2025-06-13 12:48:18 +00:00
Merge OS
This commit is contained in:
@ -99,6 +99,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
|
||||
adminAddress "localhost:10013"
|
||||
}
|
||||
webPort 10004
|
||||
extraConfig = ['h2Settings.address' : 'localhost:10014']
|
||||
cordapps = []
|
||||
}
|
||||
node {
|
||||
@ -109,6 +110,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
|
||||
adminAddress "localhost:10016"
|
||||
}
|
||||
webPort 10007
|
||||
extraConfig = ['h2Settings.address' : 'localhost:10017']
|
||||
cordapps = []
|
||||
rpcUsers = [
|
||||
['username' : "user",
|
||||
|
@ -52,7 +52,6 @@ class CustomVaultQueryTest {
|
||||
mockNet = MockNetwork(threadPerNode = true, cordappPackages = listOf("net.corda.finance", "net.corda.docs", "com.template"))
|
||||
nodeA = mockNet.createPartyNode()
|
||||
nodeB = mockNet.createPartyNode()
|
||||
nodeA.registerInitiatedFlow(TopupIssuerFlow.TopupIssuer::class.java)
|
||||
notary = mockNet.defaultNotaryIdentity
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,6 @@ class WorkflowTransactionBuildTutorialTest {
|
||||
mockNet = MockNetwork(threadPerNode = true, cordappPackages = listOf("net.corda.docs"))
|
||||
aliceNode = mockNet.createPartyNode(ALICE_NAME)
|
||||
bobNode = mockNet.createPartyNode(BOB_NAME)
|
||||
aliceNode.registerInitiatedFlow(RecordCompletionFlow::class.java)
|
||||
alice = aliceNode.services.myInfo.identityFromX500Name(ALICE_NAME)
|
||||
bob = bobNode.services.myInfo.identityFromX500Name(BOB_NAME)
|
||||
}
|
||||
|
Reference in New Issue
Block a user