Skip to content

Commit

Permalink
Update dependencies due to handshake query
Browse files Browse the repository at this point in the history
  • Loading branch information
jprider63 committed Apr 14, 2023
1 parent 41c3160 commit 9c58cef
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions src/System/Metrics/Network/Acceptor.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -95,7 +96,7 @@ doListenToForwarder snocket makeBearer configureSocket address timeLimits app =
unversionedHandshakeCodec
timeLimits
unversionedProtocolDataCodec
acceptableVersion
(HandshakeCallbacks acceptableVersion queryVersion)
(simpleSingletonVersions
UnversionedProtocol
UnversionedProtocolData
Expand Down
6 changes: 3 additions & 3 deletions src/System/Metrics/Network/Forwarder.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 (..))
Expand Down Expand Up @@ -78,7 +78,7 @@ doConnectToAcceptor snocket makeBearer configureSocket address timeLimits app =
timeLimits
unversionedProtocolDataCodec
nullNetworkConnectTracers
acceptableVersion
(HandshakeCallbacks acceptableVersion queryVersion)
(simpleSingletonVersions
UnversionedProtocol
UnversionedProtocolData
Expand Down

0 comments on commit 9c58cef

Please sign in to comment.