wrong block

Author: isovector

ouroboros-consensus-diffusion/app/conformance-test-runner/Main.hs

@@ -1,3 +1,7 @@
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE TypeSynonymInstances  #-}
+
 module Main (main) where
 
 import qualified Data.Map.Merge.Lazy as M
@@ -29,6 +33,9 @@ import Server (run)
 import System.Environment (getArgs)
 import Test.Consensus.PointSchedule (PointSchedule (..))
 import Test.Consensus.PointSchedule.Peers (PeerId (..), Peers (Peers), getPeerIds)
+import Test.Util.TestBlock
+import Ouroboros.Consensus.Node.Serialisation
+import Ouroboros.Consensus.Block.Abstract
 
 testPointSchedule :: PointSchedule blk
 testPointSchedule =
@@ -84,6 +91,8 @@ main = do
 zipMaps :: Ord k => Map k a -> Map k b -> Map k (a, b)
 zipMaps = M.merge M.dropMissing M.dropMissing $ M.zipWithMatched $ const (,)
 
+instance SerialiseNodeToNode TestBlock (Header TestBlock)
+
 runServer :: IO ()
 runServer = do
   let peerMap = buildPeerMap 6001 testPointSchedule

ouroboros-consensus-diffusion/app/conformance-test-runner/Server.hs

@@ -7,6 +7,8 @@
 
 module Server (run) where
 
+import Ouroboros.Consensus.Node.Serialisation
+import Ouroboros.Consensus.Node.ProtocolInfo (NumCoreNodes (..))
 import Test.Consensus.PeerSimulator.Resources (PeerResources)
 import Control.ResourceRegistry
 import Control.Tracer
@@ -34,6 +36,8 @@ import qualified Ouroboros.Network.Protocol.Handshake as Handshake
 import qualified Ouroboros.Network.Server.Simple as Server
 import qualified Ouroboros.Network.Snocket as Snocket
 import Ouroboros.Network.Socket (SomeResponderApplication (..), configureSocket)
+import Test.Util.TestBlock (TestBlock)
+import qualified Test.Util.TestBlock as TB
 
 -- | Glue code for using just the bits from the Diffusion Layer that we need in
 -- this context.
@@ -67,7 +71,7 @@ run ::
   ( SupportedNetworkProtocolVersion blk
   , SerialiseNodeToNodeConstraints blk
   , ConfigSupportsNode blk
-  , blk ~ SimpleBlock SimpleMockCrypto SimplePraosRuleExt
+  , blk ~ TestBlock
   ) =>
   PeerResources IO blk ->
   -- | A TMVar for the chainsync channel that we will fill in once the node connects.
@@ -78,11 +82,11 @@ run ::
   IO Void
 run res csChanTMV bfChanTMV sockAddr = withRegistry \_registry ->
   serve sockAddr
-    $ peerSimServer @_ @(SimpleBlock SimpleMockCrypto SimplePraosRuleExt)
+    $ peerSimServer @_ @TestBlock
       res
       csChanTMV
       bfChanTMV
-      SimpleCodecConfig
+      TB.TestBlockCodecConfig
       encodeRemoteAddress
       decodeRemoteAddress
-    $ getNetworkMagic @(SimpleBlock SimpleMockCrypto SimplePraosRuleExt) SimpleBlockConfig
+    $ getNetworkMagic @TestBlock $ TB.TestBlockConfig $ NumCoreNodes 0

ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal

@@ -343,7 +343,7 @@ executable conformance-test-runner
     containers,
     optparse-applicative,
     ouroboros-network:{ouroboros-network, orphan-instances},
-    ouroboros-consensus:{ouroboros-consensus, unstable-mock-block},
+    ouroboros-consensus:{ouroboros-consensus, unstable-mock-block, unstable-consensus-testlib},
     ouroboros-network-api,
     unstable-consensus-conformance-testlib,
     aeson,

ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/TestBlock.hs

@@ -226,6 +226,13 @@ data Validity = Valid | Invalid
   deriving stock (Show, Eq, Ord, Enum, Bounded, Generic)
   deriving anyclass (Serialise, NoThunks, ToExpr)
 
+
+instance SupportedNetworkProtocolVersion (TestBlockWith ptype) where
+  supportedNodeToNodeVersions _ = foldMap (flip Map.singleton ()) [minBound .. maxBound]
+  supportedNodeToClientVersions _ = foldMap (flip Map.singleton ()) [minBound .. maxBound]
+
+  latestReleasedNodeVersion = latestReleasedNodeVersionDefault
+
 -- | Test block parametrized on the payload type
 --
 -- For blocks without payload see the 'TestBlock' type alias.