Fix a semantic merge conflict (#3075)

IntersectMBO · Apr 27, 2021 · 62be7a2 · 62be7a2
1 parent 5908b3b
commit 62be7a2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/plutus-pab.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/plutus-pab.nix
diff --git a/plutus-pab/plutus-pab.cabal b/plutus-pab/plutus-pab.cabal
@@ -257,6 +257,7 @@ executable plutus-uniswap
         base >=4.9 && <5,
         aeson -any,
         containers -any,
+        freer-extras -any,
         freer-simple -any,
         plutus-contract -any,
         plutus-ledger -any,

diff --git a/plutus-pab/uniswap/Main.hs b/plutus-pab/uniswap/Main.hs
@@ -16,6 +16,7 @@ module Main
 import           Control.Monad                           (forM, void)
 import           Control.Monad.Freer                     (Eff, Member, interpret, type (~>))
 import           Control.Monad.Freer.Error               (Error)
+import           Control.Monad.Freer.Extras.Log          (LogMsg)
 import           Control.Monad.IO.Class                  (MonadIO (..))
 import           Data.Aeson                              (FromJSON, Result (..), ToJSON, encode, fromJSON)
 import qualified Data.Map.Strict                         as Map
@@ -32,6 +33,7 @@ import           Plutus.PAB.Effects.Contract             (ContractEffect (..))
 import           Plutus.PAB.Effects.Contract.Builtin     (Builtin, SomeBuiltin (..), type (.\\))
 import qualified Plutus.PAB.Effects.Contract.Builtin     as Builtin
 import           Plutus.PAB.Effects.ContractTest.Uniswap as US
+import           Plutus.PAB.Monitoring.PABLogMsg         (PABMultiAgentMsg)
 import           Plutus.PAB.Simulator                    (SimulatorEffectHandlers)
 import qualified Plutus.PAB.Simulator                    as Simulator
 import           Plutus.PAB.Types                        (PABError (..))
@@ -95,6 +97,7 @@ instance Pretty UniswapContracts where
 
 handleUniswapContract ::
     ( Member (Error PABError) effs
+    , Member (LogMsg (PABMultiAgentMsg (Builtin UniswapContracts))) effs
     )
     => ContractEffect (Builtin UniswapContracts)
     ~> Eff effs