From 962afec8280787550ff2dd7de3a3160fd20324cc Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Fri, 24 Feb 2023 09:54:22 +0300 Subject: [PATCH] devlog+fixme+minor-change --- .fixme/log | 4 +++- hbs2-core/lib/HBS2/Prelude.hs | 4 ++++ hbs2-peer/app/BlockDownload.hs | 4 ---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.fixme/log b/.fixme/log index 7d506465..55f3b5e0 100644 --- a/.fixme/log +++ b/.fixme/log @@ -204,4 +204,6 @@ fixme-set "assigned" "voidlizard" "BZjzN7BjQ4" fixme-set "assigned" "ivanovs" "4ZMqvoTMY3" fixme-set "assigned" "voidlizard" "AR3Ppzm1E2" fixme-set "workflow" "test" "AR3Ppzm1E2" -fixme-set "workflow" "test" "BZjzN7BjQ4" \ No newline at end of file +fixme-set "workflow" "test" "BZjzN7BjQ4" +fixme-set "workflow" "wip" "6spiDvVE3q" +fixme-set "assigned" "voidlizard" "6spiDvVE3q" \ No newline at end of file diff --git a/hbs2-core/lib/HBS2/Prelude.hs b/hbs2-core/lib/HBS2/Prelude.hs index cbd56d59..115def9c 100644 --- a/hbs2-core/lib/HBS2/Prelude.hs +++ b/hbs2-core/lib/HBS2/Prelude.hs @@ -9,6 +9,7 @@ module HBS2.Prelude , AsFileName(..) -- , Pretty , FromStringMaybe(..) + , none , module Prettyprinter ) where @@ -25,6 +26,9 @@ import Data.Hashable import Prettyprinter import Data.Word +none :: forall m . Monad m => m () +none = pure () + maybe1 :: Maybe a -> b -> (a -> b) -> b maybe1 mb n j = maybe n j mb diff --git a/hbs2-peer/app/BlockDownload.hs b/hbs2-peer/app/BlockDownload.hs index 6327db3b..96ce8e7e 100644 --- a/hbs2-peer/app/BlockDownload.hs +++ b/hbs2-peer/app/BlockDownload.hs @@ -49,10 +49,6 @@ import System.Random.Shuffle import Type.Reflection -none :: forall m . Monad m => m () -none = pure () - - getBlockForDownload :: MonadIO m => BlockDownloadM e m (Hash HbSync) getBlockForDownload = do q <- asks (view downloadQ)