From d77cf610d2cab3e0a0b105a0c2e408dc1ee666eb Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Wed, 19 Jul 2023 11:58:26 +0300 Subject: [PATCH] wip, log merging, debug-5 --- hbs2-peer/app/RefChan.hs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hbs2-peer/app/RefChan.hs b/hbs2-peer/app/RefChan.hs index 0c995e4d..c08569f8 100644 --- a/hbs2-peer/app/RefChan.hs +++ b/hbs2-peer/app/RefChan.hs @@ -476,6 +476,7 @@ logMergeProcess _ q = do let quo = view refChanHeadQuorum hd & fromIntegral debug $ "PROPOSE QUO" <+> pretty href <+> pretty quo guard $ checkACL hd pk ak + debug $ "PROPOSE ACL CHECK OK" <+> pretty href pure [(href, (quo,mempty))] Accept _ box -> do @@ -485,6 +486,7 @@ logMergeProcess _ q = do let quo = view refChanHeadQuorum hd & fromIntegral debug $ "ACCEPT QUO" <+> pretty href <+> pretty quo guard $ HashMap.member pk (view refChanHeadPeers hd) + debug $ "ACCEPT ACL CHECK OK" <+> pretty href pure [(href, (quo,[hashRef]))] let merge1 (q1, hs1) (q2, hs2) = (max q1 q2, List.nub (hs1 <> hs2) )