Merge pull request #304 from tweag/bump-cuddle-1.8.0.0

Bump `cuddle` to `1.8.0.0`

Author: joaosreis

flake.lock

@@ -49,4 +49,6 @@ validSpecs :: Map.Map SomeNamespaceSymbol (CTreeRoot Codec.CBOR.Cuddle.CDDL.Reso
 validateBytesAgainst :: ByteString -> Text -> Text -> Maybe (Evidenced ValidationTrace)
 validateBytesAgainst bytes namespace name = do
   cddl <- namespaceSymbolFromText namespace >>= flip Map.lookup validSpecs
-  pure $ validateCBOR bytes (Name name) (mapIndex cddl)
+  case validateCBOR bytes (Name name) (mapIndex cddl) of
+    Right res -> pure res
+    Left _ -> Nothing

scls-cardano/cddl-validate/Cardano/SCLS/CDDL/Validate.hs

@@ -48,7 +48,7 @@ library
   build-depends:
     base >=4.18 && <5,
     containers,
-    cuddle >=1.7,
+    cuddle >=1.8,
     heredoc >=0.2,
     scls-core,
     text,
@@ -68,7 +68,7 @@ library validate
     base >=4.18 && <5,
     bytestring,
     containers,
-    cuddle >=1.7,
+    cuddle >=1.8,
     scls-cardano,
     scls-core,
     text,
@@ -90,7 +90,7 @@ library testlib
     base16-bytestring,
     bytestring,
     cborg,
-    cuddle >=1.7,
+    cuddle >=1.8,
     hspec,
     hspec-expectations,
     scls-cardano:{validate},
@@ -108,7 +108,7 @@ executable gen-cddl
   main-is: Main.hs
   build-depends:
     base >=4.18 && <5,
-    cuddle >=1.7,
+    cuddle >=1.8,
     directory >=1,
     filepath >=1.4,
     prettyprinter,
@@ -134,7 +134,7 @@ test-suite scls-cardano-test
     bytestring,
     cborg,
     containers,
-    cuddle >=1.7,
+    cuddle >=1.8,
     directory,
     filepath,
     hspec,

scls-cardano/scls-cardano.cabal

@@ -66,7 +66,8 @@ propReferenceAcceptsCBOR genSpec validateSpec direction = do
 
   let result = validateCBOR cbor (Name (T.pack "record_entry")) (mapIndex validateSpec)
   case result of
-    Evidenced SValid _ ->
+    Left e -> pure $ Left $ FailureInfo direction (TE.decodeUtf8 $ Base16.encode cbor) (T.pack $ show e)
+    Right (Evidenced SValid _) ->
       pure $ Right ()
-    Evidenced SInvalid trc ->
+    Right (Evidenced SInvalid trc) ->
       pure $ Left $ FailureInfo direction (TE.decodeUtf8 $ Base16.encode cbor) (T.pack $ showValidationTrace trc)

scls-cardano/test/Conformance.hs

@@ -43,5 +43,5 @@ library
     base >=4.18 && <5,
     bytestring,
     cborg,
-    cuddle >=1.7,
+    cuddle >=1.8,
     mempack-scls,

scls-core/scls-core.cabal

@@ -117,7 +117,7 @@ test-suite scls-format-test
     cborg >=0.2,
     containers,
     crypton,
-    cuddle >=1.7,
+    cuddle >=1.8,
     filepath,
     hspec,
     hspec-expectations,

scls-format/scls-format.cabal

@@ -44,7 +44,7 @@ library
     cborg,
     containers,
     crypton,
-    cuddle >=1.7,
+    cuddle >=1.8,
     directory,
     filepath,
     mempack-scls,

scls-util/scls-util.cabal

@@ -245,8 +245,9 @@ validateCDDLAgainst :: CTreeRoot MonoReferenced -> (Int, GenericCBOREntry n) ->
 validateCDDLAgainst cddl (seqNum, GenericCBOREntry (ChunkEntry _key cTerm)) =
   let name = Name (T.pack "record_entry")
    in case validateCBOR (getEncodedBytes cTerm) name (mapIndex cddl) of
-        Evidenced SValid _ -> Nothing
-        Evidenced SInvalid trc -> Just (CDDLValidationError seqNum trc)
+        Left e -> Just (CBORParseError seqNum . T.pack $ show e)
+        Right (Evidenced SValid _) -> Nothing
+        Right (Evidenced SInvalid trc) -> Just (CDDLValidationError seqNum trc)
 
 -- | Format an error for display.
 formatError :: CheckError -> String