From e562e0b122b7b158d2b19f1b4f445c049969a69b Mon Sep 17 00:00:00 2001 From: Evgenii Akentev Date: Mon, 23 May 2022 13:00:09 +0400 Subject: [PATCH] some review fixes --- plutus-ledger-constraints/plutus-ledger-constraints.cabal | 1 - plutus-pab-executables/plutus-pab-executables.cabal | 1 + plutus-pab-executables/tx-inject/TxInject/RandomTx.hs | 4 +++- plutus-pab/src/Plutus/PAB/Run/Cli.hs | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plutus-ledger-constraints/plutus-ledger-constraints.cabal b/plutus-ledger-constraints/plutus-ledger-constraints.cabal index 989a7acb08..fa90a0143d 100644 --- a/plutus-ledger-constraints/plutus-ledger-constraints.cabal +++ b/plutus-ledger-constraints/plutus-ledger-constraints.cabal @@ -44,7 +44,6 @@ library build-depends: base >=4.9 && <5, aeson -any, - cardano-api -any, containers -any, lens -any, mtl -any, diff --git a/plutus-pab-executables/plutus-pab-executables.cabal b/plutus-pab-executables/plutus-pab-executables.cabal index 483f0f9165..a250e9e8a3 100644 --- a/plutus-pab-executables/plutus-pab-executables.cabal +++ b/plutus-pab-executables/plutus-pab-executables.cabal @@ -372,6 +372,7 @@ executable tx-inject default-language: Haskell2010 build-depends: base >=4.9 && <5, + data-default -any, plutus-pab, containers -any, clock -any, diff --git a/plutus-pab-executables/tx-inject/TxInject/RandomTx.hs b/plutus-pab-executables/tx-inject/TxInject/RandomTx.hs index f33617c54d..bc361b45ec 100644 --- a/plutus-pab-executables/tx-inject/TxInject/RandomTx.hs +++ b/plutus-pab-executables/tx-inject/TxInject/RandomTx.hs @@ -10,6 +10,7 @@ module TxInject.RandomTx( ) where import Control.Monad.Primitive (PrimMonad, PrimState) +import Data.Default (def) import Data.List.NonEmpty (NonEmpty (..)) import Data.Map qualified as Map import Data.Maybe (fromMaybe) @@ -23,6 +24,7 @@ import Ledger.Address qualified as Address import Ledger.CardanoWallet qualified as CW import Ledger.Generators qualified as Generators import Ledger.Index (UtxoIndex (..), ValidationCtx (..), runValidation, validateTransaction) +import Ledger.Params (Params (pSlotConfig)) import Ledger.Slot (Slot (..)) import Ledger.Tx (Tx, TxOut (..)) import Ledger.Tx qualified as Tx @@ -88,7 +90,7 @@ generateTx gen slot (UtxoIndex utxo) = do Generators.genValidTransactionSpending sourceTxIns sourceAda slotCfg <- Gen.sample Generators.genSlotConfig let ((validationResult, _), _) = - runValidation (validateTransaction slot tx) (ValidationCtx (UtxoIndex utxo) slotCfg) + runValidation (validateTransaction slot tx) (ValidationCtx (UtxoIndex utxo) (def { pSlotConfig = slotCfg })) case validationResult of Nothing -> pure tx Just _ -> generateTx gen slot (UtxoIndex utxo) diff --git a/plutus-pab/src/Plutus/PAB/Run/Cli.hs b/plutus-pab/src/Plutus/PAB/Run/Cli.hs index b9ad439f62..0c3247da2d 100644 --- a/plutus-pab/src/Plutus/PAB/Run/Cli.hs +++ b/plutus-pab/src/Plutus/PAB/Run/Cli.hs @@ -111,7 +111,6 @@ runConfigCommand _ ConfigCommandArgs{ccaTrace, ccaPABConfig=Config{dbConfig}} Mi -- Run mock wallet service runConfigCommand _ ConfigCommandArgs{ccaTrace, ccaPABConfig = Config {nodeServerConfig, chainIndexConfig, walletServerConfig = LocalWalletConfig ws},ccaAvailability} MockWallet = do params <- liftIO $ Params.fromPABServerConfig nodeServerConfig - -- = Params { pSlotConfig = pscSlotConfig nodeServerConfig, pProtocolParams = protocolParameters, pNetworkId = networkId } liftIO $ WalletServer.main (toWalletLog ccaTrace) ws