From 0a880864a329e3372f63111d679fad1f2f3a8457 Mon Sep 17 00:00:00 2001 From: Franco Testagrossa Date: Mon, 1 Apr 2024 11:24:10 +0200 Subject: [PATCH] Minor fixes to make cabal build all --- hydra-node/bench/tx-cost/TxCost.hs | 3 +-- hydra-tui/src/Hydra/Client.hs | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hydra-node/bench/tx-cost/TxCost.hs b/hydra-node/bench/tx-cost/TxCost.hs index 526418f36ca..2e5e4e2e7e8 100644 --- a/hydra-node/bench/tx-cost/TxCost.hs +++ b/hydra-node/bench/tx-cost/TxCost.hs @@ -113,8 +113,7 @@ computeCommitCost = do (cctx, stInitial) <- genStInitial ctx let InitialState{headId} = stInitial knownUTxO = getKnownUTxO stInitial <> getKnownUTxO cctx - -- TODO: revisit - blueprintTx = undefined + blueprintTx <- arbitrary pure (commit cctx headId knownUTxO utxo blueprintTx, knownUTxO) computeCollectComCost :: IO [(NumParties, Natural, TxSize, MemUnit, CpuUnit, Coin)] diff --git a/hydra-tui/src/Hydra/Client.hs b/hydra-tui/src/Hydra/Client.hs index c68194816d6..c6ad8a98f64 100644 --- a/hydra-tui/src/Hydra/Client.hs +++ b/hydra-tui/src/Hydra/Client.hs @@ -10,16 +10,17 @@ import Control.Concurrent.Class.MonadSTM (newTBQueueIO, readTBQueue, writeTBQueu import Control.Exception (Handler (Handler), IOException, catches) import Data.Aeson (eitherDecodeStrict, encode) import Hydra.API.ClientInput (ClientInput) -import Hydra.API.HTTPServer (DraftCommitTxRequest (..), DraftCommitTxResponse (..), TxOutWithWitness (TxOutWithWitness)) +import Hydra.API.HTTPServer (DraftCommitTxRequest (..), DraftCommitTxResponse (..)) import Hydra.API.ServerOutput (TimedServerOutput) -import Hydra.Cardano.Api ( +import Hydra.Cardano.Api.Prelude ( AsType (AsPaymentKey, AsSigningKey), PaymentKey, SigningKey, - signTx, ) +import Hydra.Cardano.Api.Tx (signTx) import Hydra.Chain.CardanoClient (submitTransaction) import Hydra.Chain.Direct.Util (readFileTextEnvelopeThrow) +import Hydra.Ledger.Cardano (TxOutWithWitness (..)) import Hydra.Network (Host (Host, hostname, port)) import Hydra.TUI.Options (Options (..)) import Network.HTTP.Req (defaultHttpConfig, responseBody, runReq)