ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 01:42:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7515 from corda/merge-release/os/4.11-release/os/4.12-2023-09-29-9

Browse Source 
ENT-9943: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-29
This commit is contained in:
Rick Parker 2023-10-02 09:25:59 +01:00 committed by GitHub
commit beefe1b417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node/src/integration-test-slow/kotlin/net/corda/node/flows/FinalityFlowErrorHandlingTest.kt
View File

@ -74,7 +74,7 @@ class FinalityFlowErrorHandlingTest : StateMachineErrorHandlingTest() {
alice.rpc.startFlow(::GetFlowTransaction, txId).returnValue.getOrThrow().apply {
assertEquals("V", this.first) // "V" -> VERIFIED
assertEquals(CHARLIE_NAME.hashCode().toLong(), this.second) // peer
assertEquals(SecureHash.sha256(CHARLIE_NAME.toString()).toString(), this.second) // peer
}
}
}
@ -83,9 +83,9 @@ class FinalityFlowErrorHandlingTest : StateMachineErrorHandlingTest() {
// Internal use for testing only!!
@StartableByRPC
class GetFlowTransaction(private val txId: SecureHash) : FlowLogic<Pair<String, Long>>() {
class GetFlowTransaction(private val txId: SecureHash) : FlowLogic<Pair<String, String>>() {
@Suspendable
override fun call(): Pair<String, Long> {
override fun call(): Pair<String, String> {
val transactionStatus = serviceHub.jdbcSession().prepareStatement("select * from node_transactions where tx_id = ?")
.apply { setString(1, txId.toString()) }
.use { ps ->
@ -99,7 +99,7 @@ class GetFlowTransaction(private val txId: SecureHash) : FlowLogic<Pair<String,
.use { ps ->
ps.executeQuery().use { rs ->
rs.next()
rs.getLong(4) // receiverPartyId
rs.getString(4) // receiverPartyId
}
}
return Pair(transactionStatus, receiverPartyId)