Update dependencies due to handshake query

input-output-hk · May 30, 2023 · 876a234 · 876a234
1 parent 6e73ebd
commit 876a234
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/cabal.project b/cabal.project
@@ -16,8 +16,8 @@ repository cardano-haskell-packages
 -- Bump this if you need newer packages from Hackage
 
 index-state:
-  , hackage.haskell.org 2023-05-04T00:55:55Z
-  , cardano-haskell-packages 2023-05-16T03:39:10Z
+  , hackage.haskell.org 2023-05-30T07:22:41Z
+  , cardano-haskell-packages 2023-05-26T23:20:31Z
 
 packages: ./.
 

diff --git a/ekg-forward.cabal b/ekg-forward.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.4
 name:                ekg-forward
-version:             0.3.0.3
+version:             0.3.0.4
 synopsis:            See README for more info
 description:         See README for more info
 homepage:            https://github.com/input-output-hk/ekg-forward
@@ -65,8 +65,7 @@ library
                        , io-classes >= 0.3
                        , network
                        , ouroboros-network-api
-                       -- The API has changed in 0.6 so don't use it.
-                       , ouroboros-network-framework < 0.6
+                       , ouroboros-network-framework ^>= 0.6
                        , serialise
                        , stm
                        , text

diff --git a/src/System/Metrics/Network/Acceptor.hs b/src/System/Metrics/Network/Acceptor.hs
@@ -32,6 +32,7 @@ import           Ouroboros.Network.Snocket (MakeBearer, Snocket,
                                             localAddressFromPath, localSnocket, socketSnocket,
                                             makeLocalBearer, makeSocketBearer)
 import           Ouroboros.Network.Socket (AcceptedConnectionsLimit (..),
+                                           HandshakeCallbacks (..),
                                            SomeResponderApplication (..),
                                            cleanNetworkMutableState, newNetworkMutableState,
                                            nullNetworkServerTracers, withServerNode)
@@ -42,7 +43,7 @@ import           Ouroboros.Network.Protocol.Handshake.Unversioned (UnversionedPr
                                                                    UnversionedProtocolData (..),
                                                                    unversionedHandshakeCodec,
                                                                    unversionedProtocolDataCodec)
-import           Ouroboros.Network.Protocol.Handshake.Version (acceptableVersion, simpleSingletonVersions)
+import           Ouroboros.Network.Protocol.Handshake.Version (acceptableVersion, queryVersion, simpleSingletonVersions)
 import qualified System.Metrics as EKG
 
 import qualified System.Metrics.Protocol.Acceptor as Acceptor
@@ -95,7 +96,7 @@ doListenToForwarder snocket makeBearer configureSocket address timeLimits app =
     unversionedHandshakeCodec
     timeLimits
     unversionedProtocolDataCodec
-    acceptableVersion
+    (HandshakeCallbacks acceptableVersion queryVersion)
     (simpleSingletonVersions
       UnversionedProtocol
       UnversionedProtocolData

diff --git a/src/System/Metrics/Network/Forwarder.hs b/src/System/Metrics/Network/Forwarder.hs
@@ -32,11 +32,11 @@ import           Ouroboros.Network.Protocol.Handshake.Unversioned (UnversionedPr
                                                                    UnversionedProtocolData (..),
                                                                    unversionedHandshakeCodec,
                                                                    unversionedProtocolDataCodec)
-import           Ouroboros.Network.Protocol.Handshake.Version (acceptableVersion, simpleSingletonVersions)
+import           Ouroboros.Network.Protocol.Handshake.Version (acceptableVersion, queryVersion, simpleSingletonVersions)
 import           Ouroboros.Network.Snocket (MakeBearer, Snocket,
                                             localAddressFromPath, localSnocket, socketSnocket,
                                             makeLocalBearer, makeSocketBearer)
-import           Ouroboros.Network.Socket (connectToNode, nullNetworkConnectTracers)
+import           Ouroboros.Network.Socket (HandshakeCallbacks (..), connectToNode, nullNetworkConnectTracers)
 import qualified System.Metrics as EKG
 
 import           System.Metrics.Configuration (ForwarderConfiguration (..), HowToConnect (..))
@@ -78,7 +78,7 @@ doConnectToAcceptor snocket makeBearer configureSocket address timeLimits app =
     timeLimits
     unversionedProtocolDataCodec
     nullNetworkConnectTracers
-    acceptableVersion
+    (HandshakeCallbacks acceptableVersion queryVersion)
     (simpleSingletonVersions
        UnversionedProtocol
        UnversionedProtocolData