Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deprecate serialiseTxLedgerCddl #772

Closed
wants to merge 2 commits into from
Closed

Deprecate serialiseTxLedgerCddl #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ba844d
Fix compilation errors
palas May 20, 2024
0196f48
Fix some tests
palas May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ index-state:
packages:
cardano-cli

source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-api.git
tag: 1244e702287daedbde0cffa320d1eb423493321e
subdir: cardano-api
--sha256: 1wjhyliq3qv83m956mvinshd8cbrkyjlcx97s34qxi9cilskn210

program-options
ghc-options: -Werror

Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/src/Cardano/CLI/Byron/Run.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions cardano-cli/src/Cardano/CLI/Read.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,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
Expand All @@ -1038,7 +1038,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
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/shelley/witness-out.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "TxWitness ShelleyEra",
"description": "Key Witness ShelleyEra",
"cborHex": "8258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea4234275840a20a2c8b1ffc2151eee3f659fc4076f9859d7d4d073933275470f270128736d231a2fb5e1bc2a6058ef2e58bc98266d192c55d6435ab591ce72cb165a7ec4e03"
"cborHex": "82008258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea4234275840a20a2c8b1ffc2151eee3f659fc4076f9859d7d4d073933275470f270128736d231a2fb5e1bc2a6058ef2e58bc98266d192c55d6435ab591ce72cb165a7ec4e03"
}
Loading