cardano-testnet | remove fromString where not needed

Author: carbolymer

cardano-testnet/src/Testnet/Components/Query.hs

@@ -49,7 +49,6 @@ import qualified Cardano.Api.Ledger as L
 import           Cardano.Api.Shelley (LedgerProtocolParameters (..), ShelleyLedgerEra)
 import qualified Cardano.Api.Tx.UTxO as Utxo
 
-import           Cardano.Crypto.Hash (hashToStringAsHex)
 import           Cardano.Ledger.Api (ConwayGovState)
 import qualified Cardano.Ledger.Api as L
 import qualified Cardano.Ledger.Conway.Governance as L
@@ -609,13 +608,19 @@ getDelegationState epochStateView = do
   pure $ L.toStakeCredentials pools
 
 -- | Returns the transaction index of a transaction with a given amount and ID.
-getTxIx :: forall m era. HasCallStack => MonadTest m => ShelleyBasedEra era -> String -> L.Coin -> (AnyNewEpochState, SlotNo, BlockNo) -> m (Maybe Int)
+getTxIx :: forall m era. HasCallStack
+        => MonadTest m
+        => ShelleyBasedEra era
+        -> TxId
+        -> L.Coin
+        -> (AnyNewEpochState, SlotNo, BlockNo)
+        -> m (Maybe TxIx)
 getTxIx sbe txId amount (AnyNewEpochState sbe' _ tbs, _, _) = do
   Refl <- H.leftFail $ assertErasEqual sbe sbe'
   shelleyBasedEraConstraints sbe' $ do
-    return $ Map.foldlWithKey (\acc (TxIn (TxId thisTxId) (TxIx thisTxIx)) (TxOut _ txOutValue _ _) ->
+    return $ Map.foldlWithKey (\acc (TxIn thisTxId thisTxIx) (TxOut _ txOutValue _ _) ->
       case acc of
-        Nothing | hashToStringAsHex thisTxId == txId &&
-                  txOutValueToLovelace txOutValue == amount -> Just $ fromIntegral thisTxIx
+        Nothing | thisTxId == txId &&
+                  txOutValueToLovelace txOutValue == amount -> Just thisTxIx
                 | otherwise -> Nothing
         x -> x) Nothing $ getLedgerTablesUTxOValues sbe' tbs

cardano-testnet/src/Testnet/Process/Cli/DRep.hs

@@ -34,7 +34,6 @@ import           Data.Text (Text)
 import qualified Data.Text as Text
 import           Data.Typeable (Typeable)
 import           Data.Word (Word16)
-import           GHC.Exts (fromString)
 import           GHC.Stack
 import           Lens.Micro ((^?))
 import           System.Directory (makeAbsolute)
@@ -155,7 +154,7 @@ generateVoteFiles
               -- stored.
   -> String -- ^ Name for the subfolder that will be created under 'work' to store
             -- the output voting files.
-  -> String -- ^ Transaction ID string of the governance action.
+  -> TxId -- ^ Transaction ID string of the governance action.
   -> Word16 -- ^ Index of the governance action.
   -> [(KeyPair PaymentKey, [Char])] -- ^ List of tuples where each tuple contains a 'PaymentKeyPair'
                                 -- representing the DRep key pair and a 'String' representing the
@@ -168,8 +167,8 @@ generateVoteFiles execConfig work prefix governanceActionTxId governanceActionIn
     void $ execCli' execConfig
       [ "conway", "governance", "vote", "create"
       , "--" ++ vote
-      , "--governance-action-tx-id", governanceActionTxId
-      , "--governance-action-index", show @Word16 governanceActionIndex
+      , "--governance-action-tx-id", prettyShow governanceActionTxId
+      , "--governance-action-index", show governanceActionIndex
       , "--drep-verification-key-file", verificationKeyFp drepKeyPair
       , "--out-file", unFile path
       ]
@@ -354,7 +353,7 @@ makeActivityChangeProposal
   -> KeyPair StakeKey -- ^ registered staking keys
   -> PaymentKeyInfo -- ^ Wallet that will pay for the transaction.
   -> EpochInterval -- ^ Number of epochs to wait for the proposal to be registered by the chain.
-  -> m (String, Word16) -- ^ The transaction id and the index of the governance action.
+  -> m (TxId, Word16) -- ^ The transaction id and the index of the governance action.
 makeActivityChangeProposal execConfig epochStateView ceo work
                            prevGovActionInfo drepActivity stakeKeyPair wallet timeout = do
 
@@ -421,6 +420,6 @@ makeActivityChangeProposal execConfig epochStateView ceo work
 
   governanceActionIndex <-
     H.nothingFailM $ watchEpochStateUpdate epochStateView timeout $ \(anyNewEpochState, _, _) ->
-      return $ maybeExtractGovernanceActionIndex (fromString governanceActionTxId) anyNewEpochState
+      return $ maybeExtractGovernanceActionIndex governanceActionTxId anyNewEpochState
 
   return (governanceActionTxId, governanceActionIndex)

cardano-testnet/src/Testnet/Process/Cli/SPO.hs

@@ -433,7 +433,7 @@ generateVoteFiles :: (HasCallStack, MonadTest m, MonadIO m, MonadCatch m)
               -- stored.
   -> String -- ^ Name for the subfolder that will be created under 'work' to store
             -- the output voting files.
-  -> String -- ^ Transaction ID string of the governance action.
+  -> TxId -- ^ Transaction ID string of the governance action.
   -> Word16 -- ^ Index of the governance action.
   -> [(SpoNodeKeys, [Char])] -- ^ List of tuples where each tuple contains a 'SpoNodeKeys'
                               -- representing the SPO keys and a 'String' representing the
@@ -446,7 +446,7 @@ generateVoteFiles ceo execConfig work prefix governanceActionTxId governanceActi
     void $ execCli' execConfig
       [ eraToString $ toCardanoEra ceo , "governance", "vote", "create"
       , "--" ++ vote
-      , "--governance-action-tx-id", governanceActionTxId
+      , "--governance-action-tx-id", prettyShow governanceActionTxId
       , "--governance-action-index", show @Word16 governanceActionIndex
       , "--cold-verification-key-file", verificationKeyFp $ poolNodeKeysCold spoKeys
       , "--out-file", unFile path

cardano-testnet/src/Testnet/Process/Cli/Transaction.hs

@@ -231,12 +231,12 @@ retrieveTransactionId
   => MonadIO m
   => H.ExecConfig -- ^ Specifies the CLI execution configuration.
   -> File SignedTx In -- ^ Signed transaction to be submitted, obtained using 'signTx'.
-  -> m String
+  -> m TxId
 retrieveTransactionId execConfig signedTxBody = do
   txidOutput <- execCli' execConfig
     [ "latest", "transaction", "txid"
     , "--tx-file", unFile signedTxBody
     ]
   result <- H.leftFail $ A.decodeEither' @A.Value $ fromString txidOutput
-  H.nothingFail . fmap T.unpack $ result ^? A.key "txhash" . A._String
+  H.nothingFail $ result ^? A.key "txhash" . A._JSON
 

cardano-testnet/src/Testnet/Process/Run.hs

@@ -122,6 +122,7 @@ execCliStdoutToJson :: ()
   -> m a
 execCliStdoutToJson execConfig cmd = GHC.withFrozenCallStack $ do
   result <- execCli' execConfig cmd
+  H.note_ result
   H.leftFail . Aeson.eitherDecode $ fromString result
 
 -- | Create a 'CreateProcess' describing how to start the cardano-cli process

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/CostCalculation.hs

@@ -12,11 +12,7 @@ module Cardano.Testnet.Test.Cli.Plutus.CostCalculation
   )
 where
 
-import           Cardano.Api (AnyCardanoEra (AnyCardanoEra),
-                   AnyShelleyBasedEra (AnyShelleyBasedEra), ExceptT, File (File), MonadIO (liftIO),
-                   ShelleyBasedEra (ShelleyBasedEraConway), ToCardanoEra (toCardanoEra),
-                   deserialiseAnyVerificationKey, liftEither, mapSomeAddressVerificationKey,
-                   renderTxIn, serialiseToRawBytesHex, unFile, verificationKeyHash)
+import           Cardano.Api hiding (Value)
 import           Cardano.Api.Experimental (Some (Some))
 import           Cardano.Api.Ledger (EpochInterval (EpochInterval), unCoin)
 
@@ -25,7 +21,6 @@ import           Cardano.Testnet
 import           Prelude
 
 import           Control.Monad (void)
-import           Control.Monad.Except (runExceptT)
 import           Data.Aeson (Value, encodeFile)
 import qualified Data.Aeson.KeyMap as KeyMap
 import           Data.Aeson.Types (Value (..), object)
@@ -156,12 +151,12 @@ hprop_ref_plutus_cost_calculation = integrationRetryWorkspace 2 "ref plutus scri
       [ eraName
       , "transaction", "build"
       , "--change-address", Text.unpack $ paymentKeyInfoAddr wallet1
-      , "--tx-in", txIdLock <> "#" <> show txIxLock
+      , "--tx-in", prettyShow (TxIn txIdLock txIxLock)
       , "--spending-reference-tx-in-inline-datum-present"
-      , "--spending-tx-in-reference", txIdPublishRefScript <> "#" <> show txIxPublishRefScript
+      , "--spending-tx-in-reference", prettyShow (TxIn txIdPublishRefScript txIxPublishRefScript)
       , "--spending-plutus-script-v3"
       , "--spending-reference-tx-in-redeemer-value", "42"
-      , "--tx-in-collateral", Text.unpack $ renderTxIn largestUTxO
+      , "--tx-in-collateral", prettyShow largestUTxO
       , "--tx-out", Text.unpack (paymentKeyInfoAddr wallet1) <> "+" <> show (unCoin (transferAmount - enoughAmountForFees))
       , "--out-file", unFile unsignedUnlockTx
       ]
@@ -281,10 +276,10 @@ hprop_included_plutus_cost_calculation = integrationRetryWorkspace 2 "included p
       [ eraName
       , "transaction", "build"
       , "--change-address", Text.unpack $ paymentKeyInfoAddr wallet1
-      , "--tx-in", txIdIncludedScriptLock <> "#" <> show txIxIncludedScriptLock
+      , "--tx-in", prettyShow (TxIn txIdIncludedScriptLock txIxIncludedScriptLock)
       , "--tx-in-script-file", unFile plutusV3Script
       , "--tx-in-redeemer-value", "42"
-      , "--tx-in-collateral", Text.unpack $ renderTxIn newLargestUTxO
+      , "--tx-in-collateral", prettyShow newLargestUTxO
       , "--tx-out", Text.unpack (paymentKeyInfoAddr wallet1) <> "+" <> show (unCoin (includedScriptLockAmount - enoughAmountForFees))
       , "--out-file", unFile unsignedIncludedScript
       ]
@@ -396,7 +391,7 @@ hprop_included_simple_script_cost_calculation = integrationRetryWorkspace 2 "inc
       [ eraName
       , "transaction", "build"
       , "--change-address", Text.unpack $ paymentKeyInfoAddr wallet1
-      , "--tx-in", txIdSimpleScriptLock <> "#" <> show txIxSimpleScriptLock
+      , "--tx-in", prettyShow (TxIn txIdSimpleScriptLock txIxSimpleScriptLock)
       , "--tx-in-script-file", unFile simpleScript
       , "--tx-out", Text.unpack (paymentKeyInfoAddr wallet1) <> "+" <> show (unCoin (lockedAmount - enoughAmountForFees))
       , "--witness-override", "2"

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

@@ -319,7 +319,7 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
         submitTx execConfig cEra signedTx
         txId <- retrieveTransactionId execConfig signedTx
         -- And we check
-        H.noteM_ $ execCli' execConfig [ eraName, "query", "tx-mempool", "tx-exists", txId ]
+        H.noteM_ $ execCli' execConfig [ eraName, "query", "tx-mempool", "tx-exists", prettyShow txId ]
 
     TestQuerySlotNumberCmd ->
       -- slot-number
@@ -346,7 +346,7 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
         -- Query the reference script size
         let protocolParametersOutFile = refScriptSizeWork </> "ref-script-size-out.json"
         H.noteM_ $ execCli' execConfig [ eraName, "query", "ref-script-size"
-                                       , "--tx-in", txId ++ "#" ++ show (txIx :: Int)
+                                       , "--tx-in", prettyShow (TxIn txId txIx)
                                        , "--out-file", protocolParametersOutFile
                                        ]
         H.diffFileVsGoldenFile

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

@@ -27,7 +27,6 @@ import           Data.Default.Class
 import qualified Data.Map as Map
 import           Data.Maybe.Strict
 import           Data.Set (Set)
-import           Data.String
 import qualified Data.Text as Text
 import           GHC.Exts (IsList (..))
 import           GHC.Stack
@@ -227,11 +226,11 @@ hprop_constitutional_committee_add_new = integrationWorkspace "constitutional-co
     signTx execConfig cEra work "signed-proposal" (File txbodyFp) [Some $ paymentKeyInfoPair wallet0]
   submitTx execConfig cEra signedProposalTx
 
-  governanceActionTxId <- H.noteM $ retrieveTransactionId execConfig signedProposalTx
+  governanceActionTxId <- H.noteShowM $ retrieveTransactionId execConfig signedProposalTx
 
   governanceActionIx <-
     H.nothingFailM . watchEpochStateUpdate epochStateView (L.EpochInterval 1) $ \(anyNewEpochState, _, _) ->
-      pure $ maybeExtractGovernanceActionIndex (fromString governanceActionTxId) anyNewEpochState
+      pure $ maybeExtractGovernanceActionIndex governanceActionTxId anyNewEpochState
 
   dRepVoteFiles <-
     DRep.generateVoteFiles

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

@@ -217,7 +217,7 @@ activityChangeProposalTest
                          -- the proposal.
   -> EpochInterval -- ^ The maximum number of epochs to wait for the DRep activity interval to
                    -- become expected value.
-  -> m (String, Word16) -- ^ The transaction id and the index of the governance action.
+  -> m (TxId, Word16) -- ^ The transaction id and the index of the governance action.
 activityChangeProposalTest execConfig epochStateView ceo work prefix
                            stakeKeys wallet votes change minWait mExpected maxWait = do
   let sbe = convert ceo
@@ -261,7 +261,7 @@ voteChangeProposal
   -> ShelleyBasedEra era -- ^ The 'ShelleyBasedEra' witness for current era.
   -> FilePath -- ^ Base directory path where generated files will be stored.
   -> String -- ^ Name for the subfolder that will be created under 'work' folder.
-  -> String -- ^ The transaction id of the governance action to vote.
+  -> TxId -- ^ The transaction id of the governance action to vote.
   -> Word16 -- ^ The index of the governance action to vote.
   -> [([Char], Int)] -- ^ Votes to be casted for the proposal. Each tuple contains the index
                      -- of the default DRep that will make the vote and the type of the vote

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

@@ -19,7 +19,6 @@ import           Prelude
 
 import           Control.Monad (void)
 import           Data.Default.Class
-import           Data.String (fromString)
 import qualified Data.Text as Text
 import           System.FilePath ((</>))
 
@@ -138,7 +137,7 @@ hprop_check_gov_action_timeout = integrationWorkspace "gov-action-timeout" $ \te
 
   -- Check proposal expired
   mGovernanceActionTxIx <- watchEpochStateUpdate epochStateView (EpochInterval 2) $ \(anyNewEpochState, _, _) ->
-      return $ maybeExtractGovernanceActionIndex (fromString governanceActionTxId) anyNewEpochState
+      return $ maybeExtractGovernanceActionIndex governanceActionTxId anyNewEpochState
 
   mGovernanceActionTxIx H.=== Nothing
 

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

@@ -27,7 +27,6 @@ import           Data.Bifunctor (first)
 import           Data.Default.Class
 import           Data.Foldable
 import qualified Data.Map.Strict as Map
-import           Data.String
 import qualified Data.Text as Text
 import           Data.Word
 import           GHC.Stack
@@ -190,11 +189,11 @@ hprop_ledger_events_info_action = integrationRetryWorkspace 2 "info-hash" $ \tem
     , "--tx-file", txbodySignedFp
     ]
 
-  txIdString <- H.noteShowM $ retrieveTransactionId execConfig (File txbodySignedFp)
+  txId <- H.noteShowM $ retrieveTransactionId execConfig (File txbodySignedFp)
 
   governanceActionIndex <-
     H.nothingFailM $ watchEpochStateUpdate epochStateView (EpochInterval 1) $ \(anyNewEpochState, _, _) ->
-      pure $ maybeExtractGovernanceActionIndex (fromString txIdString) anyNewEpochState
+      pure $ maybeExtractGovernanceActionIndex txId anyNewEpochState
 
   let voteFp :: Int -> FilePath
       voteFp n = work </> gov </> "vote-" <> show n
@@ -204,8 +203,8 @@ hprop_ledger_events_info_action = integrationRetryWorkspace 2 "info-hash" $ \tem
     execCli' execConfig
       [ eraName, "governance", "vote", "create"
       , "--yes"
-      , "--governance-action-tx-id", txIdString
-      , "--governance-action-index", show @Word16 governanceActionIndex
+      , "--governance-action-tx-id", prettyShow txId
+      , "--governance-action-index", show governanceActionIndex
       , "--drep-verification-key-file", verificationKeyFp $ defaultDRepKeyPair n
       , "--out-file", voteFp n
       ]

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

@@ -26,7 +26,6 @@ import qualified Data.ByteString.Char8 as BSC
 import           Data.Default.Class
 import qualified Data.Map.Strict as Map
 import           Data.Maybe.Strict
-import           Data.String
 import qualified Data.Text as Text
 import           GHC.Exts (IsList (toList))
 import           Lens.Micro
@@ -193,7 +192,7 @@ hprop_gov_no_confidence = integrationWorkspace "no-confidence" $ \tempAbsBasePat
 
   governanceActionIndex <-
     H.nothingFailM $ watchEpochStateUpdate epochStateView (EpochInterval 10) $ \(anyNewEpochState, _, _) ->
-      pure $ maybeExtractGovernanceActionIndex (fromString governanceActionTxId) anyNewEpochState
+      pure $ maybeExtractGovernanceActionIndex governanceActionTxId anyNewEpochState
 
   let spoVotes :: [(String, Int)]
       spoVotes =  [("yes", 1), ("yes", 2), ("no", 3)]

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

@@ -154,7 +154,7 @@ failToVoteChangeProposalWithSPOs
                     -- using the 'getEpochStateView' function.
   -> FilePath -- ^ Base directory path where generated files will be stored.
   -> String -- ^ Name for the subfolder that will be created under 'work' folder.
-  -> String -- ^ The transaction id of the governance action to vote.
+  -> TxId -- ^ The transaction id of the governance action to vote.
   -> Word16 -- ^ The index of the governance action to vote.
   -> [([Char], Int)] -- ^ Votes to be casted for the proposal. Each tuple contains the index
                      -- of the default SPO that will make the vote and the type of the vote

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

@@ -26,7 +26,6 @@ import           Control.Monad
 import           Control.Monad.Catch (MonadCatch)
 import           Data.Data (Typeable)
 import           Data.Default.Class
-import           Data.String (fromString)
 import qualified Data.Text as Text
 import           Data.Word (Word16)
 import           GHC.Stack (HasCallStack)
@@ -183,7 +182,7 @@ desiredPoolNumberProposalTest
   -> Integer -- ^ Minimum number of epochs to wait before checking the result
   -> Maybe Integer -- ^ What the expected result is of the change (if anything)
   -> Integer -- ^ Maximum number of epochs to wait while waiting for the result
-  -> m (String, Word16)
+  -> m (TxId, Word16)
 desiredPoolNumberProposalTest execConfig epochStateView ceo work prefix wallet
                               previousProposalInfo votes change minWait mExpected maxWait = do
   let sbe = convert ceo
@@ -225,7 +224,7 @@ makeDesiredPoolNumberChangeProposal
                             -- governance action if any.
   -> Word16 -- ^ What to change the @desiredPoolNumber@ to
   -> PaymentKeyInfo -- ^ Wallet that will pay for the transaction.
-  -> m (String, Word16)
+  -> m (TxId, Word16)
 makeDesiredPoolNumberChangeProposal execConfig epochStateView ceo work prefix
                                     prevGovActionInfo desiredPoolNumber wallet = do
 
@@ -290,7 +289,7 @@ makeDesiredPoolNumberChangeProposal execConfig epochStateView ceo work prefix
 
   governanceActionIndex <-
     H.nothingFailM $ watchEpochStateUpdate epochStateView (EpochInterval 1) $ \(anyNewEpochState, _, _) ->
-      pure $ maybeExtractGovernanceActionIndex (fromString governanceActionTxId) anyNewEpochState
+      pure $ maybeExtractGovernanceActionIndex governanceActionTxId anyNewEpochState
 
   pure (governanceActionTxId, governanceActionIndex)
 
@@ -307,7 +306,7 @@ voteChangeProposal :: (MonadTest m, MonadIO m, MonadCatch m, H.MonadAssertion m)
   -> ShelleyBasedEra ConwayEra -- ^ The Shelley-based witness for ConwayEra (i.e: ShelleyBasedEraConway).
   -> FilePath -- ^ Base directory path where the subdirectory with the intermediate files will be created.
   -> String -- ^ Name for the subdirectory that will be created for storing the intermediate files.
-  -> String -- ^ Transaction id of the governance action to vote.
+  -> TxId -- ^ Transaction id of the governance action to vote.
   -> Word16 -- ^ Index of the governance action to vote in the transaction.
   -> [DefaultDRepVote] -- ^ List of votes to issue as pairs of the vote and the number of DRep that votes it.
   -> PaymentKeyInfo -- ^ Wallet that will pay for the transactions