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

wip, log merging, debug-5

This commit is contained in:
Dmitry Zuikov 2023-07-19 11:58:26 +03:00
parent 9e737afad3
commit d77cf610d2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -476,6 +476,7 @@ logMergeProcess _ q = do
let quo = view refChanHeadQuorum hd & fromIntegral let quo = view refChanHeadQuorum hd & fromIntegral
debug $ "PROPOSE QUO" <+> pretty href <+> pretty quo debug $ "PROPOSE QUO" <+> pretty href <+> pretty quo
guard $ checkACL hd pk ak guard $ checkACL hd pk ak
debug $ "PROPOSE ACL CHECK OK" <+> pretty href
pure [(href, (quo,mempty))] pure [(href, (quo,mempty))]
Accept _ box -> do Accept _ box -> do
@ -485,6 +486,7 @@ logMergeProcess _ q = do
let quo = view refChanHeadQuorum hd & fromIntegral let quo = view refChanHeadQuorum hd & fromIntegral
debug $ "ACCEPT QUO" <+> pretty href <+> pretty quo debug $ "ACCEPT QUO" <+> pretty href <+> pretty quo
guard $ HashMap.member pk (view refChanHeadPeers hd) guard $ HashMap.member pk (view refChanHeadPeers hd)
debug $ "ACCEPT ACL CHECK OK" <+> pretty href
pure [(href, (quo,[hashRef]))] pure [(href, (quo,[hashRef]))]
let merge1 (q1, hs1) (q2, hs2) = (max q1 q2, List.nub (hs1 <> hs2) ) let merge1 (q1, hs1) (q2, hs2) = (max q1 q2, List.nub (hs1 <> hs2) )