plutus-playground: Delete unused field from EvaluationResult (#2594)

* plutus-playground: Delete unused field from EvaluationResult
IntersectMBO · Jan 14, 2021 · 5a858c2 · 5a858c2
1 parent de06e3d
commit 5a858c2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/playground-common/src/Playground/Interpreter/Util.hs b/playground-common/src/Playground/Interpreter/Util.hs
@@ -100,8 +100,7 @@ evaluationResultFold :: [Wallet] -> EmulatorEventFoldM effs EvaluationResult
 evaluationResultFold wallets =
     let pkh wallet = (pubKeyHash (walletPubKey wallet), wallet)
     in Playground.Types.EvaluationResult
-            <$> L.generalize (reverse <$> Folds.blockchain)
-            <*> L.generalize (reverse <$> Folds.annotatedBlockchain)
+            <$> L.generalize (reverse <$> Folds.annotatedBlockchain)
             <*> L.generalize (filter isInteresting <$> Folds.emulatorLog)
             <*> renderInstanceTrace (walletInstanceTag <$> wallets)
             <*> fmap (fmap (uncurry SimulatorWallet) . Map.toList) (funds wallets)

diff --git a/playground-common/src/Playground/Types.hs b/playground-common/src/Playground/Types.hs
@@ -26,7 +26,7 @@ import           GHC.Generics                                    (Generic)
 import           Language.Haskell.Interpreter                    (CompilationError, SourceCode)
 import qualified Language.Haskell.Interpreter                    as HI
 import           Language.Plutus.Contract.Effects.ExposeEndpoint (EndpointDescription)
-import           Ledger                                          (PubKeyHash, Tx, fromSymbol, pubKeyHash)
+import           Ledger                                          (PubKeyHash, fromSymbol, pubKeyHash)
 import qualified Ledger.Ada                                      as Ada
 import           Ledger.Scripts                                  (ValidatorHash)
 import           Ledger.Slot                                     (Slot)
@@ -134,8 +134,7 @@ pubKeys Evaluation {..} = pubKeyHash . walletPubKey . simulatorWalletWallet <$>
 
 data EvaluationResult =
     EvaluationResult
-        { resultBlockchain  :: [[Tx]] -- ^ The blockchain, newest blocks first
-        , resultRollup      :: [[AnnotatedTx]] -- ^ Annotated blockchain, newest blocks first
+        { resultRollup      :: [[AnnotatedTx]] -- ^ Annotated blockchain, newest blocks first
         , emulatorLog       :: [EmulatorEvent] -- ^ The emulator log, newest events first
         , emulatorTrace     :: Text
         , fundsDistribution :: [SimulatorWallet]

diff --git a/plutus-playground-client/src/Types.purs b/plutus-playground-client/src/Types.purs
@@ -317,9 +317,6 @@ _createGistResult = _Newtype <<< prop (SProxy :: SProxy "createGistResult")
 _gistUrl :: Lens' State (Maybe String)
 _gistUrl = _Newtype <<< prop (SProxy :: SProxy "gistUrl")
 
-_resultBlockchain :: Lens' EvaluationResult Blockchain
-_resultBlockchain = _Newtype <<< prop (SProxy :: SProxy "resultBlockchain")
-
 _walletKeys :: Lens' EvaluationResult (Array (JsonTuple PubKeyHash Wallet))
 _walletKeys = _Newtype <<< prop (SProxy :: SProxy "walletKeys")
 

diff --git a/plutus-playground-server/test/Playground/UsecasesSpec.hs b/plutus-playground-server/test/Playground/UsecasesSpec.hs
@@ -42,7 +42,7 @@ import           Playground.Types                                (CompilationRes
                                                                   SimulatorWallet (SimulatorWallet), adaCurrency,
                                                                   argument, argumentValues, caller, emulatorLog,
                                                                   endpointDescription, fundsDistribution, program,
-                                                                  resultBlockchain, simulatorWalletBalance,
+                                                                  resultRollup, simulatorWalletBalance,
                                                                   simulatorWalletWallet, sourceCode, walletKeys,
                                                                   wallets)
 import           Playground.Usecases                             (crowdFunding, errorHandling, game, vesting)
@@ -51,6 +51,7 @@ import           Test.Tasty                                      (TestTree, test
 import           Test.Tasty.HUnit                                (Assertion, assertEqual, assertFailure, testCase)
 import           Wallet.Emulator.Types                           (Wallet (Wallet))
 import           Wallet.Rollup.Render                            (showBlockchain)
+import           Wallet.Rollup.Types                             (AnnotatedTx (tx))
 
 tests :: TestTree
 tests =
@@ -223,7 +224,7 @@ hasFundsDistribution _ (Left err) = assertFailure $ show err
 hasFundsDistribution requiredDistribution (Right InterpreterResult {result = EvaluationResult {..}}) = do
     unless (requiredDistribution == fundsDistribution) $ do
         Text.putStrLn $
-            either id id $ showBlockchain walletKeys resultBlockchain
+            either id id $ showBlockchain walletKeys $ fmap (fmap tx) resultRollup
         traverse_ print $ reverse emulatorLog
     assertEqual "" requiredDistribution fundsDistribution