Post-process logs paranoically

Author: geo2a

booster/tools/booster/Proxy.hs

@@ -216,11 +216,12 @@ respondEither cfg@ProxyConfig{statsVar, boosterState} booster kore req = case re
                             SimplifyResult
                                 { state = koreRes.state
                                 , logs =
-                                    combineLogs
-                                        [ timing
-                                        , boosterRes.logs
-                                        , map RPCLog.logEntryEraseTerms <$> koreRes.logs
-                                        ]
+                                    postProcessLogs
+                                        <$> combineLogs
+                                            [ timing
+                                            , boosterRes.logs
+                                            , koreRes.logs
+                                            ]
                                 }
                     koreError ->
                         -- can only be an error
@@ -287,6 +288,9 @@ respondEither cfg@ProxyConfig{statsVar, boosterState} booster kore req = case re
                  in Execute result'
             other -> other
 
+    postProcessLogs :: [RPCLog.LogEntry] -> [RPCLog.LogEntry]
+    postProcessLogs !logs = map RPCLog.logEntryEraseTerms . filter (not . isSimplificationLogEntry) $ logs
+
     executionLoop ::
         LogSettings ->
         KoreDefinition ->
@@ -319,7 +323,12 @@ respondEither cfg@ProxyConfig{statsVar, boosterState} booster kore req = case re
                         Left logsOnly -> do
                             -- state was simplified to \bottom, return vacuous
                             Log.logInfoNS "proxy" "Vacuous state after simplification"
-                            pure . Right . Execute $ makeVacuous logsOnly boosterResult
+                            pure . Right . Execute $
+                                makeVacuous
+                                    ( postProcessLogs
+                                        <$> logsOnly
+                                    )
+                                    boosterResult
                         Right (simplifiedBoosterState, boosterStateSimplificationLogs) -> do
                             let accumulatedLogs =
                                     combineLogs
@@ -333,7 +342,8 @@ respondEither cfg@ProxyConfig{statsVar, boosterState} booster kore req = case re
                                 ( currentDepth + boosterResult.depth
                                 , time + bTime
                                 , koreTime
-                                , accumulatedLogs
+                                , postProcessLogs
+                                    <$> accumulatedLogs
                                 )
                                 r{ExecuteRequest.state = execStateToKoreJson simplifiedBoosterState}
                 -- if we stop for a reason in fallbackReasons (default [Aborted, Stuck, Branching],
@@ -348,7 +358,7 @@ respondEither cfg@ProxyConfig{statsVar, boosterState} booster kore req = case re
                         Left logsOnly -> do
                             -- state was simplified to \bottom, return vacuous
                             Log.logInfoNS "proxy" "Vacuous state after simplification"
-                            pure . Right . Execute $ makeVacuous logsOnly boosterResult
+                            pure . Right . Execute $ makeVacuous (postProcessLogs <$> logsOnly) boosterResult
                         Right (simplifiedBoosterState, boosterStateSimplificationLogs) -> do
                             -- attempt to do one step in the old backend
                             (kResult, kTime) <-
@@ -378,14 +388,15 @@ respondEither cfg@ProxyConfig{statsVar, boosterState} booster kore req = case re
                                                 [ rpcLogs
                                                 , boosterResult.logs
                                                 , boosterStateSimplificationLogs
-                                                , map RPCLog.logEntryEraseTerms . filter (not . isSimplificationLogEntry) <$> koreResult.logs
+                                                , koreResult.logs
                                                 , fallbackLog
                                                 ]
                                         loopState newLogs =
                                             ( currentDepth + boosterResult.depth + koreResult.depth
                                             , time + bTime + kTime
                                             , koreTime + kTime
-                                            , combineLogs $ accumulatedLogs : newLogs
+                                            , postProcessLogs
+                                                <$> combineLogs (accumulatedLogs : newLogs)
                                             )
                                         continueWith newLogs nextState =
                                             executionLoop
@@ -451,12 +462,13 @@ respondEither cfg@ProxyConfig{statsVar, boosterState} booster kore req = case re
                                                                 result
                                                                     { depth = currentDepth + boosterResult.depth + koreResult.depth
                                                                     , logs =
-                                                                        combineLogs
-                                                                            [ rpcLogs
-                                                                            , boosterResult.logs
-                                                                            , map RPCLog.logEntryEraseTerms <$> result.logs
-                                                                            , fallbackLog
-                                                                            ]
+                                                                        postProcessLogs
+                                                                            <$> combineLogs
+                                                                                [ rpcLogs
+                                                                                , boosterResult.logs
+                                                                                , map RPCLog.logEntryEraseTerms <$> result.logs
+                                                                                , fallbackLog
+                                                                                ]
                                                                     }
                                 -- can only be an error at this point
                                 res -> pure res
@@ -477,7 +489,7 @@ respondEither cfg@ProxyConfig{statsVar, boosterState} booster kore req = case re
                                 ( currentDepth + boosterResult.depth
                                 , time + bTime
                                 , koreTime
-                                , combineLogs $ rpcLogs : boosterResult.logs : newLogs
+                                , postProcessLogs <$> combineLogs (rpcLogs : boosterResult.logs : newLogs)
                                 )
                                 r{ExecuteRequest.state = nextState}
                         Right result -> do
@@ -486,7 +498,7 @@ respondEither cfg@ProxyConfig{statsVar, boosterState} booster kore req = case re
                                 Execute
                                     result
                                         { depth = currentDepth + boosterResult.depth
-                                        , logs = combineLogs [rpcLogs, result.logs]
+                                        , logs = postProcessLogs <$> combineLogs [rpcLogs, result.logs]
                                         }
             -- can only be an error at this point
             res -> pure res