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

wip, log merging, debug-22

This commit is contained in:
Dmitry Zuikov 2023-07-19 21:07:57 +03:00
parent 40f05a0051
commit 308a0ce833
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hbs2-core/lib/HBS2/Net/Proto/RefChan.hs
View File

@ -427,21 +427,18 @@ refChanUpdateProto self pc adapter msg = do
let toWait = TimeoutSec (fromIntegral $ 2 * view refChanHeadWaitAccept headBlock) let toWait = TimeoutSec (fromIntegral $ 2 * view refChanHeadWaitAccept headBlock)
let ttl = ts + fromNanoSecs (fromIntegral $ toNanoSeconds toWait) let ttl = ts + fromNanoSecs (fromIntegral $ toNanoSeconds toWait)
let rcrk = RefChanRoundKey (HashRef hash) let rcrk = RefChanRoundKey (HashRef hash)
rndHere <- lift $ find rcrk id rndHere <- lift $ find rcrk id
unless (isJust rndHere) do
defRound <- RefChanRound @e (HashRef hash) refchanKey ttl defRound <- RefChanRound @e (HashRef hash) refchanKey ttl
<$> newTVarIO False <$> newTVarIO False
<*> newTVarIO Nothing <*> newTVarIO Nothing
<*> newTVarIO (HashSet.singleton (HashRef hash)) -- save propose <*> newTVarIO (HashSet.singleton (HashRef hash)) -- save propose
<*> newTVarIO (HashMap.singleton peerKey ()) <*> newTVarIO (HashMap.singleton peerKey ())
unless (isJust rndHere) do
lift $ update defRound rcrk id lift $ update defRound rcrk id
lift $ emit @e RefChanRoundEventKey (RefChanRoundEvent rcrk) lift $ emit @e RefChanRoundEventKey (RefChanRoundEvent rcrk)
lift $ gossip msg lift $ gossip msg
@ -470,6 +467,7 @@ refChanUpdateProto self pc adapter msg = do
lift $ gossip accept lift $ gossip accept
-- -- рассылаем ли себе? что бы был хоть один accept -- -- рассылаем ли себе? что бы был хоть один accept
liftIO $ putBlock sto (serialise accept)
lift $ refChanUpdateProto True pc adapter accept lift $ refChanUpdateProto True pc adapter accept
Accept chan box -> deferred proto do Accept chan box -> deferred proto do
@ -543,17 +541,7 @@ refChanUpdateProto self pc adapter msg = do
forM_ trans $ \t -> do forM_ trans $ \t -> do
lift $ refChanWriteTran adapter t lift $ refChanWriteTran adapter t
debug $ "WRITING TRANS" <+> pretty t
-- FIXME: remove-debug-shit
wtf <- MaybeT $ liftIO $ getBlock sto (fromHashRef t)
trr <- MaybeT $ pure $ deserialiseOrFail @(RefChanUpdate e) wtf & either (const Nothing) Just
let tp = case trr of
Propose{} -> "PROPOSE"
Accept{} -> "ACCEPT"
debug $ "WRITING TRANS" <+> pretty tp <+> pretty t
let pips = view refChanHeadPeers headBlock & HashMap.keys & HashSet.fromList let pips = view refChanHeadPeers headBlock & HashMap.keys & HashSet.fromList
votes <- readTVarIO (view refChanRoundAccepts rcRound) <&> HashSet.fromList . HashMap.keys votes <- readTVarIO (view refChanRoundAccepts rcRound) <&> HashSet.fromList . HashMap.keys