typed-protocols: udpated upstream dependencies

Updated: `ouroboros-network-framework`, `ouroboros-network` and `ouroboros-consensus` after restructuring `typed-protocols` packages.
IntersectMBO · Oct 7, 2021 · 1e048ad · 1e048ad
1 parent c81f148
commit 1e048ad
Show file tree

Hide file tree

Showing 36 changed files with 67 additions and 44 deletions.
diff --git a/ouroboros-consensus-test/ouroboros-consensus-test.cabal b/ouroboros-consensus-test/ouroboros-consensus-test.cabal
@@ -102,6 +102,7 @@ library
                      , tasty
                      , tasty-golden
                      , tasty-quickcheck
+                     , typed-protocols
                      , template-haskell
                      , text              >=1.2   && <1.3
                      , time

diff --git a/ouroboros-consensus-test/src/Test/ThreadNet/Network.hs b/ouroboros-consensus-test/src/Test/ThreadNet/Network.hs
@@ -55,13 +55,14 @@ import           Data.Void (Void)
 import           GHC.Stack
 import           System.Random (mkStdGen)
 
+import           Network.TypedProtocol.Codec (AnyMessage (..), CodecFailure,
+                     mapFailureCodec)
+import qualified Network.TypedProtocol.Codec as Codec
+
 import qualified Ouroboros.Network.AnchoredFragment as AF
 import           Ouroboros.Network.BlockFetch (BlockFetchConfiguration (..),
                      TraceLabelPeer (..))
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.Codec (AnyMessage (..), CodecFailure,
-                     mapFailureCodec)
-import qualified Ouroboros.Network.Codec as Codec
 import           Ouroboros.Network.MockChain.Chain (Chain (Genesis))
 import           Ouroboros.Network.Point (WithOrigin (..))
 import qualified Ouroboros.Network.Protocol.ChainSync.Type as CS

diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Network/NodeToClient.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Network/NodeToClient.hs
@@ -35,18 +35,20 @@ module Ouroboros.Consensus.Network.NodeToClient (
 
 import           Codec.CBOR.Decoding (Decoder)
 import           Codec.CBOR.Encoding (Encoding)
+import           Codec.CBOR.Read (DeserialiseFailure)
 import           Codec.Serialise (Serialise)
 
 import           Control.Tracer
 import           Data.ByteString.Lazy (ByteString)
 import           Data.Void (Void)
 
+import           Network.TypedProtocol.Codec
+
 import qualified Ouroboros.Network.AnchoredFragment as AF
 import           Ouroboros.Network.Block (Serialised, decodePoint, decodeTip,
                      encodePoint, encodeTip)
 import           Ouroboros.Network.BlockFetch
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.Codec
 import           Ouroboros.Network.Driver
 import           Ouroboros.Network.Mux
 import           Ouroboros.Network.NodeToClient hiding

diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Network/NodeToNode.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Network/NodeToNode.hs
@@ -34,6 +34,7 @@ module Ouroboros.Consensus.Network.NodeToNode (
 
 import           Codec.CBOR.Decoding (Decoder)
 import           Codec.CBOR.Encoding (Encoding)
+import           Codec.CBOR.Read (DeserialiseFailure)
 import           Control.Monad (forever)
 import           Control.Monad.Class.MonadTime (MonadTime)
 import           Control.Monad.Class.MonadTimer (MonadTimer)
@@ -42,14 +43,15 @@ import           Data.ByteString.Lazy (ByteString)
 import           Data.Map.Strict (Map)
 import           Data.Void (Void)
 
+import           Network.TypedProtocol.Codec
+
 import           Ouroboros.Network.AnchoredFragment (AnchoredFragment)
 import           Ouroboros.Network.Block (Serialised (..), decodePoint,
                      decodeTip, encodePoint, encodeTip)
 import           Ouroboros.Network.BlockFetch
 import           Ouroboros.Network.BlockFetch.Client (BlockFetchClient,
                      blockFetchClient)
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.Codec
 import           Ouroboros.Network.DeltaQ
 import           Ouroboros.Network.Driver
 import           Ouroboros.Network.KeepAlive

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Driver/Simple.hs b/ouroboros-network-framework/src/Ouroboros/Network/Driver/Simple.hs
@@ -36,13 +36,13 @@ module Ouroboros.Network.Driver.Simple (
   ) where
 
 import Network.TypedProtocol.Core
+import Network.TypedProtocol.Codec
 import Network.TypedProtocol.Pipelined
 import Network.TypedProtocol.Driver
 
 import Ouroboros.Network.Util.ShowProxy
 
 import Ouroboros.Network.Channel
-import Ouroboros.Network.Codec
 
 import Control.Monad.Class.MonadSTM
 import Control.Monad.Class.MonadAsync

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Mux.hs b/ouroboros-network-framework/src/Ouroboros/Network/Mux.hs
@@ -40,6 +40,7 @@ import           Data.Void (Void)
 import qualified Data.ByteString.Lazy as LBS
 
 import           Network.TypedProtocol.Core
+import           Network.TypedProtocol.Codec
 import           Network.TypedProtocol.Pipelined
 
 import qualified Network.Mux.Compat as Mux
@@ -50,7 +51,6 @@ import           Network.Mux
 
 import           Ouroboros.Network.Channel
 import           Ouroboros.Network.ConnectionId
-import           Ouroboros.Network.Codec
 import           Ouroboros.Network.Driver
 import           Ouroboros.Network.Util.ShowProxy (ShowProxy)
 

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake/Codec.hs b/ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake/Codec.hs
@@ -34,12 +34,13 @@ import qualified Data.Map as Map
 import           Data.Maybe (mapMaybe)
 import           Text.Printf
 
+import           Network.TypedProtocol.Codec.CBOR
+
 import qualified Codec.CBOR.Encoding as CBOR
 import qualified Codec.CBOR.Decoding as CBOR
 import qualified Codec.CBOR.Read     as CBOR
 import qualified Codec.CBOR.Term     as CBOR
 
-import           Ouroboros.Network.Codec
 import           Ouroboros.Network.CodecCBORTerm
 import           Ouroboros.Network.Driver.Limits
 

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake/Unversioned.hs b/ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake/Unversioned.hs
@@ -19,9 +19,9 @@ import           Data.Text (Text)
 import qualified Data.Text as T
 import           Data.ByteString.Lazy (ByteString)
 
-import           Ouroboros.Network.Codec
-import           Ouroboros.Network.CodecCBORTerm
+import           Network.TypedProtocol.Codec
 
+import           Ouroboros.Network.CodecCBORTerm
 import           Ouroboros.Network.Protocol.Handshake.Codec
 import           Ouroboros.Network.Protocol.Handshake.Type
 import           Ouroboros.Network.Protocol.Handshake.Version

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Socket.hs b/ouroboros-network-framework/src/Ouroboros/Network/Socket.hs
@@ -93,10 +93,10 @@ import qualified Network.Socket as Socket
 import           Control.Tracer
 
 import qualified Network.Mux.Compat as Mx
-import Network.Mux.DeltaQ.TraceTransformer
+import           Network.Mux.DeltaQ.TraceTransformer
+import           Network.TypedProtocol.Codec hiding (encode, decode)
 
 import           Ouroboros.Network.ConnectionId
-import           Ouroboros.Network.Codec hiding (encode, decode)
 import           Ouroboros.Network.Driver.Limits
 import           Ouroboros.Network.Mux
 import           Ouroboros.Network.ErrorPolicy

diff --git a/ouroboros-network-framework/test/Test/Ouroboros/Network/Driver.hs b/ouroboros-network-framework/test/Test/Ouroboros/Network/Driver.hs
@@ -13,8 +13,8 @@
 module Test.Ouroboros.Network.Driver (tests) where
 
 import Network.TypedProtocol.Core
+import Network.TypedProtocol.Codec
 
-import Ouroboros.Network.Codec
 import Ouroboros.Network.Channel
 import Ouroboros.Network.Driver
 import Ouroboros.Network.Driver.Limits

diff --git a/ouroboros-network/demo/chain-sync.hs b/ouroboros-network/demo/chain-sync.hs
@@ -37,6 +37,8 @@ import           System.Random
 
 import qualified Codec.Serialise as CBOR
 
+import           Network.TypedProtocol.Codec
+
 import qualified Ouroboros.Network.AnchoredFragment as AF
 import           Ouroboros.Network.Block
 import qualified Ouroboros.Network.MockChain.Chain as Chain
@@ -49,7 +51,6 @@ import           Ouroboros.Network.Snocket
 import           Ouroboros.Network.Socket
 import           Ouroboros.Network.Testing.ConcreteBlock
 
-import           Ouroboros.Network.Codec
 import           Ouroboros.Network.Driver
 import           Ouroboros.Network.Protocol.Handshake.Codec
 import           Ouroboros.Network.Protocol.Handshake.Unversioned

diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal
@@ -179,7 +179,9 @@ library
                        network-mux       >=0.1 && <1.0,
                        ouroboros-network-framework
                                          >=0.1 && <1.0,
-                       typed-protocols   >=0.1 && < 1.0
+                       typed-protocols   >=0.1 && < 1.0,
+                       typed-protocols-cborg
+                                         >=0.1 && < 1.0
 
   ghc-options:         -Wall
                        -Wno-unticked-promoted-constructors
@@ -314,7 +316,8 @@ test-suite test
                        ouroboros-network-framework,
                        ouroboros-network-testing,
                        ouroboros-protocol-tests,
-                       typed-protocols
+                       typed-protocols,
+                       typed-protocols-examples
 
   if os(windows)
     build-depends:     Win32-network                 <0.2.0.0,
@@ -377,6 +380,7 @@ executable demo-chain-sync
 
                        contra-tracer,
 
+                       typed-protocols,
                        network-mux,
                        ouroboros-network-framework,
                        ouroboros-network

diff --git a/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/BlockFetch/Test.hs b/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/BlockFetch/Test.hs
@@ -21,9 +21,9 @@ import           Control.Monad.IOSim (runSimOrThrow)
 import           Control.Tracer (nullTracer)
 
 import           Network.TypedProtocol.Proofs
+import           Network.TypedProtocol.Codec
 
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.Codec
 import           Ouroboros.Network.Driver.Simple (runConnectedPeers)
 
 import           Ouroboros.Network.Block (Serialised (..),

diff --git a/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/ChainSync/Test.hs b/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/ChainSync/Test.hs
@@ -27,9 +27,9 @@ import           Control.Tracer (nullTracer)
 import           Control.Monad.IOSim (runSimOrThrow)
 
 import           Network.TypedProtocol.Proofs (connect, connectPipelined)
+import           Network.TypedProtocol.Codec
 
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.Codec
 import           Ouroboros.Network.Driver
 
 import           Ouroboros.Network.Block (pattern GenesisPoint,

diff --git a/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/Handshake/Test.hs b/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/Handshake/Test.hs
@@ -30,13 +30,13 @@ import           Control.Monad.Class.MonadThrow ( MonadCatch
 import           Control.Tracer (nullTracer)
 
 import           Network.TypedProtocol.Core
+import           Network.TypedProtocol.Codec
 import           Network.TypedProtocol.Proofs
 
 import           Test.Ouroboros.Network.Testing.Utils (prop_codec_cborM,
                      prop_codec_valid_cbor_encoding, splits2, splits3)
 
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.Codec
 import           Ouroboros.Network.CodecCBORTerm
 import           Ouroboros.Network.Driver.Simple ( runPeer
                                                  , runConnectedPeers

diff --git a/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/KeepAlive/Test.hs b/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/KeepAlive/Test.hs
@@ -20,10 +20,10 @@ import           Data.ByteString.Lazy (ByteString)
 import qualified Data.ByteString.Lazy as BL
 
 import           Network.TypedProtocol.Core
+import           Network.TypedProtocol.Codec hiding (prop_codec)
 import           Network.TypedProtocol.Proofs
 
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.Codec hiding (prop_codec)
 import           Ouroboros.Network.Driver.Limits
 import           Ouroboros.Network.Driver.Simple (runConnectedPeers)
 

diff --git a/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/LocalStateQuery/Test.hs b/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/LocalStateQuery/Test.hs
@@ -27,11 +27,12 @@ import           Control.Monad.IOSim
 import           Control.Monad.ST (runST)
 import           Control.Tracer (nullTracer)
 
+import           Codec.Serialise (DeserialiseFailure)
 import qualified Codec.Serialise as Serialise (decode, encode)
 
 import           Network.TypedProtocol.Proofs
+import           Network.TypedProtocol.Codec hiding (prop_codec)
 
-import           Ouroboros.Network.Codec hiding (prop_codec)
 import           Ouroboros.Network.Channel
 import           Ouroboros.Network.Driver.Simple (runConnectedPeers)
 import           Ouroboros.Network.Util.ShowProxy

diff --git a/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/LocalTxSubmission/Test.hs b/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/LocalTxSubmission/Test.hs
@@ -24,14 +24,14 @@ import           Control.Monad.Class.MonadST (MonadST)
 import           Control.Monad.Class.MonadThrow (MonadCatch)
 import           Control.Tracer (nullTracer)
 
-import           Codec.Serialise (Serialise)
+import           Codec.Serialise (Serialise, DeserialiseFailure)
 import qualified Codec.Serialise as Serialise (encode, decode)
 
 import           Network.TypedProtocol.Core
 import           Network.TypedProtocol.Proofs
+import           Network.TypedProtocol.Codec hiding (prop_codec)
 
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.Codec hiding (prop_codec)
 import           Ouroboros.Network.Driver.Simple (runConnectedPeers)
 import           Ouroboros.Network.Util.ShowProxy
 

diff --git a/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/TipSample/Test.hs b/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/TipSample/Test.hs
@@ -30,9 +30,9 @@ import           Cardano.Slotting.Slot (SlotNo (..))
 import           Control.Monad.IOSim (runSimOrThrow)
 import           Network.TypedProtocol.Pipelined (Nat (Succ, Zero), natToInt, unsafeIntToNat)
 import           Network.TypedProtocol.Proofs
+import           Network.TypedProtocol.Codec
 
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.Codec
 import           Ouroboros.Network.Driver
 import           Ouroboros.Network.Util.ShowProxy (ShowProxy)
 

diff --git a/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/TxSubmission/Test.hs b/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/TxSubmission/Test.hs
@@ -33,13 +33,13 @@ import           Control.Monad.Class.MonadST (MonadST)
 import           Control.Monad.Class.MonadThrow (MonadCatch)
 import           Control.Tracer (Tracer(..), nullTracer)
 
-import           Codec.Serialise (Serialise)
+import           Codec.Serialise (Serialise, DeserialiseFailure)
 import qualified Codec.Serialise as Serialise (encode, decode)
 
 import           Network.TypedProtocol.Core
+import           Network.TypedProtocol.Codec hiding (prop_codec)
 import           Network.TypedProtocol.Proofs
 
-import           Ouroboros.Network.Codec hiding (prop_codec)
 import           Ouroboros.Network.Channel
 import           Ouroboros.Network.Driver.Simple
                    (runConnectedPeersPipelined)

diff --git a/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/TxSubmission2/Test.hs b/ouroboros-network/protocol-tests/Ouroboros/Network/Protocol/TxSubmission2/Test.hs
@@ -22,12 +22,13 @@ import           Control.Monad.Class.MonadAsync (MonadAsync)
 import           Control.Monad.Class.MonadST (MonadST)
 import           Control.Monad.Class.MonadThrow (MonadCatch)
 
+import           Codec.Serialise (DeserialiseFailure)
 import qualified Codec.Serialise as Serialise (encode, decode)
 
 import           Network.TypedProtocol.Proofs
+import           Network.TypedProtocol.Codec hiding (prop_codec)
 
 import           Ouroboros.Network.Channel
-import           Ouroboros.Network.Codec hiding (prop_codec)
 import           Ouroboros.Network.Driver.Simple
                    (runConnectedPeersPipelined)
 import           Ouroboros.Network.Protocol.Trans.Hello.Type (Hello)

diff --git a/ouroboros-network/protocol-tests/Test/Ouroboros/Network/Testing/Utils.hs b/ouroboros-network/protocol-tests/Test/Ouroboros/Network/Testing/Utils.hs
@@ -10,7 +10,7 @@ import qualified Codec.CBOR.Read      as CBOR
 import qualified Codec.CBOR.Term      as CBOR
 import qualified Codec.CBOR.FlatTerm as CBOR
 
-import           Ouroboros.Network.Codec
+import           Network.TypedProtocol.Codec
 
 import           Test.QuickCheck
 
@@ -47,7 +47,7 @@ prop_codec_cborM codec (AnyMessageAndAgency stok msg)
 --
 prop_codec_valid_cbor_encoding
   :: forall ps.
-     Codec ps DeserialiseFailure IO ByteString
+     Codec ps CBOR.DeserialiseFailure IO ByteString
   -> AnyMessageAndAgency ps
   -> Property
 prop_codec_valid_cbor_encoding Codec {encode} (AnyMessageAndAgency stok msg) =
@@ -57,7 +57,7 @@ prop_codec_valid_cbor_encoding Codec {encode} (AnyMessageAndAgency stok msg) =
   where
     deserialise :: [CBOR.TermToken]
                 -> ByteString
-                -> Either DeserialiseFailure [CBOR.TermToken]
+                -> Either CBOR.DeserialiseFailure [CBOR.TermToken]
     deserialise !as bs =
       case CBOR.deserialiseFromBytes CBOR.decodeTermToken bs of
         Left e -> Left e

diff --git a/ouroboros-network/src/Ouroboros/Network/NodeToClient.hs b/ouroboros-network/src/Ouroboros/Network/NodeToClient.hs
@@ -95,10 +95,10 @@ import qualified Codec.CBOR.Read as CBOR
 import qualified Codec.CBOR.Term as CBOR
 
 import           Network.TypedProtocol (Peer)
+import           Network.TypedProtocol.Codec
 import           Network.Mux (WithMuxBearer (..))
 import           Network.Mux.Types (MuxRuntimeError (..))
 
-import           Ouroboros.Network.Codec
 import           Ouroboros.Network.Driver (TraceSendRecv(..))
 import           Ouroboros.Network.Driver.Simple (DecoderFailure)
 import           Ouroboros.Network.Driver.Limits (ProtocolLimitFailure (..))

diff --git a/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs b/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs
@@ -108,7 +108,8 @@ import           Network.Mux (WithMuxBearer (..))
 import           Network.Mux.Types (MuxRuntimeError (..))
 import qualified Network.Socket as Socket
 
-import           Ouroboros.Network.Codec
+import           Network.TypedProtocol.Codec.CBOR
+
 import           Ouroboros.Network.Driver (TraceSendRecv(..))
 import           Ouroboros.Network.Driver.Simple (DecoderFailure)
 import           Ouroboros.Network.Driver.Limits (ProtocolLimitFailure (..))

diff --git a/ouroboros-network/src/Ouroboros/Network/Protocol/BlockFetch/Codec.hs b/ouroboros-network/src/Ouroboros/Network/Protocol/BlockFetch/Codec.hs
@@ -25,7 +25,8 @@ import qualified Codec.CBOR.Encoding as CBOR
 import qualified Codec.CBOR.Read as CBOR
 import           Text.Printf
 
-import           Ouroboros.Network.Codec
+import           Network.TypedProtocol.Codec.CBOR
+
 import           Ouroboros.Network.Driver.Limits
 import           Ouroboros.Network.Protocol.BlockFetch.Type
 import           Ouroboros.Network.Protocol.Limits

diff --git a/ouroboros-network/src/Ouroboros/Network/Protocol/ChainSync/Codec.hs b/ouroboros-network/src/Ouroboros/Network/Protocol/ChainSync/Codec.hs
@@ -18,7 +18,8 @@ module Ouroboros.Network.Protocol.ChainSync.Codec
 import           Control.Monad.Class.MonadST
 import           Control.Monad.Class.MonadTime
 
-import           Ouroboros.Network.Codec
+import           Network.TypedProtocol.Codec.CBOR
+
 import           Ouroboros.Network.Driver.Limits
 import           Ouroboros.Network.Protocol.ChainSync.Type
 import           Ouroboros.Network.Protocol.Limits