From 2aa7e1685bc40f80fda721ea1d636eff2d4ae8ed Mon Sep 17 00:00:00 2001
From: Antoine A <>
Date: Fri, 29 Mar 2024 16:49:40 +0100
Subject: Fix tests

---
 nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSetup.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSetup.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSetup.kt
index a2b0934a..725f9d5c 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSetup.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSetup.kt
@@ -205,6 +205,9 @@ class EbicsSetup: CliktCommand("Set up the EBICS subscriber") {
             }
         }
 
+        val clientKeys = loadOrGenerateClientKeys(cfg.clientPrivateKeysPath)
+        var bankKeys = loadBankKeys(cfg.bankPublicKeysPath)
+
         // Check EBICS 3 support
         val versions = HEV(client, cfg)
         logger.debug("HEV: $versions")
@@ -212,7 +215,6 @@ class EbicsSetup: CliktCommand("Set up the EBICS subscriber") {
             throw Exception("EBICS 3 is not supported by your bank")
         }
 
-        val clientKeys = loadOrGenerateClientKeys(cfg.clientPrivateKeysPath)
         // Privs exist.  Upload their pubs
         val keysNotSub = !clientKeys.submitted_ini
         if ((!clientKeys.submitted_ini) || forceKeysResubmission)
@@ -223,7 +225,6 @@ class EbicsSetup: CliktCommand("Set up the EBICS subscriber") {
             doKeysRequestAndUpdateState(cfg, clientKeys, client, HIA)
         
         // Checking if the bank keys exist on disk
-        var bankKeys = loadBankKeys(cfg.bankPublicKeysPath)
         if (bankKeys == null) {
             doKeysRequestAndUpdateState(cfg, clientKeys, client, HPB)
             logger.info("Bank keys stored at ${cfg.bankPublicKeysPath}")
-- 
cgit v1.2.3