mirror of
https://github.com/corda/corda.git
synced 2025-03-11 06:54:04 +00:00
Merge pull request #2271 from corda/aslemmer-fix-irsdemo
Fix non-visible IRS demo bug
This commit is contained in:
Andras Slemmer
GitHub
commit
37e207eaf3
@ -53,6 +53,8 @@ dependencies {
|
||||
testCompile project(':node-driver')
|
||||
testCompile "junit:junit:$junit_version"
|
||||
testCompile "org.assertj:assertj-core:${assertj_version}"
|
||||
|
||||
integrationTestCompile project(path: ":samples:irs-demo:web", configuration: "demoArtifacts")
|
||||
}
|
||||
|
||||
bootRepackage {
|
||||
|
||||
@ -94,6 +94,14 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
|
||||
rpcUsers = ext.rpcUsers
|
||||
useTestClock true
|
||||
}
|
||||
node {
|
||||
name "O=Regulator,L=Moscow,C=RU"
|
||||
p2pPort 10010
|
||||
rpcPort 10011
|
||||
cordapps = ["${project.group}:finance:$corda_release_version"]
|
||||
rpcUsers = ext.rpcUsers
|
||||
useTestClock true
|
||||
}
|
||||
}
|
||||
|
||||
task integrationTest(type: Test, dependsOn: []) {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package net.corda.irs
|
||||
|
||||
import net.corda.core.identity.CordaX500Name
|
||||
import net.corda.core.utilities.getOrThrow
|
||||
import net.corda.testing.core.DUMMY_BANK_A_NAME
|
||||
import net.corda.testing.core.DUMMY_BANK_B_NAME
|
||||
@ -13,7 +14,8 @@ fun main(args: Array<String>) {
|
||||
driver(useTestClock = true, isDebug = true, waitForAllNodesToFinish = true) {
|
||||
val (nodeA, nodeB) = listOf(
|
||||
startNode(providedName = DUMMY_BANK_A_NAME),
|
||||
startNode(providedName = DUMMY_BANK_B_NAME)
|
||||
startNode(providedName = DUMMY_BANK_B_NAME),
|
||||
startNode(providedName = CordaX500Name("Regulator", "Moscow", "RU"))
|
||||
).map { it.getOrThrow() }
|
||||
val controller = defaultNotaryNode.getOrThrow()
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
|
||||
import net.corda.client.jackson.JacksonSupport
|
||||
import net.corda.client.rpc.CordaRPCClient
|
||||
import net.corda.core.contracts.UniqueIdentifier
|
||||
import net.corda.core.identity.CordaX500Name
|
||||
import net.corda.core.identity.Party
|
||||
import net.corda.core.messaging.vaultTrackBy
|
||||
import net.corda.core.toFuture
|
||||
@ -56,7 +57,8 @@ class IRSDemoTest {
|
||||
) {
|
||||
val (nodeA, nodeB) = listOf(
|
||||
startNode(providedName = DUMMY_BANK_A_NAME, rpcUsers = rpcUsers),
|
||||
startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = rpcUsers)
|
||||
startNode(providedName = DUMMY_BANK_B_NAME, rpcUsers = rpcUsers),
|
||||
startNode(providedName = CordaX500Name("Regulator", "Moscow", "RU"))
|
||||
).map { it.getOrThrow() }
|
||||
val controller = defaultNotaryNode.getOrThrow()
|
||||
|
||||
|
||||
@ -1,34 +1,34 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
|
||||
classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}")
|
||||
}
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
|
||||
classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}")
|
||||
}
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.craigburke.client-dependencies' version '1.4.0'
|
||||
id 'com.craigburke.client-dependencies' version '1.4.0'
|
||||
}
|
||||
|
||||
clientDependencies {
|
||||
registry 'realBower', type:'bower', url:'https://registry.bower.io'
|
||||
realBower {
|
||||
"angular"("1.5.8")
|
||||
"jquery"("^3.0.0")
|
||||
"angular-route"("1.5.8")
|
||||
"lodash"("^4.13.1")
|
||||
"angular-fcsa-number"("^1.5.3")
|
||||
"jquery.maskedinput"("^1.4.1")
|
||||
"requirejs"("^2.2.0")
|
||||
"semantic-ui"("^2.2.2", into: "semantic")
|
||||
}
|
||||
registry 'realBower', type:'bower', url:'https://registry.bower.io'
|
||||
realBower {
|
||||
"angular"("1.5.8")
|
||||
"jquery"("^3.0.0")
|
||||
"angular-route"("1.5.8")
|
||||
"lodash"("^4.13.1")
|
||||
"angular-fcsa-number"("^1.5.3")
|
||||
"jquery.maskedinput"("^1.4.1")
|
||||
"requirejs"("^2.2.0")
|
||||
"semantic-ui"("^2.2.2", into: "semantic")
|
||||
}
|
||||
|
||||
// put the JS dependencies into src directory so it can easily be referenced
|
||||
// from HTML files in webapp frontend, useful for testing/development
|
||||
// Note that this dir is added to .gitignore
|
||||
installDir = 'src/main/resources/static/js/bower_components'
|
||||
// put the JS dependencies into src directory so it can easily be referenced
|
||||
// from HTML files in webapp frontend, useful for testing/development
|
||||
// Note that this dir is added to .gitignore
|
||||
installDir = 'src/main/resources/static/js/bower_components'
|
||||
}
|
||||
|
||||
// Spring Boot plugin adds a numerous hardcoded dependencies in the version much lower then Corda expects
|
||||
@ -44,36 +44,49 @@ apply plugin: 'org.springframework.boot'
|
||||
apply plugin: 'project-report'
|
||||
apply plugin: 'application'
|
||||
|
||||
configurations {
|
||||
demoArtifacts.extendsFrom testRuntime
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile('org.springframework.boot:spring-boot-starter-web') {
|
||||
exclude module: "spring-boot-starter-logging"
|
||||
exclude module: "logback-classic"
|
||||
}
|
||||
compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.8.9")
|
||||
compile project(":client:rpc")
|
||||
compile project(":client:jackson")
|
||||
compile project(":test-utils")
|
||||
compile project(path: ":samples:irs-demo:cordapp", configuration: "demoArtifacts")
|
||||
testCompile('org.springframework.boot:spring-boot-starter-test') {
|
||||
exclude module: "spring-boot-starter-logging"
|
||||
exclude module: "logback-classic"
|
||||
}
|
||||
compile('org.springframework.boot:spring-boot-starter-web') {
|
||||
exclude module: "spring-boot-starter-logging"
|
||||
exclude module: "logback-classic"
|
||||
}
|
||||
compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.8.9")
|
||||
compile project(":client:rpc")
|
||||
compile project(":client:jackson")
|
||||
compile project(":test-utils")
|
||||
compile project(path: ":samples:irs-demo:cordapp", configuration: "demoArtifacts")
|
||||
testCompile('org.springframework.boot:spring-boot-starter-test') {
|
||||
exclude module: "spring-boot-starter-logging"
|
||||
exclude module: "logback-classic"
|
||||
}
|
||||
}
|
||||
|
||||
jar {
|
||||
from sourceSets.test.output
|
||||
dependsOn clientInstall
|
||||
from sourceSets.test.output
|
||||
dependsOn clientInstall
|
||||
}
|
||||
|
||||
task deployWebapps(type: Copy, dependsOn: ['jar', 'bootRepackage']) {
|
||||
ext.webappDir = file("build/webapps")
|
||||
ext.webappDir = file("build/webapps")
|
||||
|
||||
from(jar.outputs)
|
||||
from("src/test/resources/scripts/") {
|
||||
filter { it
|
||||
.replace('#JAR_PATH#', jar.archiveName)
|
||||
.replace('#DIR#', ext.webappDir.getAbsolutePath())
|
||||
}
|
||||
}
|
||||
into ext.webappDir
|
||||
from(jar.outputs)
|
||||
from("src/test/resources/scripts/") {
|
||||
filter { it
|
||||
.replace('#JAR_PATH#', jar.archiveName)
|
||||
.replace('#DIR#', ext.webappDir.getAbsolutePath())
|
||||
}
|
||||
}
|
||||
into ext.webappDir
|
||||
}
|
||||
|
||||
task demoJar(type: Jar) {
|
||||
classifier "test"
|
||||
from sourceSets.test.output
|
||||
}
|
||||
|
||||
artifacts {
|
||||
demoArtifacts demoJar
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user