From 5c389df127ddebc6b95696caa7d1717fd0f0c952 Mon Sep 17 00:00:00 2001
From: LWogan <lorcan.wogan@r3.com>
Date: Mon, 11 Nov 2024 11:43:51 +0000
Subject: [PATCH] CORE-20867: update to the latest api version. some self
 review updates

---
 .../handlers/events/ExternalEventRetryRequestHandler.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/flow/flow-service/src/main/kotlin/net/corda/flow/pipeline/handlers/events/ExternalEventRetryRequestHandler.kt b/components/flow/flow-service/src/main/kotlin/net/corda/flow/pipeline/handlers/events/ExternalEventRetryRequestHandler.kt
index 69cecdf8d7d..dbd8b6d6b02 100644
--- a/components/flow/flow-service/src/main/kotlin/net/corda/flow/pipeline/handlers/events/ExternalEventRetryRequestHandler.kt
+++ b/components/flow/flow-service/src/main/kotlin/net/corda/flow/pipeline/handlers/events/ExternalEventRetryRequestHandler.kt
@@ -30,7 +30,7 @@ class ExternalEventRetryRequestHandler : FlowEventHandler<ExternalEventRetryRequ
         val now = Instant.now()
         val externalEventRetryRequest = context.inputEventPayload
         var metaData = context.metadata
-        val messagingConfig = context.configs.getConfig(ConfigKeys.MESSAGING_CONFIG)
+        val flowConfig = context.configs.getConfig(ConfigKeys.FLOW_CONFIG)
 
         if (!checkpoint.doesExist) {
             log.debug {
@@ -63,7 +63,7 @@ class ExternalEventRetryRequestHandler : FlowEventHandler<ExternalEventRetryRequ
             val expiryTime = getExpiry(metaData)
             if (expiryTime == null) {
                 //first retry so time to set an expiry
-                metaData = setExpiry(metaData, messagingConfig, now)
+                metaData = setExpiry(metaData, flowConfig, now)
             } else if (retryIsExpired(expiryTime, now)) {
                 //retry timeout is exceeded so fail the flow
                 log.debug {
@@ -97,8 +97,8 @@ class ExternalEventRetryRequestHandler : FlowEventHandler<ExternalEventRetryRequ
         return expiry as Long
     }
 
-    private fun setExpiry(metaData: Metadata?, messagingConfig: SmartConfig, now: Instant): Metadata {
-        val retryTimeout = retryTimeout(messagingConfig) + now.toEpochMilli()
+    private fun setExpiry(metaData: Metadata?, flowConfig: SmartConfig, now: Instant): Metadata {
+        val retryTimeout = retryTimeout(flowConfig) + now.toEpochMilli()
         val newEntry = mapOf(CheckpointMetadataKeys.RETRY_EXPIRY to retryTimeout)
         if (metaData == null) return Metadata(newEntry)
         return Metadata(metaData + newEntry)