voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code cleanup

This commit is contained in:
voidlizard 2024-11-14 10:51:32 +03:00
parent ad6871bca1
commit 048c8424fe
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hbs2-peer/app/BlockDownloadNew.hs
View File

@ -366,7 +366,7 @@ downloadFromPeerRec t bu0 cache env h0 peer = do
bu <- lift $ getCurrentBurst bm bu <- lift $ getCurrentBurst bm
t0 <- getTimeCoarse t0 <- getTimeCoarse
w <- lift $ downloadFromPeer t bu cache env (coerce h) peer w <- lift $ downloadFromPeer bu cache env (coerce h) peer
t1 <- getTimeCoarse t1 <- getTimeCoarse
let dt = toMicroSeconds $ TimeoutTS (t1 - t0) let dt = toMicroSeconds $ TimeoutTS (t1 - t0)
atomically $ modifyTVar toq ( dt : ) atomically $ modifyTVar toq ( dt : )
@ -402,20 +402,18 @@ downloadFromPeerRec t bu0 cache env h0 peer = do
pure $ Right () pure $ Right ()
downloadFromPeer :: forall e t cache m . ( e ~ L4Proto downloadFromPeer :: forall e cache m . ( e ~ L4Proto
, MonadUnliftIO m , MonadUnliftIO m
, IsTimeout t , BlockSizeCache e cache
, BlockSizeCache e cache )
) => Int
=> Timeout t
-> Int
-> cache -> cache
-> PeerEnv e -> PeerEnv e
-> Hash HbSync -> Hash HbSync
-> Peer e -> Peer e
-> m (Either (DownloadError e) ByteString) -> m (Either (DownloadError e) ByteString)
downloadFromPeer t bu cache env h peer = liftIO $ withPeerM env do downloadFromPeer bu cache env h peer = liftIO $ withPeerM env do
pd@PeerData{..} <- find (KnownPeerKey peer) id pd@PeerData{..} <- find (KnownPeerKey peer) id
>>= orThrow (UnknownPeerError peer) >>= orThrow (UnknownPeerError peer)
@ -832,7 +830,7 @@ downloadDispatcher brains env = flip runContT pure do
bu <- lift $ getCurrentBurst bm bu <- lift $ getCurrentBurst bm
t0 <- getTimeCoarse t0 <- getTimeCoarse
r <- lift $ downloadFromPeer (TimeoutSec 10) bu (KnownSize size) env (coerce hx) p r <- lift $ downloadFromPeer bu (KnownSize size) env (coerce hx) p
t1 <- getTimeCoarse t1 <- getTimeCoarse
case r of case r of

2
hbs2-peer/app/RPC2.hs
View File

@ -150,7 +150,7 @@ instance (e ~ L4Proto, MonadUnliftIO m, HasRpcContext PeerAPI RPC2Context m) =>
peer <- either (const $ exit (mkSym "error:invalid-address")) pure peer' peer <- either (const $ exit (mkSym "error:invalid-address")) pure peer'
what <- lift $ downloadFromPeer defChunkWaitMax 4 rpcBrains rpcPeerEnv (coerce blk) peer what <- lift $ downloadFromPeer 50 rpcBrains rpcPeerEnv (coerce blk) peer
case what of case what of
Left e -> pure $ mkList @C [ mkSym "error" , mkStr (show e) ] Left e -> pure $ mkList @C [ mkSym "error" , mkStr (show e) ]