Fixed some rebasing artifacts

IntersectMBO · May 12, 2021 · 7ad74e3 · 7ad74e3
1 parent f47d930
commit 7ad74e3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs
@@ -32,7 +32,7 @@ module Ouroboros.Network.PeerSelection.Governor (
     sanePeerSelectionTargets,
     establishedPeersStatus,
     PeerSelectionState(..),
-    PeerSelectionCounters(..)
+    PeerSelectionCounters(..),
     nullPeerSelectionTargets,
     emptyPeerSelectionState,
 ) where

diff --git a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection.hs b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection.hs
@@ -487,6 +487,7 @@ traceNum TraceDemoteHotFailed{}       = 21
 traceNum TraceDemoteHotDone{}         = 22
 traceNum TraceDemoteAsynchronous{}    = 23
 traceNum TraceGovernorWakeup{}        = 24
+traceNum TraceChurnWait{}             = 25
 
 allTraceNames :: Map Int String
 allTraceNames =
@@ -516,6 +517,7 @@ allTraceNames =
    , (22, "TraceDemoteHotDone")
    , (23, "TraceDemoteAsynchronous")
    , (24, "TraceGovernorWakeup")
+   , (25, "TraceChurnWait")
    ]
 
 

diff --git a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs
@@ -404,8 +404,8 @@ mockPeerSelectionActions' tracer
     monitorPeerConnection (PeerConn _peeraddr conn) = readTVar conn
 
 
-snapshotPeersStatus :: MonadSTMTx stm
-                    => TVar_ stm (Map PeerAddr (TVar_ stm PeerStatus))
+snapshotPeersStatus :: MonadSTMTx stm tvar tmvar tqueue tbqueue
+                    => tvar (Map PeerAddr (tvar PeerStatus))
                     -> stm (Map PeerAddr PeerStatus)
 snapshotPeersStatus connsVar = do
     conns <- readTVar connsVar

diff --git a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/Script.hs b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/Script.hs
@@ -167,7 +167,7 @@ arbitraryPickScript pickSome =
       arbitraryScriptOf sz (arbitraryPickMembers pickSome)
 
 interpretPickScript :: (MonadSTMTx stm tvar tmvar tqueue tbqueue, Ord peeraddr)
-                    => tvar PickScript
+                    => tvar (PickScript peeraddr)
                     -> Set peeraddr
                     -> Int
                     -> stm (Set peeraddr)