Skip to content

Commit 3c2318f

Browse files
cootcoot
authored
Merge pull request #5139 from IntersectMBO/coot/cardano-diffusion-integration
cardano-diffusion: integration changes
2 parents 1f50837 + fee2d01 commit 3c2318f

File tree

45 files changed

+472
-381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+472
-381
lines changed

‎decentralized-message-queue/app/Main.hs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,10 @@ debugTracers :: ( Applicative m
8888
, Show ntnAddr
8989
, Show ntnVersion
9090
, Show ntnVersionData
91-
, Show resolverError
9291
)
9392
=> Diffusion.Tracers ntnAddr ntnVersion ntnVersionData
9493
ntcAddr ntcVersion ntcVersionData
95-
resolverError extraState extraDebugState
94+
extraState extraDebugState
9695
extraFlags extraPeers extraCounters m
9796
debugTracers =
9897
Diffusion.Tracers {

‎decentralized-message-queue/decentralized-message-queue.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ library
8888
network-mux ^>=0.8,
8989
nothunks ^>=0.1.4 || ^>=0.2,
9090
optparse-applicative ^>=0.18,
91-
ouroboros-network:{ouroboros-network, ouroboros-orphan-instances} ^>=0.21,
91+
ouroboros-network:{ouroboros-network, orphan-instances} ^>=0.21,
9292
ouroboros-network-api ^>=0.14,
9393
ouroboros-network-framework ^>=0.18,
9494
ouroboros-network-protocols ^>=0.14.0.1,

‎decentralized-message-queue/src/DMQ/Configuration.hs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{-# LANGUAGE DeriveGeneric #-}
2+
{-# LANGUAGE NamedFieldPuns #-}
23
{-# LANGUAGE OverloadedStrings #-}
34

45
{-# OPTIONS_GHC -Wno-orphans #-}
5-
{-# LANGUAGE NamedFieldPuns #-}
66

77
module DMQ.Configuration where
88

@@ -66,19 +66,19 @@ instance FromJSON (Configuration ntnFd ntnAddr ntcFd ntcAddr) where
6666
.!= InitiatorAndResponderDiffusionMode
6767

6868
dmqcTargetOfRootPeers <- v .:? "TargetNumberOfRootPeers"
69-
.!= (targetNumberOfRootPeers defaultDeadlineTargets)
69+
.!= targetNumberOfRootPeers defaultDeadlineTargets
7070
dmqcTargetOfKnownPeers <- v .:? "TargetNumberOfKnownPeers"
71-
.!= (targetNumberOfKnownPeers defaultDeadlineTargets)
71+
.!= targetNumberOfKnownPeers defaultDeadlineTargets
7272
dmqcTargetOfEstablishedPeers <- v .:? "TargetNumberOfEstablishedPeers"
73-
.!= (targetNumberOfEstablishedPeers defaultDeadlineTargets)
73+
.!= targetNumberOfEstablishedPeers defaultDeadlineTargets
7474
dmqcTargetOfActivePeers <- v .:? "TargetNumberOfActivePeers"
75-
.!= (targetNumberOfActivePeers defaultDeadlineTargets)
75+
.!= targetNumberOfActivePeers defaultDeadlineTargets
7676
dmqcTargetOfKnownBigLedgerPeers <- v .:? "TargetNumberOfKnownBigLedgerPeers"
77-
.!= (targetNumberOfKnownBigLedgerPeers defaultDeadlineTargets)
77+
.!= targetNumberOfKnownBigLedgerPeers defaultDeadlineTargets
7878
dmqcTargetOfEstablishedBigLedgerPeers <- v .:? "TargetNumberOfEstablishedBigLedgerPeers"
79-
.!= (targetNumberOfEstablishedBigLedgerPeers defaultDeadlineTargets)
79+
.!= targetNumberOfEstablishedBigLedgerPeers defaultDeadlineTargets
8080
dmqcTargetOfActiveBigLedgerPeers <- v .:? "TargetNumberOfActiveBigLedgerPeers"
81-
.!= (targetNumberOfActiveBigLedgerPeers defaultDeadlineTargets)
81+
.!= targetNumberOfActiveBigLedgerPeers defaultDeadlineTargets
8282

8383
dmqcProtocolIdleTimeout <- v .:? "ProtocolIdleTimeout"
8484
.!= defaultProtocolIdleTimeout
@@ -169,7 +169,7 @@ mkDiffusionConfiguration
169169
, dmqcChurnInterval
170170
, dmqcPeerSharing
171171
} = do
172-
s <- (addrAddress . NonEmpty.head)
172+
s <- addrAddress . NonEmpty.head
173173
<$> getAddrInfo (Just hints)
174174
(Just (show ipv4))
175175
(Just (show port))
@@ -206,7 +206,7 @@ mkDiffusionConfiguration
206206
, Diffusion.dcReadLocalRootPeers = readTVar localRootsVar
207207
, Diffusion.dcReadPublicRootPeers = readTVar publicRootsVar
208208
, Diffusion.dcReadLedgerPeerSnapshot = readTVar ledgerPeerSnapshotVar
209-
, Diffusion.dcOwnPeerSharing = dmqcPeerSharing
209+
, Diffusion.dcPeerSharing = dmqcPeerSharing
210210
, Diffusion.dcReadUseLedgerPeers = readTVar useLedgerVar
211211
, Diffusion.dcProtocolIdleTimeout = dmqcProtocolIdleTimeout
212212
, Diffusion.dcTimeWaitTimeout = defaultTimeWaitTimeout
@@ -227,7 +227,7 @@ mkDiffusionConfiguration
227227
-> IO (Maybe LedgerPeerSnapshot)
228228
updateLedgerPeerSnapshot readLedgerPeerPath writeVar = do
229229
mPeerSnapshotFile <- atomically readLedgerPeerPath
230-
mLedgerPeerSnapshot <- forM mPeerSnapshotFile $ readPeerSnapshotFileOrError
230+
mLedgerPeerSnapshot <- forM mPeerSnapshotFile readPeerSnapshotFileOrError
231231
atomically . writeVar $ mLedgerPeerSnapshot
232232
pure mLedgerPeerSnapshot
233233

‎decentralized-message-queue/src/DMQ/Diffusion/Applications.hs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ diffusionApplications
6363
}
6464
Diffusion.Configuration {
6565
dcMode
66-
, dcOwnPeerSharing
66+
, dcPeerSharing
6767
}
6868
ntnLimitsAndTimeouts
6969
ntnApps
@@ -73,15 +73,15 @@ diffusionApplications
7373
combineVersions
7474
[ simpleSingletonVersions
7575
version
76-
(stdVersionDataNTN dmqcNetworkMagic dcMode dcOwnPeerSharing)
76+
(stdVersionDataNTN dmqcNetworkMagic dcMode dcPeerSharing)
7777
(NTN.initiatorProtocols ntnLimitsAndTimeouts ntnApps version)
7878
| version <- [minBound..maxBound]
7979
]
8080
, daApplicationInitiatorResponderMode =
8181
combineVersions
8282
[ simpleSingletonVersions
8383
version
84-
(stdVersionDataNTN dmqcNetworkMagic dcMode dcOwnPeerSharing)
84+
(stdVersionDataNTN dmqcNetworkMagic dcMode dcPeerSharing)
8585
(NTN.initiatorAndResponderProtocols ntnLimitsAndTimeouts ntnApps version)
8686
| version <- [minBound..maxBound]
8787
]
@@ -99,9 +99,14 @@ diffusionApplications
9999
]
100100
, daRethrowPolicy = muxErrorRethrowPolicy
101101
<> ioErrorRethrowPolicy
102-
, daReturnPolicy = const (RepromoteDelay 0)
102+
, daReturnPolicy = const dmqRepromoteDelay
103+
, daRepromoteErrorDelay = dmqRepromoteDelay
103104
, daLocalRethrowPolicy = mempty
104105
, daPeerSelectionPolicy = peerSelectionPolicy
105106
, daPeerSharingRegistry = peerSharingRegistry
106107
}
107108

109+
110+
-- | PeerSelection RepromoteDelay used after
111+
dmqRepromoteDelay :: RepromoteDelay
112+
dmqRepromoteDelay = 10

‎decentralized-message-queue/src/DMQ/Diffusion/Arguments.hs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module DMQ.Diffusion.Arguments (diffusionArguments) where
66

77
import Control.Applicative (Alternative)
88
import Control.Concurrent.Class.MonadSTM (MonadSTM (..))
9-
import Control.Exception (Exception, IOException)
9+
import Control.Exception (Exception)
1010
import Control.Monad.Class.MonadST (MonadST)
1111
import Control.Monad.Class.MonadThrow (MonadCatch)
1212
import Control.Monad.Class.MonadTimer.SI (MonadDelay, MonadTimer)
@@ -41,7 +41,6 @@ diffusionArguments
4141
() () () () () () ()
4242
exception
4343
Resolver
44-
IOException
4544
m
4645
Socket
4746
ntnAddr

‎decentralized-message-queue/src/DMQ/Diffusion/PeerSelection.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ policy gen =
2424
, policyPeerShareBatchWaitTime = 0 -- seconds
2525
, policyPeerShareOverallTimeout = 0 -- seconds
2626
, policyPeerShareActivationDelay = 2 -- seconds
27-
, policyErrorDelay = 0 -- seconds
2827
}
2928
where
3029
pickTrivially :: Applicative m => Set SockAddr -> Int -> m (Set SockAddr)

‎ouroboros-network-framework/demo/connection-manager.hs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ import Ouroboros.Network.Mux
6969
import Ouroboros.Network.MuxMode
7070
import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
7171
import Ouroboros.Network.Protocol.Handshake
72-
import Ouroboros.Network.Protocol.Handshake.Codec (timeLimitsHandshake)
7372
import Ouroboros.Network.Protocol.Handshake.Unversioned
74-
import Ouroboros.Network.Protocol.Handshake.Version (Acceptable (..),
75-
Queryable (..))
7673
import Ouroboros.Network.RethrowPolicy
7774
import Ouroboros.Network.Server qualified as Server
7875
import Ouroboros.Network.Server.RateLimiting (AcceptedConnectionsLimit (..))

‎ouroboros-network-framework/io-tests/Test/Ouroboros/Network/Socket.hs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ import Network.Mux.Timeout qualified as Mx
6262
import Network.Mux.Types qualified as Mx
6363

6464
import Ouroboros.Network.Protocol.Handshake
65-
import Ouroboros.Network.Protocol.Handshake.Codec
6665
import Ouroboros.Network.Protocol.Handshake.Unversioned
67-
import Ouroboros.Network.Protocol.Handshake.Version
6866

6967
import Test.Ouroboros.Network.Orphans ()
7068

‎ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/Socket.hs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ import Network.Mux.Types (MiniProtocolDir (..), RemoteClockModel (..))
6565
import Network.Mux.Types qualified as Mx
6666

6767
import Ouroboros.Network.Protocol.Handshake
68-
import Ouroboros.Network.Protocol.Handshake.Codec
6968
import Ouroboros.Network.Protocol.Handshake.Unversioned
70-
import Ouroboros.Network.Protocol.Handshake.Version
7169

7270
import Test.Ouroboros.Network.Orphans ()
7371

‎ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake.hs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ module Ouroboros.Network.Protocol.Handshake
1616
, RefuseReason (..)
1717
, Accept (..)
1818
, handshake_QUERY_SHUTDOWN_DELAY
19+
-- * Re-exports
20+
, module Ouroboros.Network.Protocol.Handshake.Type
21+
, module Ouroboros.Network.Protocol.Handshake.Codec
22+
, module Ouroboros.Network.Protocol.Handshake.Version
23+
, Acceptable (..)
24+
, Queryable (..)
1925
) where
2026

2127
import Control.Monad.Class.MonadAsync

0 commit comments

Comments
 (0)