consensus: remove NoThunks Bimap orphan instance

It's declared upstream in Control.ResourceRegistry now.

Author: nfrisby

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Protocol/PBFT.hs

@@ -56,6 +56,7 @@ import           Codec.Serialise (Serialise (..))
 import qualified Control.Exception as Exn
 import           Control.Monad (unless)
 import           Control.Monad.Except (throwError)
+import           Control.ResourceRegistry ()
 import           Data.Bifunctor (first)
 import           Data.Bimap (Bimap)
 import qualified Data.Bimap as Bimap

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Util/Orphans.hs

@@ -19,17 +19,14 @@ import           Cardano.Ledger.Genesis (NoGenesis (..))
 import           Codec.CBOR.Decoding (Decoder)
 import           Codec.Serialise (Serialise (..))
 import           Control.Tracer (Tracer)
-import           Data.Bimap (Bimap)
-import qualified Data.Bimap as Bimap
 import           Data.IntPSQ (IntPSQ)
 import qualified Data.IntPSQ as PSQ
 import           Data.MultiSet (MultiSet)
 import qualified Data.MultiSet as MultiSet
 import           Data.SOP.BasicFunctors
 import           GHC.TypeLits (KnownNat)
 import           NoThunks.Class (InspectHeap (..), InspectHeapNamed (..),
-                     NoThunks (..), OnlyCheckWhnfNamed (..), allNoThunks,
-                     noThunksInKeysAndValues)
+                     NoThunks (..), OnlyCheckWhnfNamed (..), allNoThunks)
 import           Ouroboros.Network.Util.ShowProxy
 import           System.FS.API (SomeHasFS)
 import           System.FS.API.Types (FsPath, Handle)
@@ -53,10 +50,6 @@ instance NoThunks (NoGenesis era) where
   showTypeOf _ = "NoGenesis"
   wNoThunks _ NoGenesis = return Nothing
 
-instance (NoThunks k, NoThunks v)
-      => NoThunks (Bimap k v) where
-  wNoThunks ctxt = noThunksInKeysAndValues ctxt . Bimap.toList
-
 instance ( NoThunks p
          , NoThunks v
          , Ord p

ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/TestBlock.hs

@@ -305,7 +305,7 @@ newtype instance Header (TestBlockWith ptype) =
 
 instance Typeable ptype => ShowProxy (Header (TestBlockWith ptype)) where
 
-instance (Typeable ptype, Eq ptype) => HasHeader (Header (TestBlockWith ptype)) where
+instance (Typeable ptype) => HasHeader (Header (TestBlockWith ptype)) where
   getHeaderFields (TestHeader TestBlockWith{..}) = HeaderFields {
         headerFieldHash    = tbHash
       , headerFieldSlot    = tbSlot