leios-trace-hs: support indefinite length maps when decoding cbor

Author: Saizan

cabal.project

@@ -67,3 +67,11 @@ source-repository-package
     --sha256: WFEmGcnCdEXmo2MCC5g+C3laGjFaBnFksgHbFeAZUQo=
     subdir:
       generated
+
+source-repository-package
+    type: git
+    location: https://github.com/well-typed/cborg.git
+    tag: 7a4feb69bbbc09b0b29ed41ff3b9b8526e349c62
+    --sha256: 1YE6LP4YZNATEOfZ+/USDx/sIOi9rFbHmHVn6ONDrTc=
+    subdir:
+      cborg-json

leios-trace-hs/src/LeiosEvents.hs

@@ -144,10 +144,9 @@ decodeJSONL = mapMaybe decode . BSL8.lines
 encodeJSONL :: [TraceEvent] -> BSL8.ByteString
 encodeJSONL = BSL8.unlines . map encode
 
--- | Throws exception on CBOR decoding errors, skips values that do not decode as TraceEvent.
---   WARNING: seems not to be compatible with CBOR format produced by rust-sim.
-decodeCBOR :: BSL8.ByteString -> [TraceEvent]
-decodeCBOR = go
+-- | Generic version of @decodeCBOR@
+decodeCBORJSON :: FromJSON a => BSL8.ByteString -> [a]
+decodeCBORJSON = go
  where
   go s | BSL8.null s = []
   go s =
@@ -157,6 +156,11 @@ decodeCBOR = go
         Success x -> x : go s'
         Error _ -> go s'
 
+-- | Throws exception on CBOR decoding errors, skips values that do not decode as TraceEvent.
+--   WARNING: seems not to be compatible with CBOR format produced by rust-sim.
+decodeCBOR :: BSL8.ByteString -> [TraceEvent]
+decodeCBOR = decodeCBORJSON
+
 -- | Uses standard CBOR encoding of JSON values, encoded events are concatenated with no separator.
 encodeCBOR :: [TraceEvent] -> BSL8.ByteString
 encodeCBOR = BSL8.concat . map (toLazyByteString . encodeValue . toJSON)