make it build with network-3.1.0.1

Some dodgy changes to swagger stuff: had to place .~ with ?~ but I have
no clue what I'm doing here. Judging from resources found on the
internet it seems to be the way forward but I am not at all sure please
review.

ALSO important news: the kademlia dependency is now gone. We never used
it anyway and it was just annoying to maintain (it depends upon old
network). Unforunately this change may break existing configurations. We
shall see.

Author: avieth

infra/cardano-sl-infra.cabal

@@ -21,7 +21,6 @@ library
                         Pos.Infra.Diffusion.Types
                         Pos.Infra.Diffusion.Subscription.Common
                         Pos.Infra.Diffusion.Subscription.Dns
-                        Pos.Infra.Diffusion.Subscription.Dht
                         Pos.Infra.Diffusion.Subscription.Status
                         Pos.Infra.Diffusion.Subscription.Subscriber
 
@@ -49,18 +48,6 @@ library
                         Pos.Infra.Slotting.Error
                         Pos.Infra.Slotting.Util
 
-                        -- Pos.Infra.DHT
-                        Pos.Infra.DHT
-                        Pos.Infra.DHT.Constants
-                        Pos.Infra.DHT.Model
-                        Pos.Infra.DHT.Model.Types
-                        Pos.Infra.DHT.Real
-                        Pos.Infra.DHT.Real.Real
-                        Pos.Infra.DHT.Real.Types
-                        Pos.Infra.DHT.Real.Param
-                        Pos.Infra.DHT.Real.CLI
-                        Pos.Infra.DHT.Workers
-
                         -- Pos.Infra.Communication
                         Pos.Infra.Communication.Constants
                         Pos.Infra.Communication.Types.Protocol
@@ -104,10 +91,6 @@ library
                         Pos.Infra.Statistics.Ekg
                         Pos.Infra.Statistics.Statsd
 
-                        -- Pos.Infra.Binary
-                        Pos.Infra.Binary
-                        Pos.Infra.Binary.DHTModel
-
                         -- Pos.Util
                         Pos.Infra.Util.JsonLog.Events
                         Pos.Infra.Util.LogSafe
@@ -146,7 +129,6 @@ library
                       , http-client
                       , http-client-tls
                       , iproute
-                      , kademlia
                       , lens
                       , megaparsec
                       , mtl
@@ -246,7 +228,6 @@ test-suite infra-test
                   , hedgehog
                   , hspec
                   , iproute
-                  , kademlia
                   , universum
                   , yaml
 

infra/src/Pos/Infra/Binary.hs

@@ -351,9 +351,6 @@ instance Monoid MkListeners where
 -- needs to periodically send keep-alive like data to node B in order to ensure
 -- that the connection is valid.
 --
--- Kademlia nodes might also use this if they want a guarantee that they receive
--- messages from their peers (without subscription we rely on luck for some
--- nodes to decide to add us to their list of known peers).
 data MsgSubscribe = MsgSubscribe | MsgSubscribeKeepAlive
     deriving (Generic, Show, Eq)