compile

IntersectMBO · Feb 14, 2019 · 66fe9d4 · 66fe9d4
1 parent 7f61526
commit 66fe9d4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/plutus-playground/plutus-playground-lib/src/Playground/API.hs b/plutus-playground/plutus-playground-lib/src/Playground/API.hs
@@ -31,7 +31,6 @@ import           GHC.Generics               (Generic)
 import qualified Language.Haskell.TH.Syntax as TH
 import           Ledger.Ada                 (Ada)
 import           Ledger.Types               (Blockchain, PubKey)
-import qualified Ledger.Types               as Ledger
 import           Servant.API                ((:<|>), (:>), JSON, Post, ReqBody)
 import           Text.Read                  (readMaybe)
 import           Wallet.Emulator.Types      (EmulatorEvent, Wallet)

diff --git a/plutus-playground/plutus-playground-lib/src/Playground/Interpreter/Util.hs b/plutus-playground/plutus-playground-lib/src/Playground/Interpreter/Util.hs
@@ -46,7 +46,7 @@ runTrace wallets actions =
               blockchain = _chainNewestFirst newState
               emulatorLog = _emulatorLog newState
               fundsDistribution =
-                Map.map (foldl' Ada.plus Ada.zero . fmap (Ada.fromValue . txOutValue) . view ownFunds) .
+                Map.map (foldl' (+) 0 . fmap (Ada.fromValue . txOutValue) . view ownFunds) .
                 view walletStates $
                 newState
            in case eRes of

diff --git a/plutus-playground/plutus-playground-server/src/Playground/Interpreter.hs b/plutus-playground/plutus-playground-server/src/Playground/Interpreter.hs
@@ -20,6 +20,7 @@ import qualified Data.Text                  as Text
 import qualified Data.Text.Internal.Search  as Text
 import qualified Data.Text.IO               as Text
 import           Ledger.Types               (Blockchain, Value)
+import           Ledger.Ada                 (Ada)
 import           Playground.API             (CompilationResult (CompilationResult), Evaluation (sourceCode),
                                              Expression (Action, Wait), Fn (Fn), FunctionSchema (FunctionSchema),
                                              FunctionSchema,
@@ -104,7 +105,7 @@ compile source = do
 runFunction ::
        (MonadMask m, MonadIO m, MonadError PlaygroundError m)
     => Evaluation
-    -> m (Blockchain, [EmulatorEvent], [(Wallet, Value)])
+    -> m (Blockchain, [EmulatorEvent], [(Wallet, Ada)])
 runFunction evaluation = do
     let source = sourceCode evaluation
     avoidUnsafe source
@@ -121,7 +122,7 @@ runFunction evaluation = do
                 JSON.eitherDecodeStrict . BS8.pack $ result :: Either String (Either PlaygroundError ( Blockchain
                                                                                                      , [EmulatorEvent]
                                                                                                      , [( Wallet
-                                                                                                        , Value)]))
+                                                                                                        , Ada)]))
         case decodeResult of
             Left err ->
                 throwError . OtherError $