Revert "Validate ocert counter, change encoding of validation failures"

only encoding changes were reverted - this reversion should be undone
later when API is more stable

This reverts commit a2807a6.

Author: crocodile-dentist

dmq-node/src/DMQ/Protocol/LocalMsgSubmission/Codec.hs

@@ -11,10 +11,8 @@ import Codec.CBOR.Read qualified as CBOR
 import Control.Monad.Class.MonadST
 import Data.ByteString.Lazy (ByteString)
 import Data.Text qualified as T
-import Data.Tuple (swap)
 import Text.Printf
 
-import Cardano.Binary
 import Cardano.KESAgent.KES.Crypto (Crypto (..))
 
 import DMQ.Protocol.LocalMsgSubmission.Type
@@ -38,53 +36,18 @@ codecLocalMsgSubmission =
 
 encodeReject :: TxValidationFail (Sig crypto) -> CBOR.Encoding
 encodeReject = \case
-  SigInvalid reason -> CBOR.encodeListLen 2 <> CBOR.encodeWord8 0 <> e
-    where
-      e = case reason of
-        InvalidKESSignature ocertKESPeriod sigKESPeriod err ->  mconcat [
-          CBOR.encodeListLen 4, CBOR.encodeWord8 0, toCBOR ocertKESPeriod, toCBOR sigKESPeriod, CBOR.encodeString (T.pack err)
-          ]
-        InvalidSignatureOCERT ocertN sigKESPeriod err -> mconcat [
-          CBOR.encodeListLen 4, CBOR.encodeWord8 1, CBOR.encodeWord64 ocertN, toCBOR sigKESPeriod, CBOR.encodeString (T.pack err)
-          ]
-        KESBeforeStartOCERT startKESPeriod sigKESPeriod -> mconcat [
-          CBOR.encodeListLen 3, CBOR.encodeWord8 2, toCBOR startKESPeriod, toCBOR sigKESPeriod
-          ]
-        KESAfterEndOCERT endKESPeriod sigKESPeriod ->  mconcat [
-          CBOR.encodeListLen 3, CBOR.encodeWord8 3, toCBOR endKESPeriod, toCBOR sigKESPeriod
-          ]
-        UnrecognizedPool -> CBOR.encodeListLen 1 <> CBOR.encodeWord8 4
-        NotInitialized   -> CBOR.encodeListLen 1 <> CBOR.encodeWord8 5
-        ClockSkew        -> CBOR.encodeListLen 1 <> CBOR.encodeWord8 6
-        InvalidOCertCounter seen received
-          -> mconcat
-              [CBOR.encodeListLen 3, CBOR.encodeWord8 7, CBOR.encodeWord64 seen, CBOR.encodeWord64 received]
-  SigDuplicate      -> CBOR.encodeListLen 1 <> CBOR.encodeWord8 1
-  SigExpired        -> CBOR.encodeListLen 1 <> CBOR.encodeWord8 2
+  SigInvalid reason -> CBOR.encodeListLen 2 <> CBOR.encodeWord 0 <> CBOR.encodeString (T.pack . show $ reason)
+  SigDuplicate      -> CBOR.encodeListLen 1 <> CBOR.encodeWord 1
+  SigExpired        -> CBOR.encodeListLen 1 <> CBOR.encodeWord 2
   SigResultOther reason
-                    -> CBOR.encodeListLen 2 <> CBOR.encodeWord8 3 <> CBOR.encodeString reason
+                    -> CBOR.encodeListLen 2 <> CBOR.encodeWord 3 <> CBOR.encodeString (T.pack . show $ reason)
 
 decodeReject :: CBOR.Decoder s (TxValidationFail (Sig crypto))
 decodeReject = do
   len <- CBOR.decodeListLen
-  tag <- CBOR.decodeWord8
+  tag <- CBOR.decodeWord
   case (tag, len) of
-    (0, 2) -> SigInvalid <$> decSigValidError
-      where
-        decSigValidError :: CBOR.Decoder s SigValidationError
-        decSigValidError = do
-          lenTag <- (,) <$> CBOR.decodeListLen <*> CBOR.decodeWord8
-          case swap lenTag of
-            (0, 4) -> InvalidKESSignature <$> fromCBOR <*> fromCBOR <*> (T.unpack <$> CBOR.decodeString)
-            (1, 4) -> InvalidSignatureOCERT <$> CBOR.decodeWord64 <*> fromCBOR <*> (T.unpack <$> CBOR.decodeString)
-            (2, 3) -> KESBeforeStartOCERT <$> fromCBOR <*> fromCBOR
-            (3, 4) -> KESAfterEndOCERT <$> fromCBOR <*> fromCBOR
-            (4, 1) -> pure UnrecognizedPool
-            (5, 1) -> pure NotInitialized
-            (6, 1) -> pure ClockSkew
-            (7, 3) -> InvalidOCertCounter <$> fromCBOR <*> fromCBOR
-            _otherwise -> fail $ printf "unrecognized (tag,len) = (%d, %d) when decoding SigInvalid tag" tag len
-
+    (0, 2)     -> {- FIXME SigInvalid -} SigResultOther <$> CBOR.decodeString
     (1, 1)     -> pure SigDuplicate
     (2, 1)     -> pure SigExpired
     (3, 2)     -> SigResultOther <$> CBOR.decodeString