Skip to content

Commit

Permalink
ES-1585: Update template so regpack can build successfully
Browse files Browse the repository at this point in the history
  • Loading branch information
tlawson3 committed Dec 13, 2023
1 parent a5c0d6b commit 4c4b898
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 519 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,38 +60,6 @@ class ChatContractCreateCommandTest : ContractTest() {
assertVerifies(transaction)
}

@Test
fun addAttachmentsNotSupported() {
// The following transaction will fail due to the fact that we currently do not support the feature for attachments
// onto transactions for the mock ledger.

// Where a specific piece of test data is used only once, it makes sense to create it within the test
// rather than at a class/parent class level.
val secureHash: SecureHash = object : SecureHash {
override fun getAlgorithm(): String {
return null.toString()
}

override fun toHexString(): String {
return null.toString();
}
}
val exception: Exception = assertThrows(
UnsupportedOperationException::class.java
) {
ledgerService
.createTransactionBuilder()
.addAttachment(secureHash)
.addOutputState(outputChatState)
.addCommand(Create())
.addSignatories(outputChatState.participants)
.toSignedTransaction()
}
val expectedMessage = "This method is not implemented for the mock ledger"
val actualMessage = exception.message
assertTrue(actualMessage!!.contains(expectedMessage))
}

@Test
fun missingCommand() {
// The following test builds a transaction that would fail due to not having a command.
Expand Down
12 changes: 4 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,15 @@ kotlin.code.style=official

# Specify the version of the Corda-API to use.
# This needs to match the version supported by the Corda Cluster the CorDapp will run on.
cordaApiVersion=5.1.0.12-HC03
cordaApiVersion=5.1.0.39

# Specify the version of the notary plugins to use.
# Currently packaged as part of corda-runtime-os, so should be set to a corda-runtime-os version.
cordaNotaryPluginsVersion=5.1.0.0-HC03
cordaNotaryPluginsVersion=5.1.0.0

# Specify the version of the Combined Worker to use
# Currently packaged as part of corda-runtime-os, so should be set to a corda-runtime-os version.
combinedWorkerJarVersion=5.1.0.0-HC03

# Specify the version of the Corda Driver to use for testing
# Currently packaged as part of corda-runtime-os, so should be set to a corda-runtime-os version.
cordaDriverVersion=5.1.0-DRIVER.0-+
combinedWorkerJarVersion=5.1.0.0

# Specify the version of the cordapp-cpb and cordapp-cpk plugins
cordaPluginsVersion=7.0.3
Expand Down Expand Up @@ -58,7 +54,7 @@ mockitoKotlinVersion=4.0.0
mockitoVersion=4.6.1
hamcrestVersion=2.2
assertjVersion = 3.24.1
contractTestingVersion=0.9.1-beta-+
contractTestingVersion=1.0.0-beta-+
jacksonVersion=2.15.2
slf4jVersion=1.7.36

Expand Down
26 changes: 0 additions & 26 deletions workflows/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,32 +61,6 @@ dependencies {
testImplementation "org.hamcrest:hamcrest-library:$hamcrestVersion"
testImplementation "org.assertj:assertj-core:$assertjVersion"
testImplementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion"
testImplementation "net.corda:corda-driver:$cordaDriverVersion"
testRuntimeOnly "net.corda:corda-driver-engine:$cordaDriverVersion"
testRuntimeOnly files(configurations.archives.artifacts.files)
testRuntimeOnly files("${System.getProperty("user.home")}/$cordaBinariesDirectory/notaryServer/notary-plugin-non-validating-server-$cordaNotaryPluginsVersion-package.cpb")
}

tasks.withType(Test).configureEach {
dependsOn(':getNotaryServerCPB')
doFirst {
jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
'--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
'--add-opens', 'java.base/java.nio=ALL-UNNAMED',
'--add-opens', 'java.base/java.time=ALL-UNNAMED',
'--add-opens', 'java.base/java.util=ALL-UNNAMED'

systemProperty 'co.paralleluniverse.fibers.verifyInstrumentation', true
systemProperty 'java.io.tmpdir', buildDir.absolutePath

systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', 'info'
systemProperty 'org.slf4j.simpleLogger.dateTimeFormat', 'yyyy-MM-dd HH:mm:ss:SSS Z'
systemProperty 'org.slf4j.simpleLogger.showDateTime', true
systemProperty 'org.slf4j.simpleLogger.showShortLogName', true
systemProperty 'org.slf4j.simpleLogger.showThreadName', false
systemProperty 'org.slf4j.simpleLogger.logFile', 'System.out'
systemProperty 'org.slf4j.simpleLogger.log.org.apache.aries.spifly.BaseActivator', 'OFF'
}
}

// The CordApp section.
Expand Down
21 changes: 0 additions & 21 deletions workflows/src/test/kotlin/com/r3/developers/JsonSerializers.kt

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 4c4b898

Please sign in to comment.