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

session reworking wip

This commit is contained in:
Dmitry Zuikov 2023-01-19 08:31:57 +03:00
parent eaec1a862a
commit a58193eb96
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hbs2-tests/test/Main.hs
View File

@ -83,12 +83,17 @@ newBlockDownload h = BlockDownload h 0 0 0
type GetBlockChunk h m = Hash h -> Offset -> Size -> m (Maybe ByteString) type GetBlockChunk h m = Hash h -> Offset -> Size -> m (Maybe ByteString)
type AcceptChunk h e m = Response e (BlockChunks e) m
=> ( Cookie e, Peer e, Hash HbSync, ChunkNum, ByteString ) -> m ()
type GetBlockHash h e m = (Peer e, Cookie e) -> m (Maybe (Hash h))
data BlockChunksI e m = data BlockChunksI e m =
BlockChunksI BlockChunksI
{ blkSize :: GetBlockSize HbSync m { blkSize :: GetBlockSize HbSync m
, blkChunk :: GetBlockChunk HbSync m , blkChunk :: GetBlockChunk HbSync m
, blkGetHash :: (Peer e, Cookie e) -> m (Maybe (Hash HbSync)) , blkGetHash :: GetBlockHash HbSync e m
, blkAcceptChunk :: Response e (BlockChunks e) m => (Cookie e, Peer e, Hash HbSync, ChunkNum, ByteString) -> m () , blkAcceptChunk :: AcceptChunk HbSync e m
} }
@ -137,7 +142,7 @@ blockChunksProto adapter (BlockChunks c p) =
h <- blkGetHash adapter (who, c) h <- blkGetHash adapter (who, c)
maybe1 h (response_ (BlockLost @e)) $ \hh -> do maybe1 h (response_ (BlockLost @e)) $ \hh -> do
blkAcceptChunk adapter (c, who, hh, n, bs) void $ blkAcceptChunk adapter (c, who, hh, n, bs)
BlockNoChunks {} -> do BlockNoChunks {} -> do
-- TODO: notification -- TODO: notification
@ -308,6 +313,9 @@ runFakePeer se env = do
when ( h1 == h ) $ do when ( h1 == h ) $ do
debug $ "THIS BLOCK IS DEFINITELY DONE" <+> pretty h1 debug $ "THIS BLOCK IS DEFINITELY DONE" <+> pretty h1
liftIO $ commitBlock cww cKey h liftIO $ commitBlock cww cKey h
delSession se sBlockDownload cKey
-- TODO: #ASAP
-- NOTIFY BLOCK IS DONE
when (written > mbSize * defBlockDownloadThreshold) $ do when (written > mbSize * defBlockDownloadThreshold) $ do
debug $ "SESSION DELETED BECAUSE THAT PEER IS JERK:" <+> pretty p debug $ "SESSION DELETED BECAUSE THAT PEER IS JERK:" <+> pretty p
@ -360,7 +368,7 @@ test1 = do
let h = fromString "5KP4vM6RuEX6RA1ywthBMqZV5UJDLANC17UrF6zuWdRt" let h = fromString "5KP4vM6RuEX6RA1ywthBMqZV5UJDLANC17UrF6zuWdRt"
-- TODO: generate unique cookie!! -- TODO: #ASAP generate unique cookie!!
-- --
-- FIXME: withAllCrap $ do ... -- FIXME: withAllCrap $ do ...
let s0 = (fst . head) ee let s0 = (fst . head) ee