Review fixes

IntersectMBO · May 7, 2020 · 73b5ea3 · 73b5ea3
1 parent ab4b5c5
commit 73b5ea3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs
@@ -271,7 +271,7 @@ buildShelleyTransaction
   -> [Certificate]
   -> TxUnsigned
 buildShelleyTransaction txins txouts ttl fee certs = do
-  let relevantCerts = catMaybes [ certDiscrim c | c <- certs ]
+  let relevantCerts = [ certDiscrim c | c <- certs ]
   TxUnsignedShelley $
     Shelley.TxBody
       (Set.fromList (map toShelleyTxIn  txins))
@@ -283,9 +283,9 @@ buildShelleyTransaction txins txouts ttl fee certs = do
       Shelley.SNothing              -- update proposals
       Shelley.SNothing              -- metadata hash
  where
-   certDiscrim :: Certificate -> Maybe ShelleyCertificate
-   certDiscrim (ShelleyDelegationCertificate delegCert) = Just delegCert
-   certDiscrim (ShelleyStakePoolCertificate sPoolCert) = Just sPoolCert
+   certDiscrim :: Certificate -> ShelleyCertificate
+   certDiscrim (ShelleyDelegationCertificate delegCert) = delegCert
+   certDiscrim (ShelleyStakePoolCertificate sPoolCert) = sPoolCert
 
 {-
 inputs outputs, attributes:
@@ -325,7 +325,7 @@ witnessTransaction txu nw signKey =
         TxWitShelley $ shelleyWitnessTransaction tx signKey
 
 byronWitnessTransaction :: Crypto.Hash Byron.Tx -> Network -> SigningKey -> ByronWitness
-byronWitnessTransaction _ _ (SigningKeyShelley _) = panic "Cardano.Api.byronWitnessTransaction: Please provide a shelley signing key."
+byronWitnessTransaction _ _ (SigningKeyShelley _) = panic "Cardano.Api.byronWitnessTransaction: Please provide a byron signing key."
 byronWitnessTransaction txHash nw (SigningKeyByron signKey) =
     Byron.VKWitness
       (Crypto.toVerification signKey)
@@ -339,7 +339,7 @@ byronWitnessTransaction txHash nw (SigningKeyByron signKey) =
         Testnet pm -> pm
 
 shelleyWitnessTransaction :: ShelleyTxBody -> SigningKey -> ShelleyWitnessVKey
-shelleyWitnessTransaction _ (SigningKeyByron _) = panic "Cardano.Api.shelleyWitnessTransaction: Please provide a byron signing key."
+shelleyWitnessTransaction _ (SigningKeyByron _) = panic "Cardano.Api.shelleyWitnessTransaction: Please provide a shelley signing key."
 shelleyWitnessTransaction txbody (SigningKeyShelley sk) =
     Shelley.WitVKey vk sig
   where

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
@@ -322,7 +322,7 @@ pTransaction =
                                    <*> pTxTTL
                                    <*> pTxFee
                                    <*> pTxBodyFile Output
-                                   <*> some pCertificate
+                                   <*> many pCertificate
 
     pTransactionSign  :: Parser TransactionCmd
     pTransactionSign = TxSign <$> pTxBodyFile Input

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
@@ -42,4 +42,4 @@ runTxBuildRaw txins txouts ttl amount (TxBodyFile fpath) certFps = do
    -- a custom error type and an error rendering function.
    readShelleyCert :: CertificateFile -> ExceptT CliError IO Certificate
    readShelleyCert (CertificateFile fp) =
-      firstExceptT ShelleyCertReadError . newExceptT $ readCertificate fp
+      firstExceptT ShelleyCertReadError . newExceptT $ readCertificate fp