Use forecastFutureEpochStartUsingTip for the network tip

cardano-foundation · Jul 24, 2020 · a2d93ed · a2d93ed
1 parent 314c063
commit a2d93ed
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/lib/core/src/Cardano/Wallet/Api/Server.hs b/lib/core/src/Cardano/Wallet/Api/Server.hs
@@ -259,6 +259,7 @@ import Cardano.Wallet.Primitive.Slotting
     , currentEpoch
     , epochSucc
     , firstSlotInEpoch
+    , forecastFutureEpochStartUsingTip
     , ongoingSlotAt
     , startTime
     , toSlotId
@@ -1540,16 +1541,17 @@ getNetworkInformation (_block0, _, st) nl = do
     nodeTip <-  liftHandler (NW.currentNodeTip nl)
     apiNodeTip <- liftIO $ unsafeRunExceptT $ mkApiBlockReference ti nodeTip
 
-    ntrkTipSlot <- liftIO (runExceptT $ ti $ ongoingSlotAt now) >>= \case
-        Right (Just x) -> pure x
-        Left _ -> pure minBound
-        Right Nothing -> pure minBound
-    ntrkTip <- liftIO $ unsafeRunExceptT $ ti $ toSlotId ntrkTipSlot
+    -- A dummy tip. We should concider changing the api to allow
+    -- returning null.
+    let noTip = W.SlotId 0 0
+
+    let qry = ongoingSlotAt now >>= \x -> maybe (pure noTip) toSlotId x
+    ntrkTip <- liftIO (runExceptT $ ti qry) >>= \case
+        Right x -> pure x
+        Left _ -> pure noTip
     let nextEpochNo = unsafeEpochSucc (ntrkTip ^. #epochNumber)
-    -- TODO: Re-write firstSlotInEpoch to look at the last time of the previous
-    -- epoch. firstSlotInEpoch may fail.
     nextEpochStart <- liftIO $ unsafeRunExceptT $ ti
-        (firstSlotInEpoch nextEpochNo >>= startTime)
+        (forecastFutureEpochStartUsingTip (nodeTip ^. #slotNo) nextEpochNo)
     progress <- liftIO $ syncProgress st (unsafeRunExceptT . ti) nodeTip now
     pure $ Api.ApiNetworkInformation
         { Api.syncProgress = ApiT progress