Merge #4004

4004: Refactored DiffusionScript r=coot a=bolt12 # Description This PR fixes #3905 Co-authored-by: Armando Santos <armando@well-typed.com>
IntersectMBO · Oct 20, 2022 · 2dc7a64 · 2dc7a64
2 parents b995908 + c26bb0e
commit 2dc7a64
Show file tree

Hide file tree

Showing 2 changed files with 216 additions and 230 deletions.
diff --git a/ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs b/ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs
@@ -590,7 +590,7 @@ prop_peer_selection_trace_coverage defaultBearerInfo diffScript =
 prop_diffusion_nolivelock :: AbsBearerInfo
                          -> DiffusionScript
                          -> Property
-prop_diffusion_nolivelock defaultBearerInfo diffScript@(DiffusionScript l) =
+prop_diffusion_nolivelock defaultBearerInfo diffScript@(DiffusionScript _ l) =
     let sim :: forall s . IOSim s Void
         sim = diffusionSimulation (toBearerInfo defaultBearerInfo)
                                   diffScript
@@ -1122,26 +1122,26 @@ prop_diffusion_target_active_root defaultBearerInfo diffScript =
 prop_hot_diffusion_target_active_public :: NonFailingAbsBearerInfo
                                         -> HotDiffusionScript
                                         -> Property
-prop_hot_diffusion_target_active_public defaultBearerInfo (HotDiffusionScript hds) =
-  prop_diffusion_target_active_public (unNFBI defaultBearerInfo) (DiffusionScript hds)
+prop_hot_diffusion_target_active_public defaultBearerInfo (HotDiffusionScript sa hds) =
+  prop_diffusion_target_active_public (unNFBI defaultBearerInfo) (DiffusionScript sa hds)
 
 -- | This test checks the percentage of local root peers that, at some point,
 -- become active, when using the 'HotDiffusionScript' generator.
 --
 prop_hot_diffusion_target_active_local :: NonFailingAbsBearerInfo
                                        -> HotDiffusionScript
                                        -> Property
-prop_hot_diffusion_target_active_local defaultBearerInfo (HotDiffusionScript hds) =
-  prop_diffusion_target_active_local (unNFBI defaultBearerInfo) (DiffusionScript hds)
+prop_hot_diffusion_target_active_local defaultBearerInfo (HotDiffusionScript sa hds) =
+  prop_diffusion_target_active_local (unNFBI defaultBearerInfo) (DiffusionScript sa hds)
 
 -- | This test checks the percentage of root peers that, at some point,
 -- become active, when using the 'HotDiffusionScript' generator.
 --
 prop_hot_diffusion_target_active_root :: NonFailingAbsBearerInfo
                                       -> HotDiffusionScript
                                       -> Property
-prop_hot_diffusion_target_active_root defaultBearerInfo (HotDiffusionScript hds) =
-  prop_diffusion_target_active_root (unNFBI defaultBearerInfo) (DiffusionScript hds)
+prop_hot_diffusion_target_active_root defaultBearerInfo (HotDiffusionScript sa hds) =
+  prop_diffusion_target_active_root (unNFBI defaultBearerInfo) (DiffusionScript sa hds)
 
 -- | A variant of
 -- 'Test.Ouroboros.Network.PeerSelection.prop_governor_target_established_local'