From a2560deaf23651ac1fd66ac3e10356275f1dcb44 Mon Sep 17 00:00:00 2001
From: "rick.parker" <rick.parker@r3cev.com>
Date: Fri, 27 Oct 2023 14:22:40 +0100
Subject: [PATCH] Rebase fixes

---
 .../src/main/kotlin/net/corda/core/internal/FetchDataFlow.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/net/corda/core/internal/FetchDataFlow.kt b/core/src/main/kotlin/net/corda/core/internal/FetchDataFlow.kt
index 79017ba94a..3b2ef255ef 100644
--- a/core/src/main/kotlin/net/corda/core/internal/FetchDataFlow.kt
+++ b/core/src/main/kotlin/net/corda/core/internal/FetchDataFlow.kt
@@ -12,6 +12,8 @@ import net.corda.core.flows.MaybeSerializedSignedTransaction
 import net.corda.core.internal.FetchDataFlow.DownloadedVsRequestedDataMismatch
 import net.corda.core.internal.FetchDataFlow.HashNotFound
 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.CordaSerializationTransformEnumDefault
 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}" }
             if (response.size != requests.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()) {
@@ -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) :
         FetchDataFlow<MaybeSerializedSignedTransaction, MaybeSerializedSignedTransaction>(requests, otherSide,
                 if (recoveryMode) DataType.TRANSACTION_RECOVERY else DataType.BATCH_TRANSACTION) {