Merge pull request #1252 from IntersectMBO/jordan/refactor-2025-07-23

Run weeder

Author: Jimbo4350

cardano-cli/cardano-cli.cabal

@@ -220,7 +220,6 @@ library
     Cardano.CLI.Type.Error.StakeAddressRegistrationError
     Cardano.CLI.Type.Error.StakeCredentialError
     Cardano.CLI.Type.Error.StakePoolCmdError
-    Cardano.CLI.Type.Error.TextViewFileError
     Cardano.CLI.Type.Error.TxCmdError
     Cardano.CLI.Type.Error.TxValidationError
     Cardano.CLI.Type.Governance

cardano-cli/src/Cardano/CLI/Byron/Delegation.hs

@@ -4,126 +4,21 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.CLI.Byron.Delegation
-  ( ByronDelegationError (..)
-  , checkByronGenesisDelegation
-  , issueByronGenesisDelegation
-  , renderByronDelegationError
-  , serialiseDelegationCert
+  ( serialiseDelegationCert
   , serialiseByronWitness
   )
 where
 
-import Cardano.Api.Byron (ACertificate (delegateVK))
 import Cardano.Api.Byron hiding (delegateVK)
-import Cardano.Api.Ledger qualified as L
-import Cardano.Api.Monad.Error
-import Cardano.Api.Pretty
 import Cardano.Api.Serialise.Raw
 
-import Cardano.CLI.Type.Common (CertificateFile (..))
-import Cardano.Crypto (ProtocolMagicId)
-import Cardano.Crypto qualified as Crypto
-import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
+import Cardano.Prelude (canonicalEncodePretty)
 
 import Prelude hiding ((.))
 
 import Control.Category
-import Control.Monad (unless)
 import Data.ByteString (ByteString)
 import Data.ByteString.Lazy qualified as LB
-import Data.Text (Text)
-import Formatting (Format, sformat)
-
-data ByronDelegationError
-  = CertificateValidationErrors !FilePath ![Text]
-  | DlgCertificateDeserialisationFailed !FilePath !Text
-  deriving Show
-
-renderByronDelegationError :: ByronDelegationError -> Doc ann
-renderByronDelegationError = \case
-  CertificateValidationErrors certFp errs ->
-    "Certificate validation error(s) at: " <> pshow certFp <> " Errors: " <> pshow errs
-  DlgCertificateDeserialisationFailed certFp deSererr ->
-    "Certificate deserialisation error at: " <> pshow certFp <> " Error: " <> pshow deSererr
-
--- TODO:  we need to support password-protected secrets.
-
--- | Issue a certificate for genesis delegation to a delegate key, signed by the
---   issuer key, for a given protocol magic and coming into effect at given epoch.
-issueByronGenesisDelegation
-  :: ProtocolMagicId
-  -> EpochNumber
-  -> Crypto.SigningKey
-  -> Crypto.VerificationKey
-  -> Certificate
-issueByronGenesisDelegation magic epoch issuerSK delegateVK' =
-  signCertificate magic delegateVK' epoch $
-    Crypto.noPassSafeSigner issuerSK
-
--- | Verify that a certificate signifies genesis delegation by assumed genesis key
---   to a delegate key, for a given protocol magic.
---   If certificate fails validation, throw an error.
-checkByronGenesisDelegation
-  :: CertificateFile
-  -> ProtocolMagicId
-  -> Crypto.VerificationKey
-  -> Crypto.VerificationKey
-  -> ExceptT ByronDelegationError IO ()
-checkByronGenesisDelegation (CertificateFile certF) magic issuer delegate = do
-  ecert <- liftIO $ canonicalDecodePretty <$> LB.readFile certF
-  case ecert of
-    Left e -> left $ DlgCertificateDeserialisationFailed certF e
-    Right (cert :: Certificate) -> do
-      let issues = checkDlgCert cert magic issuer delegate
-      unless (null issues) $
-        left $
-          CertificateValidationErrors certF issues
-
-checkDlgCert
-  :: ACertificate a
-  -> ProtocolMagicId
-  -> Crypto.VerificationKey
-  -> Crypto.VerificationKey
-  -> [Text]
-checkDlgCert cert magic issuerVK' delegateVK' =
-  mconcat
-    [ [ sformat "Certificate does not have a valid signature."
-      | not (isValid magic' cert')
-      ]
-    , [ sformat
-          ("Certificate issuer " . vkF . " doesn't match expected: " . vkF)
-          (issuerVK cert)
-          issuerVK'
-      | issuerVK cert /= issuerVK'
-      ]
-    , [ sformat
-          ("Certificate delegate " . vkF . " doesn't match expected: " . vkF)
-          (delegateVK cert)
-          delegateVK'
-      | delegateVK cert /= delegateVK'
-      ]
-    ]
- where
-  magic' :: L.Annotated ProtocolMagicId ByteString
-  magic' = L.Annotated magic (L.serialize' L.byronProtVer magic)
-
-  epoch :: EpochNumber
-  epoch = L.unAnnotated $ aEpoch cert
-
-  cert' :: ACertificate ByteString
-  cert' =
-    let unannotated =
-          cert
-            { aEpoch = L.Annotated epoch ()
-            , annotation = ()
-            }
-     in unannotated
-          { annotation = L.serialize' L.byronProtVer unannotated
-          , aEpoch = L.Annotated epoch (L.serialize' L.byronProtVer epoch)
-          }
-
-  vkF :: forall r. Format r (Crypto.VerificationKey -> r)
-  vkF = Crypto.fullVerificationKeyF
 
 serialiseDelegationCert :: Certificate -> ByteString
 serialiseDelegationCert = LB.toStrict . canonicalEncodePretty

cardano-cli/src/Cardano/CLI/Byron/Legacy.hs

@@ -5,7 +5,6 @@
 
 module Cardano.CLI.Byron.Legacy
   ( LegacyDelegateKey (..)
-  , encodeLegacyDelegateKey
   , decodeLegacyDelegateKey
   )
 where
@@ -16,7 +15,6 @@ import Cardano.Crypto.Signing (SigningKey (..))
 import Cardano.Crypto.Wallet qualified as Wallet
 
 import Codec.CBOR.Decoding qualified as D
-import Codec.CBOR.Encoding qualified as E
 import Control.Monad (when)
 import Data.Text (Text)
 import Formatting (build, formatToString)
@@ -29,9 +27,6 @@ import Formatting (build, formatToString)
 -- Legacy reference: https://github.com/input-output-hk/cardano-sl/blob/release/3.0.1/lib/src/Pos/Util/UserSecret.hs#L189
 newtype LegacyDelegateKey = LegacyDelegateKey {lrkSigningKey :: SigningKey}
 
-encodeXPrv :: Wallet.XPrv -> E.Encoding
-encodeXPrv a = E.encodeBytes $ Wallet.unXPrv a
-
 decodeXPrv :: D.Decoder s Wallet.XPrv
 decodeXPrv =
   either (fail . formatToString build) pure . Wallet.xprv =<< D.decodeBytesCanonical
@@ -59,19 +54,6 @@ matchSize requestedSize lbl actualSize =
             <> textShow actualSize
         )
 
--- | Encoder for a Byron/Classic signing key.
---   Lifted from cardano-sl legacy codebase.
-encodeLegacyDelegateKey :: LegacyDelegateKey -> E.Encoding
-encodeLegacyDelegateKey (LegacyDelegateKey (SigningKey sk)) =
-  E.encodeListLen 4
-    <> E.encodeListLen 1
-    <> E.encodeBytes "vss deprecated"
-    <> E.encodeListLen 1
-    <> encodeXPrv sk
-    <> E.encodeListLenIndef
-    <> E.encodeBreak
-    <> E.encodeListLen 0
-
 -- | Decoder for a Byron/Classic signing key.
 --   Lifted from cardano-sl legacy codebase.
 decodeLegacyDelegateKey :: D.Decoder s LegacyDelegateKey

cardano-cli/src/Cardano/CLI/Byron/Tx.hs

@@ -18,7 +18,6 @@ module Cardano.CLI.Byron.Tx
   , renderByronTxError
   -- TODO: remove when they are exported from the ledger
   , fromCborTxAux
-  , toCborTxAux
   , ScriptValidity (..)
   )
 where
@@ -220,6 +219,3 @@ fromCborTxAux lbs =
  where
   annotationBytes :: Functor f => LB.ByteString -> f L.ByteSpan -> f B.ByteString
   annotationBytes bytes = fmap (LB.toStrict . L.slice bytes)
-
-toCborTxAux :: Byron.ATxAux ByteString -> LB.ByteString
-toCborTxAux = LB.fromStrict . Byron.aTaAnnotation -- The ByteString anotation is the CBOR encoded version.

cardano-cli/src/Cardano/CLI/Compatible/Transaction/TxOut.hs

@@ -85,8 +85,7 @@ toTxAlonzoDatum supp cliDatum =
         pure $ TxOutDatumInline babbageOnwards sData
 
 getReferenceScript
-  :: ()
-  => BabbageEraOnwards era
+  :: BabbageEraOnwards era
   -> ReferenceScriptAnyEra
   -> CIO e (ReferenceScript era)
 getReferenceScript w = \case

cardano-cli/src/Cardano/CLI/Environment.hs

@@ -4,7 +4,6 @@
 -- | This module defines constants derived from the environment.
 module Cardano.CLI.Environment
   ( EnvCli (..)
-  , envCliAnyEon
   , envCliEra
   , getEnvCli
   , getEnvNetworkId
@@ -15,15 +14,11 @@ where
 import Cardano.Api
   ( AnyCardanoEra (..)
   , CardanoEra (..)
-  , Eon
-  , EraInEon (..)
   , NetworkId (..)
   , NetworkMagic (..)
-  , forEraInEonMaybe
   )
 import Cardano.Api.Experimental qualified as Exp
 
-import Data.Typeable
 import Data.Word (Word32)
 import System.Environment qualified as IO
 import System.IO qualified as IO
@@ -48,11 +43,6 @@ getEnvCli = do
       , envCliAnyCardanoEra = mCardanoEra
       }
 
-envCliAnyEon :: Typeable eon => Eon eon => EnvCli -> Maybe (EraInEon eon)
-envCliAnyEon envCli = do
-  AnyCardanoEra era <- envCliAnyCardanoEra envCli
-  forEraInEonMaybe era EraInEon
-
 anyCardanoEraToEra :: AnyCardanoEra -> Maybe (Exp.Era Exp.ConwayEra)
 anyCardanoEraToEra (AnyCardanoEra era) =
   case era of