From baf0d6e3b61b2df60c4c8fb32e28f765454f54af Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Wed, 19 Jul 2023 20:31:33 +0300 Subject: [PATCH] wip, log merging, debug-18 --- hbs2-core/lib/HBS2/Net/Proto/RefChan.hs | 1 + hbs2-peer/app/RefChan.hs | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hbs2-core/lib/HBS2/Net/Proto/RefChan.hs b/hbs2-core/lib/HBS2/Net/Proto/RefChan.hs index 6bdb0958..bcbed321 100644 --- a/hbs2-core/lib/HBS2/Net/Proto/RefChan.hs +++ b/hbs2-core/lib/HBS2/Net/Proto/RefChan.hs @@ -498,6 +498,7 @@ refChanUpdateProto self pc adapter msg = do Propose _ pbox -> Just pbox _ -> Nothing + (_, ptran) <- MaybeT $ pure $ unboxSignedBox0 @(ProposeTran e) @e proposed debug $ "ACCEPT FROM:" <+> pretty (AsBase58 peerKey) <+> pretty h0 diff --git a/hbs2-peer/app/RefChan.hs b/hbs2-peer/app/RefChan.hs index 0a5a9ffb..67b51ead 100644 --- a/hbs2-peer/app/RefChan.hs +++ b/hbs2-peer/app/RefChan.hs @@ -217,7 +217,7 @@ refChanWorker env brains = do debug $ "ON ROUND STARTED" <+> pretty rcrk forever do - pause @'Seconds 60 + pause @'Seconds 30 now <- getTimeCoarse xs <- readTVarIO rounds <&> HashSet.toList @@ -228,10 +228,17 @@ refChanWorker env brains = do se <- MaybeT $ find @e x id closed <- readTVarIO (view refChanRoundClosed se) + trans <- atomically $ readTVar (view refChanRoundTrans se) <&> HashSet.toList + let ttl = view refChanRoundTTL se when (closed || ttl <= now) do lift $ expire x + + forM_ trans $ \t -> do + debug $ "WRITING TRANS" <+> pretty t + lift $ refChanWriteTranFn env t + atomically $ modifyTVar rounds (HashSet.delete x) debug $ "CLEANUP ROUND" <+> pretty x