Reorganised ouroboros-network packages

.github/workflows/build.yml

@@ -97,14 +97,11 @@ jobs:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
         key: ${{ steps.cache-dependencies.outputs.cache-primary-key }}
 
-    - name: Build projects [build]
+    - name: Build all packages
       run: cabal build all -j
 
     # Test network packages
 
-    - name: ouroboros-network-api [test]
-      run: cabal run ouroboros-network-api:test
-
     - name: ntp-client [test]
       run: cabal run ntp-client:test -- +RTS -maxN2 -RTS
 
@@ -115,29 +112,48 @@ jobs:
       # TODO: issue #4635 to enable `+RTS -N`
       run: cabal run network-mux:test
 
-    - name: ourobors-network-testing [test]
-      run: cabal run ouroboros-network-testing:test -- +RTS -maxN2 -RTS
+    - name: ouroboros-network [api-tests]
+      run: cabal run ouroboros-network:api-tests
+
+    - name: ourobors-network [tests-lib-tests]
+      run: cabal run ouroboros-network:tests-lib-tests -- +RTS -maxN2 -RTS
 
-    - name: ourobors-network-framework [io-tests]
+    - name: ourobors-network [framework-io-tests]
       # TODO: enable `+RTS -N`
-      run: cabal run ouroboros-network-framework:io-tests
+      run: cabal run ouroboros-network:framework-io-tests
+
+    - name: ourobors-network [framework-sim-tests]
+      if: runner.os != 'Windows'
+      run: cabal run ouroboros-network:framework-sim-tests -- +RTS -maxN2 -RTS
+
+    - name: ouroboros-network [protocols-tests]
+      run: cabal run ouroboros-network:protocols-tests -- +RTS -maxN2 -RTS
 
-    - name: ourobors-network-framework [sim-tests]
+    - name: ouroboros-network [ouroboros-network-io-tests]
+      run: cabal run ouroboros-network:ouroboros-network-io-tests -- +RTS -maxN2 -RTS
+
+    - name: ouroboros-network [ouroboros-network-sim-tests]
       if: runner.os != 'Windows'
-      run: cabal run ouroboros-network-framework:sim-tests -- +RTS -maxN2 -RTS
+      run: cabal run ouroboros-network:ouroboros-network-sim-tests -- +RTS -maxN2 -RTS
 
-    - name: ouroboros-network-protocols [test]
-      run: cabal run ouroboros-network-protocols:test -- +RTS -maxN2 -RTS
+    - name: cardano-diffusion [protocols-tests]
+      if: runner.os != 'Windows'
+      run: cabal run cardano-diffusion:protocols-tests -- +RTS -maxN2 -RTS
 
-    - name: ouroboros-network [io-tests]
-      run: cabal run ouroboros-network:io-tests -- +RTS -maxN2 -RTS
+    - name: cardano-diffusion [api-tests]
+      if: runner.os != 'Windows'
+      run: cabal run cardano-diffusion:api-tests -- +RTS -maxN2 -RTS
+
+    - name: cardano-diffusion:protocols-tests
+      if: runner.os != 'Windows'
+      run: cabal run cardano-diffusion:protocols-tests -- +RTS -maxN2 -RTS
 
-    - name: ouroboros-network [sim-tests]
+    - name: cardano-diffusion [cardano-diffusion-sim-test]
       if: runner.os != 'Windows'
-      run: cabal run ouroboros-network:sim-tests -- +RTS -maxN2 -RTS
+      run: cabal run cardano-diffusion:cardano-diffusion-sim-tests -- +RTS -maxN2 -RTS
 
-    - name: dmq-node [test]
-      run: cabal run dmq-node:dmq-test -- +RTS -maxN2 -RTS
+    - name: dmq-node [dmq-tests]
+      run: cabal run dmq-node:dmq-tests -- +RTS -maxN2 -RTS
 
     # Uncomment the following back in for debugging. Remember to launch a `pwsh` from
     # the tmux session to debug `pwsh` issues. And be reminded that the `/msys2` and

cabal.project

@@ -24,13 +24,8 @@ packages: ./cardano-ping
           ./monoidal-synchronisation
           ./network-mux
           ./ouroboros-network
-          ./ouroboros-network-api
-          ./ouroboros-network-framework
-          ./ouroboros-network-mock
-          ./ouroboros-network-protocols
-          ./ouroboros-network-testing
+          ./cardano-diffusion
           ./ntp-client
-          ./cardano-client
           ./dmq-node
           ./acts-generic
 

cardano-diffusion/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Revision history for cardano-diffusion
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.

cardano-diffusion/api/lib/Cardano/Network/FetchMode.hs

@@ -0,0 +1,33 @@
+{-# LANGUAGE LambdaCase #-}
+
+module Cardano.Network.FetchMode
+  ( mkReadFetchMode
+  , ConsensusMode (..)
+  , LedgerStateJudgement (..)
+  , module Ouroboros.Network.BlockFetch.ConsensusInterface
+  ) where
+
+import Data.Functor ((<&>))
+
+import Cardano.Network.ConsensusMode
+import Cardano.Network.LedgerStateJudgement
+import Ouroboros.Network.BlockFetch.ConsensusInterface
+
+
+-- | Construct 'readFetchMode' for 'BlockFetchConsensusInterface' by branching
+-- on the 'ConsensusMode'.
+mkReadFetchMode
+  :: Functor m
+  => ConsensusMode
+  -> m LedgerStateJudgement
+     -- ^ Used for 'GenesisMode'.
+  -> m PraosFetchMode
+     -- ^ Used for 'PraosMode' for backwards compatibility.
+  -> m FetchMode
+mkReadFetchMode consensusMode getLedgerStateJudgement getFetchMode =
+    case consensusMode of
+      GenesisMode -> getLedgerStateJudgement <&> \case
+        YoungEnough -> PraosFetchMode FetchModeDeadline
+        TooOld      -> FetchModeGenesis
+      PraosMode   -> PraosFetchMode <$> getFetchMode
+

cardano-diffusion/api/lib/Cardano/Network/LedgerStateJudgement.hs

@@ -0,0 +1,14 @@
+{-# LANGUAGE DeriveGeneric              #-}
+{-# LANGUAGE DerivingStrategies         #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Cardano.Network.LedgerStateJudgement (LedgerStateJudgement (..)) where
+
+import GHC.Generics (Generic)
+import NoThunks.Class (NoThunks)
+
+-- | Wether the node is caught up or fell too far behind the chain
+data LedgerStateJudgement = YoungEnough | TooOld
+  deriving (Eq, Show, Generic)
+
+instance NoThunks LedgerStateJudgement

ouroboros-network-api/src/Ouroboros/Network/NodeToClient/Version.hs → cardano-diffusion/api/lib/Cardano/Network/NodeToClient/Version.hs

@@ -3,7 +3,7 @@
 {-# LANGUAGE LambdaCase     #-}
 {-# LANGUAGE NamedFieldPuns #-}
 
-module Ouroboros.Network.NodeToClient.Version
+module Cardano.Network.NodeToClient.Version
   ( NodeToClientVersion (..)
   , NodeToClientVersionData (..)
   , nodeToClientCodecCBORTerm