Separated Diffusion into P2P, NonP2P and Common

- P2P is the p2p-master branch Diffusion module - NonP2P is the master branch Diffusion module - Common contains data types that are common to both versions - Diffusion.hs indexes both P2P and NonP2P modules - Uniforms DiffusionTracers to accomodate p2p types switching - Uniforms DiffusionApplication to accomodate p2p types switching - Uniforms DiffusionArguments to accomodate p2p types switching - Renamed P2P and NonP2P DTracers, DApps, DArgs to DApplicationsExtra and DArgumentsExtra (these types fill the p2p polymorphic types in DiffusionApplication, DiffusionArguments and DiffusionTracers - General long lines cleanup Diffusion.hs now offers the needed API to ouroboros-consensus in a way that it is possible to pick between P2P and NonP2P Added ErrorPolicy to other-modules
IntersectMBO · Jun 10, 2021 · f97f9c7 · f97f9c7
1 parent 27d01fb
commit f97f9c7
Show file tree

Hide file tree

Showing 6 changed files with 2,346 additions and 1,292 deletions.
diff --git a/ouroboros-consensus/ouroboros-consensus.cabal b/ouroboros-consensus/ouroboros-consensus.cabal
@@ -238,6 +238,8 @@ library
                        -- Strict wrapper around SOP
                        Data.SOP.Strict
 
+  other-modules:       Ouroboros.Consensus.Node.ErrorPolicy
+
   default-language:    Haskell2010
   other-extensions:
                        BangPatterns

diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal
@@ -128,7 +128,10 @@ library
                        Ouroboros.Network.TxSubmission.Inbound
                        Ouroboros.Network.TxSubmission.Mempool.Reader
                        Ouroboros.Network.TxSubmission.Outbound
-  other-modules:       Ouroboros.Network.PeerSelection.Governor.ActivePeers
+  other-modules:       Ouroboros.Network.Diffusion.Common
+                       Ouroboros.Network.Diffusion.P2P
+                       Ouroboros.Network.Diffusion.NonP2P
+                       Ouroboros.Network.PeerSelection.Governor.ActivePeers
                        Ouroboros.Network.PeerSelection.Governor.EstablishedPeers
                        Ouroboros.Network.PeerSelection.Governor.KnownPeers
                        Ouroboros.Network.PeerSelection.Governor.Monitor