Fix rebase

IntersectMBO · Dec 2, 2022 · 78019a2 · 78019a2
1 parent ae01007
commit 78019a2
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/ouroboros-consensus-byron-test/ouroboros-consensus-byron-test.cabal b/ouroboros-consensus-byron-test/ouroboros-consensus-byron-test.cabal
@@ -41,6 +41,7 @@ library
                      , cardano-crypto-wrapper
                      , cardano-ledger-byron
                      , cardano-ledger-byron-test
+                     , cardano-slotting
                      , containers        >=0.5   && <0.7
                      , hedgehog-quickcheck
                      , mtl               >=2.2   && <2.3

diff --git a/ouroboros-consensus-byron/src/Ouroboros/Consensus/Byron/Node/Serialisation.hs b/ouroboros-consensus-byron/src/Ouroboros/Consensus/Byron/Node/Serialisation.hs
@@ -17,7 +17,8 @@ import           Control.Monad.Except
 import qualified Data.ByteString.Lazy as Lazy
 import qualified Data.ByteString.Short as Short
 
-import           Cardano.Binary
+import           Cardano.Binary hiding (cborError)
+import           Cardano.Prelude (cborError)
 
 import qualified Cardano.Chain.Block as CC
 import qualified Cardano.Chain.Byron.API as CC

diff --git a/ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/Model.hs b/ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/Model.hs
@@ -110,6 +110,7 @@ import           Ouroboros.Consensus.Config
 import           Ouroboros.Consensus.Ledger.Abstract
 import           Ouroboros.Consensus.Ledger.Extended
 import           Ouroboros.Consensus.Ledger.SupportsProtocol
+import           Ouroboros.Consensus.Protocol.Abstract
 import           Ouroboros.Consensus.Protocol.MockChainSel
 import           Ouroboros.Consensus.Util (repeatedly)
 import qualified Ouroboros.Consensus.Util.AnchoredFragment as Fragment

diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/HeaderStateHistory.hs b/ouroboros-consensus/src/Ouroboros/Consensus/HeaderStateHistory.hs
@@ -42,8 +42,8 @@ import qualified Data.List.NonEmpty as NE
 import           Ouroboros.Consensus.Ledger.Abstract
 import           Ouroboros.Consensus.Ledger.Extended
 import           Ouroboros.Consensus.Ledger.SupportsProtocol
-import           Ouroboros.Network.MockChain.Chain (Chain)
-import qualified Ouroboros.Network.MockChain.Chain as Chain
+import           Ouroboros.Network.Mock.Chain (Chain)
+import qualified Ouroboros.Network.Mock.Chain as Chain
 
 -- | Maintain a history of 'HeaderState's.
 newtype HeaderStateHistory blk = HeaderStateHistory {

diff --git a/ouroboros-network-api/ouroboros-network-api.cabal b/ouroboros-network-api/ouroboros-network-api.cabal
@@ -13,7 +13,6 @@ maintainer:
 category:            Network
 build-type:          Simple
 extra-source-files:
-  ChangeLog.md
 
 flag asserts
   description: Enable assertions

diff --git a/ouroboros-network-mock/ouroboros-network-mock.cabal b/ouroboros-network-mock/ouroboros-network-mock.cabal
@@ -13,7 +13,6 @@ maintainer:
 category:            Network
 build-type:          Simple
 extra-source-files:
-  ChangeLog.md
 
 flag asserts
   description: Enable assertions

diff --git a/ouroboros-network-protocols/ouroboros-network-protocols.cabal b/ouroboros-network-protocols/ouroboros-network-protocols.cabal
@@ -13,7 +13,6 @@ maintainer:
 category:            Network
 build-type:          Simple
 extra-source-files:
-  ChangeLog.md
 
 flag asserts
   description: Enable assertions