Remove redundant AsType constructors usages

Author: carbolymer

cardano-node/src/Cardano/Node/Protocol/Shelley.hs

@@ -150,7 +150,7 @@ readLeaderCredentialsSingleton
                       shelleyKESFile = Just kesFile
                     } = do
     vrfSKey <-
-      firstExceptT FileError (newExceptT $ readFileTextEnvelope (AsSigningKey AsVrfKey) (File vrfFile))
+      firstExceptT FileError (newExceptT $ readFileTextEnvelope (File vrfFile))
 
     (opCert, kesSKey) <- opCertKesKeyCheck (File kesFile) (File opCertFile)
 
@@ -172,9 +172,9 @@ opCertKesKeyCheck
   -> ExceptT PraosLeaderCredentialsError IO (OperationalCertificate, SigningKey KesKey)
 opCertKesKeyCheck kesFile certFile = do
   opCert <-
-    firstExceptT FileError (newExceptT $ readFileTextEnvelope AsOperationalCertificate certFile)
+    firstExceptT FileError (newExceptT $ readFileTextEnvelope certFile)
   kesSKey <-
-    firstExceptT FileError (newExceptT $ readFileTextEnvelope (AsSigningKey AsKesKey) kesFile)
+    firstExceptT FileError (newExceptT $ readFileTextEnvelope kesFile)
   let opCertSpecifiedKesKeyhash = verificationKeyHash $ getHotKey opCert
       suppliedKesKeyHash = verificationKeyHash $ getVerificationKey kesSKey
   -- Specified KES key in operational certificate should match the one
@@ -201,9 +201,9 @@ readLeaderCredentialsBulk ProtocolFilepaths { shelleyBulkCredsFile = mfp } =
      -> ExceptT PraosLeaderCredentialsError IO (ShelleyLeaderCredentials StandardCrypto)
    parseShelleyCredentials ShelleyCredentials { scCert, scVrf, scKes } = do
      mkPraosLeaderCredentials
-       <$> parseEnvelope AsOperationalCertificate scCert
-       <*> parseEnvelope (AsSigningKey AsVrfKey) scVrf
-       <*> parseEnvelope (AsSigningKey AsKesKey) scKes
+       <$> parseEnvelope scCert
+       <*> parseEnvelope scVrf
+       <*> parseEnvelope scKes
 
    readBulkFile
      :: Maybe FilePath
@@ -246,12 +246,11 @@ mkPraosLeaderCredentials
 
 parseEnvelope ::
      HasTextEnvelope a
-  => AsType a
-  -> (TextEnvelope, String)
+  => (TextEnvelope, String)
   -> ExceptT PraosLeaderCredentialsError IO a
-parseEnvelope as (te, loc) =
+parseEnvelope (te, loc) =
   firstExceptT (FileError . Api.FileError loc) . hoistEither $
-    deserialiseFromTextEnvelope as te
+    deserialiseFromTextEnvelope te
 
 
 ------------------------------------------------------------------------------

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs

@@ -128,7 +128,7 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
       -- leadership-schedule
       do
         let spoKeys = Defaults.defaultSpoKeys 1
-        spoVerificationKey :: VerificationKey StakePoolKey <- readVerificationKeyFromFile AsStakePoolKey work $ verificationKey $ poolNodeKeysCold spoKeys
+        spoVerificationKey :: VerificationKey StakePoolKey <- readVerificationKeyFromFile work $ verificationKey $ poolNodeKeysCold spoKeys
         H.noteM_ $ execCli' execConfig [ eraName, "query", "leadership-schedule"
                                        , "--genesis", shelleyGeneisFile
                                        , "--stake-pool-verification-key", T.unpack $ serialiseToBech32 spoVerificationKey
@@ -244,7 +244,7 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
         fileQueryAmount <- H.evalMaybe $ fileQueryResult ^? Aeson.nth 0 . Aeson.nth 1 . Aeson._Number
 
         -- Query individual SPO using SPOs bech32 of key and compare to previous result
-        delegatorVKey :: VerificationKey StakePoolKey <- readVerificationKeyFromFile AsStakePoolKey work spoKey
+        delegatorVKey :: VerificationKey StakePoolKey <- readVerificationKeyFromFile work spoKey
         keyQueryResult :: Aeson.Value <- execCliStdoutToJson execConfig [ eraName, "query", "spo-stake-distribution"
                                                                         , "--spo-verification-key", T.unpack $ serialiseToBech32 delegatorVKey
                                                                         ]
@@ -449,6 +449,10 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
       -- TODO @cardano-cli team
       pure ()
 
+    TestQueryEraHistoryCmd -> do
+      -- TODO @cardano-cli team
+      pure ()
+
   where
   -- | Wait for the part of the epoch when futurePParams are known
   waitForFuturePParamsToStabilise
@@ -482,13 +486,19 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
         minSlotInThisEpochToWaitTo = firstSlotOfEpoch + slotsInEpochToWaitOut + 1
     in slotNo >= minSlotInThisEpochToWaitTo
 
-  readVerificationKeyFromFile :: (HasCallStack, MonadIO m, MonadCatch m, MonadTest m,  HasTextEnvelope (VerificationKey keyrole), SerialiseAsBech32 (VerificationKey keyrole))
-    => AsType keyrole
-    -> FilePath
+  readVerificationKeyFromFile
+    :: ( HasCallStack
+       , MonadIO m
+       , MonadCatch m
+       , MonadTest m
+       , HasTextEnvelope (VerificationKey keyrole)
+       , SerialiseAsBech32 (VerificationKey keyrole)
+       )
+    => FilePath
     -> File content direction
     -> m (VerificationKey keyrole)
-  readVerificationKeyFromFile asKey work =
-    H.evalEitherM . liftIO . runExceptT . readVerificationKeyOrFile asKey . VerificationKeyFilePath . File . (work </>) . unFile
+  readVerificationKeyFromFile work =
+    H.evalEitherM . liftIO . runExceptT . readVerificationKeyOrFile . VerificationKeyFilePath . File . (work </>) . unFile
 
   _verificationStakeKeyToStakeAddress :: Int -> VerificationKey StakeKey -> StakeAddress
   _verificationStakeKeyToStakeAddress testnetMagic delegatorVKey =

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction.hs

@@ -52,7 +52,6 @@ hprop_transaction = integrationRetryWorkspace 2 "simple transaction build" $ \te
 
   let
     sbe = ShelleyBasedEraConway
-    txEra = AsConwayEra
     era = toCardanoEra sbe
     cEra = AnyCardanoEra era
     tempBaseAbsPath = makeTmpBaseAbsPath $ TmpAbsolutePath tempAbsPath'
@@ -93,8 +92,8 @@ hprop_transaction = integrationRetryWorkspace 2 "simple transaction build" $ \te
     , "--out-file", txbodyFp
     ]
   cddlUnwitnessedTx <- H.readJsonFileOk txbodyFp
-  apiTx <- H.evalEither $ deserialiseFromTextEnvelope (AsTx txEra) cddlUnwitnessedTx
-  let txFee = L.unCoin $ extractTxFee apiTx
+  apiTx <- H.evalEither $ deserialiseFromTextEnvelope cddlUnwitnessedTx
+  let txFee = L.unCoin $ extractTxFee sbe apiTx
 
   -- This is the current calculated fee.
   -- It's a sanity check to see if anything has
@@ -133,6 +132,6 @@ hprop_transaction = integrationRetryWorkspace 2 "simple transaction build" $ \te
 txOutValue :: TxOut ctx era -> TxOutValue era
 txOutValue (TxOut _ v _ _) = v
 
-extractTxFee :: Tx era -> L.Coin
-extractTxFee (ShelleyTx sbe ledgerTx) =
+extractTxFee :: ShelleyBasedEra era -> Tx era -> L.Coin
+extractTxFee _ (ShelleyTx sbe ledgerTx) =
   shelleyBasedEraConstraints sbe $ ledgerTx ^. (L.bodyTxL . L.feeTxBodyL)

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/NoConfidence.hs

@@ -97,7 +97,7 @@ hprop_gov_no_confidence = integrationWorkspace "no-confidence" $ \tempAbsBasePat
 
   CommitteeColdKeyHash comKeyHash1 <-
     H.evalEither
-      $ deserialiseFromRawBytesHex (AsHash AsCommitteeColdKey)
+      $ deserialiseFromRawBytesHex
       $ BSC.pack comKeyHash1Str
 
   let comKeyCred1 = L.KeyHashObj comKeyHash1