fixes

IntersectMBO · May 20, 2022 · 950e0da · 950e0da
1 parent aff9af8
commit 950e0da
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/plutus-contract/src/Plutus/Contract/Trace/RequestHandler.hs b/plutus-contract/src/Plutus/Contract/Trace/RequestHandler.hs
@@ -266,8 +266,8 @@ handleAdjustUnbalancedTx ::
     )
     => RequestHandler effs UnbalancedTx (Either ToCardanoError UnbalancedTx)
 handleAdjustUnbalancedTx =
-    RequestHandler $ \utx -> do
-        params <- Wallet.Effects.getClientParams
+    RequestHandler $ \utx ->
         surroundDebug @Text "handleAdjustUnbalancedTx" $ do
+            params <- Wallet.Effects.getClientParams
             logDebug $ AdjustingUnbalancedTx $ getCardanoTxOutputsMissingCosts params (EmulatorTx $ unBalancedTxTx utx)
             pure $ adjustUnbalancedTx params utx
diff --git a/plutus-contract/src/Plutus/Trace/Emulator/ContractInstance.hs b/plutus-contract/src/Plutus/Trace/Emulator/ContractInstance.hs
@@ -52,7 +52,6 @@ import Data.Maybe (listToMaybe, mapMaybe)
 import Data.Set qualified as Set
 import Data.Text qualified as T
 import Ledger.Blockchain (OnChainTx (Invalid, Valid))
-import Ledger.Params (Params)
 import Ledger.Tx (Address, TxIn (txInRef), TxOut (TxOut, txOutAddress), TxOutRef, txId)
 import Plutus.ChainIndex (ChainIndexQueryEffect, ChainIndexTx (ChainIndexTx, _citxOutputs, _citxTxId),
                           ChainIndexTxOutputs (InvalidTx, ValidTx), RollbackState (Committed),
@@ -459,8 +458,7 @@ respondToRequest isLogShowed f = do
         hdl' :: (Eff (ContractInstanceRequests effs) (Maybe (Response PABResp))) = raiseEnd hdl
 
         response_ :: Eff effs (Maybe (Response PABResp)) =
-            subsume @(Reader Params)
-                    $ subsume @(LogMsg T.Text)
+            subsume @(LogMsg T.Text)
                     $ subsume @(LogMsg TxBalanceMsg)
                     $ subsume @(LogMsg RequestHandlerLogMsg)
                     $ subsume @(LogObserve (LogMessage T.Text))

diff --git a/plutus-contract/src/Plutus/Trace/Emulator/Types.hs b/plutus-contract/src/Plutus/Trace/Emulator/Types.hs
@@ -69,7 +69,6 @@ import Data.Text (Text)
 import Data.Text qualified as T
 import GHC.Generics (Generic)
 import Ledger.Blockchain (Block)
-import Ledger.Params (Params)
 import Ledger.Slot (Slot (..))
 import Plutus.ChainIndex (ChainIndexQueryEffect)
 import Plutus.Contract (Contract (..), WalletAPIError)
@@ -128,7 +127,6 @@ type EmulatedWalletEffects' effs =
         ': LogMsg RequestHandlerLogMsg
         ': LogMsg TxBalanceMsg
         ': LogMsg T.Text
-        ': Reader Params
         ': effs
 
 type EmulatedWalletEffects = EmulatedWalletEffects' '[]

diff --git a/plutus-contract/src/Wallet/Emulator/MultiAgent.hs b/plutus-contract/src/Wallet/Emulator/MultiAgent.hs
@@ -24,7 +24,6 @@ import Control.Monad.Freer (Eff, Member, Members, interpret, send, subsume, type
 import Control.Monad.Freer.Error (Error, throwError)
 import Control.Monad.Freer.Extras.Log (LogMessage, LogMsg, LogObserve, handleObserveLog, mapLog)
 import Control.Monad.Freer.Extras.Modify (handleZoomedState, raiseEnd, writeIntoState)
-import Control.Monad.Freer.Reader (Reader, runReader)
 import Control.Monad.Freer.State (State, get)
 import Data.Aeson (FromJSON, ToJSON)
 import Data.Map (Map)
@@ -189,8 +188,7 @@ handleMultiAgentEffects ::
     -> Eff (EmulatedWalletEffects' effs)
     ~> Eff effs
 handleMultiAgentEffects wallet =
-    interpret (raiseWallet @(Reader Params) wallet)
-        . interpret (raiseWallet @(LogMsg T.Text) wallet)
+    interpret (raiseWallet @(LogMsg T.Text) wallet)
         . interpret (raiseWallet @(LogMsg TxBalanceMsg) wallet)
         . interpret (raiseWallet @(LogMsg RequestHandlerLogMsg) wallet)
         . interpret (raiseWallet @(LogObserve (LogMessage T.Text)) wallet)
@@ -355,8 +353,8 @@ handleMultiAgentControl = interpret $ \case
 
 handleMultiAgent
     :: forall effs. Members MultiAgentEffs effs
-    => Params -> Eff (MultiAgentEffect ': effs) ~> Eff effs
-handleMultiAgent params = interpret $ \case
+    => Eff (MultiAgentEffect ': effs) ~> Eff effs
+handleMultiAgent = interpret $ \case
     -- TODO: catch, log, and rethrow wallet errors?
     WalletAction wallet act ->  do
         let
@@ -382,7 +380,6 @@ handleMultiAgent params = interpret $ \case
             & interpret (mapLog (review p5))
             & interpret (mapLog (review p6))
             & interpret (mapLog (review p4))
-            & runReader params
             & interpret (handleZoomedState (walletState wallet))
             & interpret (mapLog (review p1))
             & interpret (handleZoomedState (walletState wallet . Wallet.nodeClient))

diff --git a/plutus-contract/src/Wallet/Emulator/Types.hs b/plutus-contract/src/Wallet/Emulator/Types.hs
@@ -102,7 +102,7 @@ processEmulated :: forall effs.
     ~> Eff effs
 processEmulated params act =
     act
-        & (handleMultiAgent params)
+        & handleMultiAgent
         & handleMultiAgentControl
         & reinterpret2 @ChainEffect @(State ChainState) @(LogMsg ChainEvent) (handleChain params)
         & interpret (Eff.handleZoomedState chainState)

diff --git a/plutus-playground-client/src/Playground/Lenses.purs b/plutus-playground-client/src/Playground/Lenses.purs
@@ -8,7 +8,7 @@ import Data.Lens.Iso.Newtype (_Newtype)
 import Data.Lens.Record (prop)
 import Data.Newtype (class Newtype)
 import Type.Proxy (Proxy(..))
-import Ledger.Index (UtxoIndex, _UtxoIndex)
+import Ledger.Index.Internal (UtxoIndex, _UtxoIndex)
 import Plutus.V1.Ledger.Tx (TxOut, TxOutRef)
 import Plutus.V1.Ledger.TxId (TxId)
 import Plutus.V1.Ledger.Value (CurrencySymbol, TokenName, _CurrencySymbol, _TokenName)