Don't count JSON lists as recursion for trace recursion limiting

input-output-hk · Apr 8, 2021 · e3a8d0c · e3a8d0c
1 parent 38f9735
commit e3a8d0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/morpho-checkpoint-node/src/Morpho/Tracing/Verbosity.hs b/morpho-checkpoint-node/src/Morpho/Tracing/Verbosity.hs
@@ -21,7 +21,9 @@ limitRecursion n (Array xs)
   | n <= 0 = (Any True, String "[ ... ]")
   | otherwise =
     -- Also uses above-described Applicative instance
-    second Array $ traverse (limitRecursion (n - 1)) xs
+    -- We don't decrease n here because JSON lists are pretty slim. We're
+    -- mainly just concerned about objects for the recursion
+    second Array $ traverse (limitRecursion n) xs
 limitRecursion _ v = (Any False, v)
 
 -- | @recursionFilter minRecursion maxBytes value@ returns the result of

diff --git a/morpho-checkpoint-node/tests/Test/Morpho/Tracing.hs b/morpho-checkpoint-node/tests/Test/Morpho/Tracing.hs
@@ -35,7 +35,7 @@ returnsIfLimited = property $ \limit value ->
 
 valueDepth :: Value -> Int
 valueDepth (Object xs) = 1 + maximum (map valueDepth xs)
-valueDepth (Array xs) = 1 + maximum (map valueDepth xs)
+valueDepth (Array xs) = 0 + maximum (map valueDepth xs)
 valueDepth _ = 0
 
 limitDepth :: Property