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

Rebase fixes

Browse Source
This commit is contained in:
rick.parker 2023-10-27 14:22:40 +01:00
parent e39921616f
commit a2560deaf2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/kotlin/net/corda/core/internal/FetchDataFlow.kt
View File

@ -12,6 +12,8 @@ import net.corda.core.flows.MaybeSerializedSignedTransaction
import net.corda.core.internal.FetchDataFlow.DownloadedVsRequestedDataMismatch import net.corda.core.internal.FetchDataFlow.DownloadedVsRequestedDataMismatch
import net.corda.core.internal.FetchDataFlow.HashNotFound import net.corda.core.internal.FetchDataFlow.HashNotFound
import net.corda.core.node.NetworkParameters import net.corda.core.node.NetworkParameters
import net.corda.core.node.services.SignedTransactionWithStatus
import net.corda.core.node.services.TransactionStatus
import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.CordaSerializable
import net.corda.core.serialization.CordaSerializationTransformEnumDefault import net.corda.core.serialization.CordaSerializationTransformEnumDefault
import net.corda.core.serialization.CordaSerializationTransformEnumDefaults import net.corda.core.serialization.CordaSerializationTransformEnumDefaults
@ -175,7 +177,7 @@ sealed class FetchDataFlow<T : NamedByHash, in W : Any>(
logger.trace { "validateFetchResponse(): Response size = ${response.size}, Request size = ${requests.size}" } logger.trace { "validateFetchResponse(): Response size = ${response.size}, Request size = ${requests.size}" }
if (response.size != requests.size) { if (response.size != requests.size) {
logger.trace { "maybeItems.unwrap: RespType Response.size (${requests.size}) != requests.size (${response.size})" } logger.trace { "maybeItems.unwrap: RespType Response.size (${requests.size}) != requests.size (${response.size})" }
throw FetchDataFlow.DownloadedVsRequestedSizeMismatch(requests.size, response.size) throw DownloadedVsRequestedSizeMismatch(requests.size, response.size)
} }
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {
@ -285,6 +287,7 @@ class FetchTransactionsFlow @JvmOverloads constructor(requests: Set<SecureHash>,
} }
} }
@Suppress("Unused")
class FetchBatchTransactionsFlow(requests: Set<SecureHash>, otherSide: FlowSession, private val recoveryMode: Boolean = false) : class FetchBatchTransactionsFlow(requests: Set<SecureHash>, otherSide: FlowSession, private val recoveryMode: Boolean = false) :
FetchDataFlow<MaybeSerializedSignedTransaction, MaybeSerializedSignedTransaction>(requests, otherSide, FetchDataFlow<MaybeSerializedSignedTransaction, MaybeSerializedSignedTransaction>(requests, otherSide,
if (recoveryMode) DataType.TRANSACTION_RECOVERY else DataType.BATCH_TRANSACTION) { if (recoveryMode) DataType.TRANSACTION_RECOVERY else DataType.BATCH_TRANSACTION) {