WIP

Author: coot

typed-protocols-examples/src/Network/TypedProtocol/Stateful/ReqResp/Codec.hs

@@ -37,7 +37,7 @@ codecReqResp
 codecReqResp encodeReq decodeReq encodeResp decodeResp =
     Codec { encode, decode }
   where
-    encode :: State st'
+    encode :: State st
            -> Message (ReqResp req) st st'
            -> String
     encode _ (MsgReq req)   = "MsgReq " ++ encodeReq req ++ "\n"

typed-protocols-stateful-cborg/src/Network/TypedProtocol/Stateful/Codec/CBOR.hs

@@ -48,7 +48,7 @@ mkCodecCborStrictBS
   => (forall (st :: ps) (st' :: ps).
              StateTokenI st
           =>ActiveState st
-          => f st' -> Message ps st st' -> CBOR.Encoding)
+          => f st -> Message ps st st' -> CBOR.Encoding)
   -- ^ cbor encoder
 
   -> (forall (st :: ps) s.
@@ -90,7 +90,7 @@ mkCodecCborLazyBS
   => (forall (st :: ps) (st' :: ps).
              StateTokenI st
           => ActiveState st
-          => f st'
+          => f st
           -> Message ps st st' -> CBOR.Encoding)
   -- ^ cbor encoder
 

typed-protocols-stateful/src/Network/TypedProtocol/Stateful/Codec.hs

@@ -68,7 +68,7 @@ data Codec ps failure (f :: ps -> Type) m bytes = Codec {
        encode :: forall (st :: ps) (st' :: ps).
                  StateTokenI st
               => ActiveState st
-              => f st'
+              => f st
               -> Message ps st st'
               -> bytes,
 
@@ -180,8 +180,8 @@ prop_codecM
   => Codec ps failure f m bytes
   -> AnyMessage ps f
   -> m Bool
-prop_codecM Codec {encode, decode} (AnyMessage f f' (msg :: Message ps st st')) = do
-    r <- decode (stateToken :: StateToken st) f >>= runDecoder [encode f' msg]
+prop_codecM Codec {encode, decode} (AnyMessage f _f' (msg :: Message ps st st')) = do
+    r <- decode (stateToken :: StateToken st) f >>= runDecoder [encode f msg]
     case r :: Either failure (SomeMessage st) of
       Right (SomeMessage msg') -> return $ TP.AnyMessage msg' == TP.AnyMessage msg
       Left _                   -> return False
@@ -218,14 +218,14 @@ prop_codec_splitsM
   -> AnyMessage ps f
   -> m Bool
 prop_codec_splitsM splits
-                   Codec {encode, decode} (AnyMessage f f' (msg :: Message ps st st')) = do
+                   Codec {encode, decode} (AnyMessage f _f' (msg :: Message ps st st')) = do
     and <$> sequence
       [ do r <- decode (stateToken :: StateToken st) f >>= runDecoder bytes'
            case r :: Either failure (SomeMessage st) of
              Right (SomeMessage msg') -> return $ TP.AnyMessage msg' == TP.AnyMessage msg
              Left _                   -> return False
 
-      | let bytes = encode f' msg
+      | let bytes = encode f msg
       , bytes' <- splits bytes ]
 
 
@@ -258,12 +258,12 @@ prop_codecs_compatM
   -> AnyMessage ps f
   -> m Bool
 prop_codecs_compatM codecA codecB
-                    (AnyMessage f f' (msg :: Message ps st st')) =
-    getAll <$> do r <- decode codecB (stateToken :: StateToken st) f >>= runDecoder [encode codecA f' msg]
+                    (AnyMessage f _f' (msg :: Message ps st st')) =
+    getAll <$> do r <- decode codecB (stateToken :: StateToken st) f >>= runDecoder [encode codecA f msg]
                   case r :: Either failure (SomeMessage st) of
                     Right (SomeMessage msg') -> return $ All $ TP.AnyMessage msg' == TP.AnyMessage msg
                     Left _                   -> return $ All False
-            <> do r <- decode codecA (stateToken :: StateToken st) f >>= runDecoder [encode codecB f' msg]
+            <> do r <- decode codecA (stateToken :: StateToken st) f >>= runDecoder [encode codecB f msg]
                   case r :: Either failure (SomeMessage st) of
                     Right (SomeMessage msg') -> return $ All $ TP.AnyMessage msg' == TP.AnyMessage msg
                     Left _                   -> return $ All False