Merge #1517

1517: Address review feedback on #1503 r=edsko a=edsko Co-authored-by: Edsko de Vries <[email protected]>
IntersectMBO · Jan 28, 2020 · 8ec091c · 8ec091c
2 parents f9e3da6 + 6139177
commit 8ec091c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Ledger/ByronSpec/Rules.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Ledger/ByronSpec/Rules.hs
@@ -119,7 +119,7 @@ liftUPIVOTE = liftRule . ctxtUPIVOTE
 --
 -- This is used in 'applyChainTick' only.
 liftEPOCH :: ByronSpecGenesis -> LiftedRule Spec.EPOCH
-liftEPOCH = liftRule .ctxtEPOCH
+liftEPOCH = liftRule . ctxtEPOCH
 
 -- | Apply top-level delegation rule
 --

diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Ledger/Dual/Byron.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Ledger/Dual/Byron.hs
@@ -237,6 +237,13 @@ forgeDualByronBlock
   -> PBftIsLeader PBftCardanoCrypto  -- ^ Leader proof ('IsLeader')
   -> m DualByronBlock
 forgeDualByronBlock cfg curSlotNo curBlockNo extLedger txs isLeader = do
+    -- NOTE: We do not /elaborate/ the real Byron block from the spec one, but
+    -- instead we /forge/ it. This is important, because we want to test that
+    -- codepath. This does mean that we do not get any kind of "bridge" between
+    -- the two blocks (which we would have gotten if we would have elaborated
+    -- the block instead). Fortunately, this is okay, since the bridge for the
+    -- block can be computed from the bridge information of all of the txs.
+
     main <- forgeByronBlock
               (dualNodeConfigMain cfg)
               curSlotNo

diff --git a/ouroboros-consensus/test-consensus/Test/ThreadNet/DualPBFT.hs b/ouroboros-consensus/test-consensus/Test/ThreadNet/DualPBFT.hs
@@ -334,7 +334,7 @@ sigGen Rules.RuleContext{..} st =
 -- if this fails too often, return 'Nothing'.
 hedgehogAdapter :: forall m a. MonadRandom m => Hedgehog.Gen a -> m (Maybe a)
 hedgehogAdapter gen =
-    go 1
+    go 2 -- We only try twice right now, as the tests are already very slow
   where
     go :: Int -> m (Maybe a)
     go 0 = return Nothing