From d094e046a5eff754f3a75f4d6829b977cf86a9a9 Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Mon, 20 Mar 2023 07:04:02 +0300 Subject: [PATCH] code-review --- .fixme/config | 7 +++++++ hbs2-peer/app/PeerMain.hs | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/.fixme/config b/.fixme/config index c3b115cb..1cc1b612 100644 --- a/.fixme/config +++ b/.fixme/config @@ -48,6 +48,13 @@ fixme-value-set cat bug feat refactor ] +[ fixme-report review json + (render builtin:microstache report-wip.tpl) + (post builtin:columns | 10 10 8 12 _) + (query tag:REVIEW:) +] + + [ fixme-report review json (render builtin:microstache report-wip.tpl) (post builtin:columns | 10 10 8 12 _) diff --git a/hbs2-peer/app/PeerMain.hs b/hbs2-peer/app/PeerMain.hs index cc88a04b..a2e3c778 100644 --- a/hbs2-peer/app/PeerMain.hs +++ b/hbs2-peer/app/PeerMain.hs @@ -441,6 +441,11 @@ runPeer opts = Exception.handle myException $ do ] :: Set (PubKey 'Sign UDP) let blkeys = toKeys bls let wlkeys = toKeys whs + + -- REVIEW: no-time-to-die + просто удаляй пира из вайтлиста, + если он в блэклисте + unless (Set.disjoint blkeys wlkeys) do die "whitelist and blacklist intersect"