Fix

Author: tdammers

cabal.project

@@ -22,7 +22,7 @@ packages: ./typed-protocols
 
 source-repository-package
   type: git
-  location: git@github.com:input-output-hk/serdoc
+  location: https://github.com/input-output-hk/serdoc
   tag: 2cd52c768c32c6c61ccc355bc8cfd8e67f25d8ca
   subdir: serdoc-core
 

typed-protocols-doc/test/Network/TypedProtocol/Tests/ControlProtocol.hs

@@ -18,22 +18,17 @@
 module Network.TypedProtocol.Tests.ControlProtocol where
 
 import Network.TypedProtocol.Documentation
-import Network.TypedProtocol.Documentation.TestProtocol (TestCodec (..))
+import Network.TypedProtocol.Documentation.TestProtocol (TestCodec)
 
 import Data.ByteString ( ByteString )
-import qualified Data.ByteString as BS
 import Data.Kind
-import Data.Proxy ( Proxy (..) )
 import Data.SerDoc.Class
 import Data.SerDoc.Info
 import Data.SerDoc.TH
 import Data.Text ( Text )
-import qualified Data.Text as Text
 import Data.Typeable
 import Data.Word
-import GHC.Generics ( Generic )
 import Network.TypedProtocol.Core
-import Data.Text.Encoding
 
 data AgentInfo c =
   AgentInfo
@@ -75,10 +70,10 @@ newtype VersionIdentifier = VersionIdentifier { versionIdentifierData :: ByteStr
   deriving (Show, Eq, Ord)
 
 instance HasInfo (TestCodec ()) VersionIdentifier where
-  info codec _ = basicField "Bytes" (FixedSize 32)
+  info _ _ = basicField "Bytes" (FixedSize 32)
 
 instance HasInfo (TestCodec ()) (FakeKey k) where
-  info codec _ = basicField "Bytes" (FixedSize 128)
+  info _ _ = basicField "Bytes" (FixedSize 128)
 
 data BootstrapInfo =
   BootstrapInfo

typed-protocols-doc/test/Network/TypedProtocol/Tests/Documentation.hs

@@ -31,48 +31,48 @@ p_correctAgencies :: ProtocolDescription (TestCodec ()) -> Property
 p_correctAgencies d =
   counterexample (show stateAgencyMap) .
   once $
-  counterexample "EndState" (lookup "EndState" stateAgencyMap === Just NobodyAgencyID)
+  counterexample "EndState" (lookup (State "EndState") stateAgencyMap === Just NobodyAgencyID)
   .&&.
-  counterexample "InitialState" (lookup "InitialState" stateAgencyMap === Just ServerAgencyID)
+  counterexample "InitialState" (lookup (State "InitialState") stateAgencyMap === Just ServerAgencyID)
   .&&.
-  counterexample "IdleState" (lookup "IdleState" stateAgencyMap === Just ServerAgencyID)
+  counterexample "IdleState" (lookup (State "IdleState") stateAgencyMap === Just ServerAgencyID)
   .&&.
-  counterexample "WaitForConfirmationState" (lookup "WaitForConfirmationState" stateAgencyMap === Just ClientAgencyID)
+  counterexample "WaitForConfirmationState" (lookup (State "WaitForConfirmationState") stateAgencyMap === Just ClientAgencyID)
   .&&.
-  counterexample "WaitForInfoState" (lookup "WaitForInfoState" stateAgencyMap === Just ClientAgencyID)
+  counterexample "WaitForInfoState" (lookup (State "WaitForInfoState") stateAgencyMap === Just ClientAgencyID)
   .&&.
-  counterexample "WaitForPublicKeyState" (lookup "WaitForPublicKeyState" stateAgencyMap === Just ClientAgencyID)
+  counterexample "WaitForPublicKeyState" (lookup (State "WaitForPublicKeyState") stateAgencyMap === Just ClientAgencyID)
   where
     stateAgencyMap = [(state, agency) | (state, _, agency) <- protocolStates d]
 
 p_correctStateTransitions :: ProtocolDescription (TestCodec ()) -> Property
 p_correctStateTransitions d =
   once $
-    checkMessage "VersionMessage" "InitialState" "IdleState"
+    checkMessage "VersionMessage" (State "InitialState") (State "IdleState")
     .&&.
-    checkMessage "GenStagedKeyMessage" "IdleState" "WaitForPublicKeyState"
+    checkMessage "GenStagedKeyMessage" (State "IdleState") (State "WaitForPublicKeyState")
     .&&.
-    checkMessage "QueryStagedKeyMessage" "IdleState" "WaitForPublicKeyState"
+    checkMessage "QueryStagedKeyMessage" (State "IdleState") (State "WaitForPublicKeyState")
     .&&.
-    checkMessage "DropStagedKeyMessage" "IdleState" "WaitForPublicKeyState"
+    checkMessage "DropStagedKeyMessage" (State "IdleState") (State "WaitForPublicKeyState")
     .&&.
-    checkMessage "PublicKeyMessage" "WaitForPublicKeyState" "IdleState"
+    checkMessage "PublicKeyMessage" (State "WaitForPublicKeyState") (State "IdleState")
     .&&.
-    checkMessage "InstallKeyMessage" "IdleState" "WaitForConfirmationState"
+    checkMessage "InstallKeyMessage" (State "IdleState") (State "WaitForConfirmationState")
     .&&.
-    checkMessage "InstallResultMessage" "WaitForConfirmationState" "IdleState"
+    checkMessage "InstallResultMessage" (State "WaitForConfirmationState") (State "IdleState")
     .&&.
-    checkMessage "RequestInfoMessage" "IdleState" "WaitForInfoState"
+    checkMessage "RequestInfoMessage" (State "IdleState") (State "WaitForInfoState")
     .&&.
-    checkMessage "InfoMessage" "WaitForInfoState" "IdleState"
+    checkMessage "InfoMessage" (State "WaitForInfoState") (State "IdleState")
     .&&.
-    checkMessage "AbortMessage" "InitialState" "EndState"
+    checkMessage "AbortMessage" (State "InitialState") (State "EndState")
     .&&.
-    checkMessage "EndMessage" "IdleState" "EndState"
+    checkMessage "EndMessage" (State "IdleState") (State "EndState")
     .&&.
-    checkMessage "ProtocolErrorMessage" "st" "EndState"
+    checkMessage "ProtocolErrorMessage" AnyState (State "EndState")
   where
-    checkMessage :: String -> String -> String -> Property
+    checkMessage :: String -> StateRef -> StateRef -> Property
     checkMessage msgName fromState toState =
       counterexample msgName $ do
         msg <- findMessage msgName