From 1f758c00866a97b3b89aef7372eebca8eb17d90f Mon Sep 17 00:00:00 2001 From: Pablo Lamela Date: Mon, 20 May 2024 20:34:26 +0200 Subject: [PATCH] Fix compilation errors --- cabal.project | 7 +++++++ cardano-cli/src/Cardano/CLI/Byron/Run.hs | 4 ++-- cardano-cli/src/Cardano/CLI/Read.hs | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cabal.project b/cabal.project index 8775c7acba..5035041c52 100644 --- a/cabal.project +++ b/cabal.project @@ -19,6 +19,13 @@ index-state: packages: cardano-cli +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-api.git + tag: 5a683de65d5e402ac76ba9caae33474059ab04b9 + subdir: cardano-api + --sha256: 15s6rav6bn6nrj3y1732f9gx4h2rvb2kkfgbbv06ibcszz9vk43a + program-options ghc-options: -Werror diff --git a/cardano-cli/src/Cardano/CLI/Byron/Run.hs b/cardano-cli/src/Cardano/CLI/Byron/Run.hs index 12b9993e01..d97d98713a 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Run.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Run.hs @@ -192,7 +192,7 @@ runSpendGenesisUTxO genesisFile nw bKeyFormat (NewTxFile ctTx) ctKey genRichAddr let tx = txSpendGenesisUTxOByronPBFT genesis nw sk genRichAddr outs firstExceptT ByronCmdHelpersError . ensureNewFileLBS ctTx - $ teCddlRawCBOR $ serializeByronTx tx + $ teRawCBOR $ serializeByronTx tx -- Construct a Byron era tx runSpendUTxO @@ -208,4 +208,4 @@ runSpendUTxO nw bKeyFormat (NewTxFile ctTx) ctKey ins outs = do let gTx = txSpendUTxOByronPBFT nw sk ins outs firstExceptT ByronCmdHelpersError . ensureNewFileLBS ctTx - $ teCddlRawCBOR $ serializeByronTx gTx + $ teRawCBOR $ serializeByronTx gTx diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs index 2841a46600..3a28430fb5 100644 --- a/cardano-cli/src/Cardano/CLI/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Read.hs @@ -1044,7 +1044,7 @@ readFileOrPipeTextEnvelopeAnyOf types file = do deserialiseFromTextEnvelopeAnyOf types te readFileOrPipeTextEnvelopeCddlAnyOf - :: [FromSomeTypeCDDL TextEnvelopeCddl b] + :: [FromSomeTypeCDDL TextEnvelope b] -> FileOrPipe -> IO (Either (FileError TextEnvelopeCddlError) b) readFileOrPipeTextEnvelopeCddlAnyOf types file = do @@ -1056,7 +1056,7 @@ readFileOrPipeTextEnvelopeCddlAnyOf types file = do readTextEnvelopeCddlFromFileOrPipe :: FileOrPipe - -> IO (Either (FileError TextEnvelopeCddlError) TextEnvelopeCddl) + -> IO (Either (FileError TextEnvelopeCddlError) TextEnvelope) readTextEnvelopeCddlFromFileOrPipe file = do let path = fileOrPipePath file runExceptT $ do