Merge pull request #1486 from input-output-hk/edsko/epochinfo-callstack

HasCallStack around EpochInfo functions

Author: Jared Corduan

cabal.project

@@ -22,29 +22,29 @@ write-ghc-environment-files: always
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 9b82346b78e212fcd3e795faf9dd7f3266ab7297
-  --sha256: 04iv32x233bck4xd34x2g0yaxj438f57d3z6m0pvvzj2yca1slxm
+  tag: 8061c5dd00f7aad134b18a4e6818879641f8589f
+  --sha256: 182a2x16mh7gqjfkyrc4vgindxwwlr0i8vhmqyfbmnnvg6m8bzaq
   subdir: binary
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 9b82346b78e212fcd3e795faf9dd7f3266ab7297
-  --sha256: 04iv32x233bck4xd34x2g0yaxj438f57d3z6m0pvvzj2yca1slxm
+  tag: 8061c5dd00f7aad134b18a4e6818879641f8589f
+  --sha256: 182a2x16mh7gqjfkyrc4vgindxwwlr0i8vhmqyfbmnnvg6m8bzaq
   subdir: binary/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 9b82346b78e212fcd3e795faf9dd7f3266ab7297
-  --sha256: 04iv32x233bck4xd34x2g0yaxj438f57d3z6m0pvvzj2yca1slxm
+  tag: 8061c5dd00f7aad134b18a4e6818879641f8589f
+  --sha256: 182a2x16mh7gqjfkyrc4vgindxwwlr0i8vhmqyfbmnnvg6m8bzaq
   subdir: cardano-crypto-class
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 9b82346b78e212fcd3e795faf9dd7f3266ab7297
-  --sha256: 04iv32x233bck4xd34x2g0yaxj438f57d3z6m0pvvzj2yca1slxm
+  tag: 8061c5dd00f7aad134b18a4e6818879641f8589f
+  --sha256: 182a2x16mh7gqjfkyrc4vgindxwwlr0i8vhmqyfbmnnvg6m8bzaq
   subdir: slotting
 
 source-repository-package

shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Slot.hs

@@ -32,6 +32,7 @@ import Cardano.Slotting.Slot (EpochNo (..), EpochSize (..), SlotNo (..))
 import Control.Monad.Trans (lift)
 import Data.Functor.Identity (Identity)
 import Data.Word (Word64)
+import GHC.Stack (HasCallStack)
 import Shelley.Spec.Ledger.BaseTypes (ShelleyBase)
 
 newtype Duration = Duration Word64
@@ -61,11 +62,23 @@ slotByronToShelley (Byron.Slot s) = SlotNo s
 slotShelleyToByron :: SlotNo -> Byron.Slot
 slotShelleyToByron (SlotNo s) = Byron.Slot s
 
-epochInfoEpoch :: EpochInfo Identity -> SlotNo -> ShelleyBase EpochNo
+epochInfoEpoch ::
+  HasCallStack =>
+  EpochInfo Identity ->
+  SlotNo ->
+  ShelleyBase EpochNo
 epochInfoEpoch ei = lift . EI.epochInfoEpoch ei
 
-epochInfoFirst :: EpochInfo Identity -> EpochNo -> ShelleyBase SlotNo
+epochInfoFirst ::
+  HasCallStack =>
+  EpochInfo Identity ->
+  EpochNo ->
+  ShelleyBase SlotNo
 epochInfoFirst ei = lift . EI.epochInfoFirst ei
 
-epochInfoSize :: EpochInfo Identity -> EpochNo -> ShelleyBase EpochSize
+epochInfoSize ::
+  HasCallStack =>
+  EpochInfo Identity ->
+  EpochNo ->
+  ShelleyBase EpochSize
 epochInfoSize ei = lift . EI.epochInfoSize ei

stack.yaml

@@ -35,7 +35,7 @@ extra-deps:
     - test
 
 - git: https://github.com/input-output-hk/cardano-base
-  commit: 9b82346b78e212fcd3e795faf9dd7f3266ab7297
+  commit: 8061c5dd00f7aad134b18a4e6818879641f8589f
   subdirs:
     - binary
     - binary/test