p2p-governor: public root peers

Public root peers are a subset of known peers. Public and local roots might overlapp (in which case the peer will be recorded as local). For that reason public roots is a subset of known peers which are either local or public. TODO: requires prop_governor_livelock
IntersectMBO · Oct 16, 2020 · 5eeabd5 · 5eeabd5
1 parent 0ff21c0
commit 5eeabd5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs
@@ -300,9 +300,12 @@ invariantPeerSelectionState PeerSelectionState{..} =
                      (KnownPeers.toMap knownPeers)
 
     -- The publicRootPeers are a subset of the knownPeers,
-    -- and with correct source info in the knownPeers.
+    -- and with correct source info in the knownPeers (either
+    -- 'PeerSroucePublicRoot' or 'PeerSourceLocalRoot', as local and public
+    -- root peers might overlap).
  && Map.isSubmapOfBy (\_ KnownPeerInfo {knownPeerSource} ->
-                         knownPeerSource == PeerSourcePublicRoot)
+                         knownPeerSource == PeerSourcePublicRoot
+                      || knownPeerSource == PeerSourceLocalRoot)
                      (Map.fromSet (const ()) publicRootPeers)
                      (KnownPeers.toMap knownPeers)
 

diff --git a/ouroboros-network/test/Ouroboros/Network/PeerSelection/Test.hs b/ouroboros-network/test/Ouroboros/Network/PeerSelection/Test.hs