Skip to content

Export and reuse extractWitnessable* functions in tests #1125

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

Merged
Jimbo4350 merged 2 commits into from
Mar 11, 2026
Merged

Export and reuse extractWitnessable* functions in tests #1125

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
17264b1
Export and reuse extractWitnessable* functions in tests
Jimbo4350 Mar 10, 2026
ee7d59f
Fix formatting and remove unused ordered-containers dependency
Jimbo4350 Mar 10, 2026
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
1 change: 0 additions & 1 deletion cardano-api/cardano-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,6 @@ test-suite cardano-api-test
hedgehog-quickcheck,
microlens,
mtl,
ordered-containers,
ouroboros-consensus,
ouroboros-consensus-protocol,
raw-strings-qq,
Expand Down
6 changes: 6 additions & 0 deletions cardano-api/src/Cardano/Api/Experimental/Tx.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ module Cardano.Api.Experimental.Tx
-- ** Internal functions
, extractExecutionUnits
, getTxScriptWitnessRequirements
, extractWitnessableTxIns
, extractWitnessableMints
, extractWitnessableCertificates
, extractWitnessableWithdrawals
, extractWitnessableVotes
, extractWitnessableProposals
)
where

Expand Down
6 changes: 6 additions & 0 deletions cardano-api/src/Cardano/Api/Experimental/Tx/Internal/BodyContent/New.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ module Cardano.Api.Experimental.Tx.Internal.BodyContent.New

-- * Internal conversions
, convProposalProcedures
, extractWitnessableTxIns
, extractWitnessableMints
, extractWitnessableCertificates
, extractWitnessableWithdrawals
, extractWitnessableVotes
, extractWitnessableProposals

-- * Legacy conversions
, DatumDecodingError (..)
Expand Down
33 changes: 8 additions & 25 deletions cardano-api/test/cardano-api-test/Test/Cardano/Api/Transaction/Body/Plutus/Scripts.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import Cardano.Api (AlonzoEraOnwards (..))
import Cardano.Api qualified as Api
import Cardano.Api.Experimental
import Cardano.Api.Experimental qualified as Exp
import Cardano.Api.Experimental.AnyScript
import Cardano.Api.Experimental.AnyScriptWitness
import Cardano.Api.Experimental.Plutus hiding (AnyPlutusScript (..))
Expand All @@ -25,7 +24,6 @@

import Data.Function
import Data.List qualified as List
import Data.Map.Ordered qualified as OMap
import Data.Map.Strict qualified as Map

import Test.Gen.Cardano.Api.Experimental qualified as Exp
Expand Down Expand Up @@ -178,30 +176,15 @@

let allGeneratedPlutusScriptWitnesses =
mconcat
[ createIndexedPlutusScriptWitnesses $ [(Exp.WitTxIn tIn, sWit) | (tIn, sWit) <- generatedTxInWits]
[ createIndexedPlutusScriptWitnesses $ Exp.extractWitnessableTxIns generatedTxInWits
, createIndexedPlutusScriptWitnesses $
[ (Exp.WitMint pid pAssets, anyScriptWitnessToAnyWitness sWit)
| (pid, (pAssets, sWit)) <- Map.toList $ Exp.unTxMintValue generatedTxMintWits
]
, createIndexedPlutusScriptWitnesses
[ (Exp.WitTxCert c scred, wit)
| (Certificate c, Just (scred, wit)) <-
OMap.toAscList $ Exp.unTxCertificates generatedTxCertWits
]
, createIndexedPlutusScriptWitnesses
[ (Exp.WitWithdrawal sAddr deposit, wit)
| (sAddr, deposit, wit) <- Exp.unTxWithdrawals generatedTxWithdrawals
]
, createIndexedPlutusScriptWitnesses
[ (Exp.WitVote v, wit)
| let Exp.TxVotingProcedures _ vMap = generatedTxVotingprocedures
, (v, wit) <- Map.toList vMap
]
, createIndexedPlutusScriptWitnesses
[ (Exp.WitProposal p, wit)
| let Exp.TxProposalProcedures pMap = generatedTxProposalProcedures
, (p, wit) <- OMap.toAscList pMap
]
map (\(w, sw) -> (w, anyScriptWitnessToAnyWitness sw)) $

Check notice

Code scanning / HLint

Use second Note test

cardano-api/test/cardano-api-test/Test/Cardano/Api/Transaction/Body/Plutus/Scripts.hs:180:22-69: Suggestion: Use second
  
Found:
  \ (w, sw) -> (w, anyScriptWitnessToAnyWitness sw)
  
Perhaps:
  Data.Bifunctor.second anyScriptWitnessToAnyWitness
  
Note: increases laziness
Copy link
Contributor

@carbolymer carbolymer Mar 11, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot how come it did not show up in the hlint github action?

Exp.extractWitnessableMints generatedTxMintWits
, createIndexedPlutusScriptWitnesses $ Exp.extractWitnessableCertificates generatedTxCertWits
, createIndexedPlutusScriptWitnesses $ Exp.extractWitnessableWithdrawals generatedTxWithdrawals
, createIndexedPlutusScriptWitnesses $ Exp.extractWitnessableVotes (Just generatedTxVotingprocedures)
, createIndexedPlutusScriptWitnesses $
Exp.extractWitnessableProposals (Just generatedTxProposalProcedures)
]

H.note_ "All generated script witnesses"
Expand Down
Loading