ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-07 19:40:25 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-19

Browse Source
This commit is contained in:
r3-build 2023-10-19 11:12:34 +00:00
commit f296a82642
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/kotlin/net/corda/core/flows/LedgerRecoverFlow.kt
View File

@ -36,7 +36,7 @@ data class LedgerRecoveryParameters(
val useAllNetworkNodes: Boolean = false, val useAllNetworkNodes: Boolean = false,
val dryRun: Boolean = false, val dryRun: Boolean = false,
val useTimeWindowNarrowing: Boolean = true, val useTimeWindowNarrowing: Boolean = true,
val verboseLogging: Boolean = true, val verboseLogging: Boolean = false,
val recoveryBatchSize: Int = 1000 val recoveryBatchSize: Int = 1000
) )

4
core/src/main/kotlin/net/corda/core/flows/RecoveryTypes.kt
View File

@ -94,6 +94,10 @@ data class ReceiverDistributionRecord(
) : DistributionRecord() { ) : DistributionRecord() {
override val id: SecureHash override val id: SecureHash
get() = this.txId get() = this.txId
override fun toString(): String {
return "txId: $txId, peerPartyId: $peerPartyId, timestamp: $timestamp, timestampDiscriminator: $timestampDiscriminator, receiverStatesToRecord: $receiverStatesToRecord"
}
} }
@CordaSerializable @CordaSerializable