move back into test-utils

shaoyangdd · Jan 4, 2019 · e98dbcc · e98dbcc
1 parent c507326
commit e98dbcc
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 40 deletions.
diff --git a/build.gradle b/build.gradle
@@ -366,7 +366,6 @@ bintrayConfig {
             'corda-finance',    // maintained for backwards compatibility only
             'corda-finance-workflows',
             'corda-finance-contracts',
-            'corda-finance-test-contracts',
             'corda-node',
             'corda-node-api',
             'corda-test-common',

diff --git a/finance/test-contracts/build.gradle b/finance/test-contracts/build.gradle
diff --git a/node/build.gradle b/node/build.gradle
@@ -185,7 +185,7 @@ dependencies {
     compile "com.palominolabs.metrics:metrics-new-relic:${metrics_new_relic_version}"
 
     testCompile(project(':test-cli'))
-    testCompile(project(':finance:test-contracts'))
+    testCompile(project(':test-utils'))
 }
 
 tasks.withType(JavaCompile) {

diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,6 @@ include 'confidential-identities'
 include 'finance'   // maintained for backwards compatibility only
 include 'finance:contracts'
 include 'finance:workflows'
-include 'finance:test-contracts'
 include 'isolated'
 include 'core'
 include 'docs'

diff --git a/testing/test-utils/build.gradle b/testing/test-utils/build.gradle
@@ -26,6 +26,7 @@ dependencies {
 
     // OkHTTP: Simple HTTP library.
     compile "com.squareup.okhttp3:okhttp:$okhttp_version"
+    compile project(':confidential-identities') 
 }
 
 jar {

diff --git a/.../corda/finance/test/SampleCashSchemaV1.kt → .../corda/finance/test/SampleCashSchemaV1.kt b/.../corda/finance/test/SampleCashSchemaV1.kt → .../corda/finance/test/SampleCashSchemaV1.kt
diff --git a/.../corda/finance/test/SampleCashSchemaV2.kt → .../corda/finance/test/SampleCashSchemaV2.kt b/.../corda/finance/test/SampleCashSchemaV2.kt → .../corda/finance/test/SampleCashSchemaV2.kt
diff --git a/.../corda/finance/test/SampleCashSchemaV3.kt → .../corda/finance/test/SampleCashSchemaV3.kt b/.../corda/finance/test/SampleCashSchemaV3.kt → .../corda/finance/test/SampleCashSchemaV3.kt
diff --git a/...nce/test/SampleCommercialPaperSchemaV1.kt → ...nce/test/SampleCommercialPaperSchemaV1.kt b/...nce/test/SampleCommercialPaperSchemaV1.kt → ...nce/test/SampleCommercialPaperSchemaV1.kt
diff --git a/...nce/test/SampleCommercialPaperSchemaV2.kt → ...nce/test/SampleCommercialPaperSchemaV2.kt b/...nce/test/SampleCommercialPaperSchemaV2.kt → ...nce/test/SampleCommercialPaperSchemaV2.kt
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ dependencies { @@
         // OkHTTP: Simple HTTP library.
         compile "com.squareup.okhttp3:okhttp:$okhttp_version"
+        compile project(':confidential-identities')
     }
     jar {
@@ Expand Down @@