From 31871007bfb4e64e3253093c95f19bae08e44a68 Mon Sep 17 00:00:00 2001
From: Luke Nadur <19835357+intricate@users.noreply.github.com>
Date: Thu, 5 Nov 2020 12:40:17 -0500
Subject: [PATCH] Adjust existing tests for new Bech32 key output

---
 cardano-cli/test/Test/Golden/Shelley/Address/KeyGen.hs     | 7 ++-----
 cardano-cli/test/Test/Golden/Shelley/Node/KeyGen.hs        | 6 ++----
 cardano-cli/test/Test/Golden/Shelley/Node/KeyGenKes.hs     | 7 ++-----
 cardano-cli/test/Test/Golden/Shelley/Node/KeyGenVrf.hs     | 7 ++-----
 .../test/Test/Golden/Shelley/StakeAddress/KeyGen.hs        | 7 ++-----
 5 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/cardano-cli/test/Test/Golden/Shelley/Address/KeyGen.hs b/cardano-cli/test/Test/Golden/Shelley/Address/KeyGen.hs
index 98a86ec8bb4..ccac95cf687 100644
--- a/cardano-cli/test/Test/Golden/Shelley/Address/KeyGen.hs
+++ b/cardano-cli/test/Test/Golden/Shelley/Address/KeyGen.hs
@@ -27,8 +27,5 @@ golden_shelleyAddressKeyGen = propertyOnce . H.moduleWorkspace "tmp" $ \tempDir
   void $ H.readFile addressVKeyFile
   void $ H.readFile addressSKeyFile
 
-  H.assertFileOccurences 1 "PaymentVerificationKeyShelley" addressVKeyFile
-  H.assertFileOccurences 1 "PaymentSigningKeyShelley_ed25519" addressSKeyFile
-
-  H.assertEndsWithSingleNewline addressVKeyFile
-  H.assertEndsWithSingleNewline addressSKeyFile
+  H.assertFileOccurences 1 "addr_vk" addressVKeyFile
+  H.assertFileOccurences 1 "addr_sk" addressSKeyFile
diff --git a/cardano-cli/test/Test/Golden/Shelley/Node/KeyGen.hs b/cardano-cli/test/Test/Golden/Shelley/Node/KeyGen.hs
index 202bf84a8fa..cf4423e2966 100644
--- a/cardano-cli/test/Test/Golden/Shelley/Node/KeyGen.hs
+++ b/cardano-cli/test/Test/Golden/Shelley/Node/KeyGen.hs
@@ -26,10 +26,8 @@ golden_shelleyNodeKeyGen = propertyOnce . H.moduleWorkspace "tmp" $ \tempDir ->
     , "--operational-certificate-issue-counter", opCertCounterFile
     ]
 
-  H.assertFileOccurences 1 "StakePoolVerificationKey_ed25519" verificationKeyFile
-  H.assertFileOccurences 1 "StakePoolSigningKey_ed25519" signingKeyFile
+  H.assertFileOccurences 1 "pool_vk" verificationKeyFile
+  H.assertFileOccurences 1 "pool_sk" signingKeyFile
   H.assertFileOccurences 1 "NodeOperationalCertificateIssueCounter" opCertCounterFile
 
-  H.assertEndsWithSingleNewline verificationKeyFile
-  H.assertEndsWithSingleNewline signingKeyFile
   H.assertEndsWithSingleNewline opCertCounterFile
diff --git a/cardano-cli/test/Test/Golden/Shelley/Node/KeyGenKes.hs b/cardano-cli/test/Test/Golden/Shelley/Node/KeyGenKes.hs
index 905ed447b20..4c4439b2c13 100644
--- a/cardano-cli/test/Test/Golden/Shelley/Node/KeyGenKes.hs
+++ b/cardano-cli/test/Test/Golden/Shelley/Node/KeyGenKes.hs
@@ -24,8 +24,5 @@ golden_shelleyNodeKeyGenKes = propertyOnce . H.moduleWorkspace "tmp" $ \tempDir
     , "--signing-key-file", signingKey
     ]
 
-  H.assertFileOccurences 1 "KesVerificationKey_ed25519_kes_2^6" verificationKey
-  H.assertFileOccurences 1 "KesSigningKey_ed25519_kes_2^6" signingKey
-
-  H.assertEndsWithSingleNewline verificationKey
-  H.assertEndsWithSingleNewline signingKey
+  H.assertFileOccurences 1 "kes_vk" verificationKey
+  H.assertFileOccurences 1 "kes_sk" signingKey
diff --git a/cardano-cli/test/Test/Golden/Shelley/Node/KeyGenVrf.hs b/cardano-cli/test/Test/Golden/Shelley/Node/KeyGenVrf.hs
index 3bfdb2f2aed..a55f0215728 100644
--- a/cardano-cli/test/Test/Golden/Shelley/Node/KeyGenVrf.hs
+++ b/cardano-cli/test/Test/Golden/Shelley/Node/KeyGenVrf.hs
@@ -24,8 +24,5 @@ golden_shelleyNodeKeyGenVrf = propertyOnce . H.moduleWorkspace "tmp" $ \tempDir
     , "--signing-key-file", signingKey
     ]
 
-  H.assertFileOccurences 1 "VRF Verification Key" verificationKey
-  H.assertFileOccurences 1 "VRF Signing Key" signingKey
-
-  H.assertEndsWithSingleNewline verificationKey
-  H.assertEndsWithSingleNewline signingKey
+  H.assertFileOccurences 1 "vrf_vk" verificationKey
+  H.assertFileOccurences 1 "vrf_sk" signingKey
diff --git a/cardano-cli/test/Test/Golden/Shelley/StakeAddress/KeyGen.hs b/cardano-cli/test/Test/Golden/Shelley/StakeAddress/KeyGen.hs
index c7229a182a8..27fb7d8f3c4 100644
--- a/cardano-cli/test/Test/Golden/Shelley/StakeAddress/KeyGen.hs
+++ b/cardano-cli/test/Test/Golden/Shelley/StakeAddress/KeyGen.hs
@@ -24,8 +24,5 @@ golden_shelleyStakeAddressKeyGen = propertyOnce . H.moduleWorkspace "tmp" $ \tem
     , "--signing-key-file", signingKeyFile
     ]
 
-  H.assertFileOccurences 1 "StakeVerificationKeyShelley_ed25519" verificationKeyFile
-  H.assertFileOccurences 1 "StakeSigningKeyShelley_ed25519" signingKeyFile
-
-  H.assertEndsWithSingleNewline verificationKeyFile
-  H.assertEndsWithSingleNewline signingKeyFile
+  H.assertFileOccurences 1 "stake_vk" verificationKeyFile
+  H.assertFileOccurences 1 "stake_sk" signingKeyFile