Fix conflicts

Author: palas

cardano-cli/src/Cardano/CLI/EraIndependent/Key/Run.hs

@@ -23,7 +23,7 @@ module Cardano.CLI.EraIndependent.Key.Run
   , genesisVkeyDesc
   , genesisVkeyDelegateDesc
   , stakeVkeyDesc
-  , stakePoolDesc
+  , stakePoolVKeyDesc
   , paymentVkeyDesc
   , stakePoolExtendedSKeyDesc
   , stakePoolExtendedVKeyDesc
@@ -106,8 +106,8 @@ paymentVkeyDesc = "Payment Verification Key"
 stakeVkeyDesc :: TextEnvelopeDescr
 stakeVkeyDesc = "Stake Verification Key"
 
-stakePoolDesc :: TextEnvelopeDescr
-stakePoolDesc = "Stake Pool Operator Verification Key"
+stakePoolVKeyDesc :: TextEnvelopeDescr
+stakePoolVKeyDesc = "Stake Pool Operator Verification Key"
 
 stakePoolExtendedSKeyDesc :: TextEnvelopeDescr
 stakePoolExtendedSKeyDesc = "Stake Pool Operator Signing Key"
@@ -188,19 +188,17 @@ runNonExtendedKeyCmd
         AStakeExtendedVerificationKey vk ->
           writeToDisk vkf (Just stakeVkeyDesc) (castVerificationKey vk :: VerificationKey StakeKey)
         AStakePoolExtendedVerificationKey vk ->
-          writeToDisk vkf (Just stakeVkeyDesc) (castVerificationKey vk :: VerificationKey StakePoolKey)
+          writeToDisk
+            vkf
+            (Just stakePoolVKeyDesc)
+            (castVerificationKey vk :: VerificationKey StakePoolKey)
         AGenesisExtendedVerificationKey vk ->
           writeToDisk vkf (Just genesisVkeyDesc) (castVerificationKey vk :: VerificationKey GenesisKey)
         AGenesisDelegateExtendedVerificationKey vk ->
           writeToDisk
             vkf
             (Just genesisVkeyDelegateDesc)
             (castVerificationKey vk :: VerificationKey GenesisDelegateKey)
-        AStakePoolExtendedVerificationKey vk ->
-          writeToDisk
-            vkf
-            (Just stakePoolExtendedVKeyDesc)
-            (castVerificationKey vk :: VerificationKey StakePoolKey)
         -- Non-extended keys are below and cause failure.
         vk@AByronVerificationKey{} -> goFail vk
         vk@APaymentVerificationKey{} -> goFail vk
@@ -212,7 +210,6 @@ runNonExtendedKeyCmd
         vk@ADRepVerificationKey{} -> goFail vk
         vk@ACommitteeColdVerificationKey{} -> goFail vk
         vk@ACommitteeHotVerificationKey{} -> goFail vk
-        vk@AStakePoolVerificationKey{} -> goFail vk
      where
       goFail nonExtendedKey = left $ KeyCmdExpectedExtendedVerificationKey nonExtendedKey
 
@@ -263,7 +260,6 @@ readExtendedVerificationKeyFile evkfile = do
     k@ADRepVerificationKey{} -> goFail k
     k@ACommitteeColdVerificationKey{} -> goFail k
     k@ACommitteeHotVerificationKey{} -> goFail k
-    k@AStakePoolVerificationKey{} -> goFail k
  where
   goFail k = left $ KeyCmdExpectedExtendedVerificationKey k