Move relay & autonat to connectivity folder (#769)

examples/circuitrelay.nim

@@ -1,6 +1,6 @@
 import chronos, stew/byteutils
 import ../libp2p,
-       ../libp2p/protocols/relay/[relay, client]
+       ../libp2p/protocols/connectivity/relay/[relay, client]
 
 # Helper to create a circuit relay node
 proc createCircuitRelaySwitch(r: Relay): Switch =

libp2p/builders.nim

@@ -26,8 +26,8 @@ import
   switch, peerid, peerinfo, stream/connection, multiaddress,
   crypto/crypto, transports/[transport, tcptransport],
   muxers/[muxer, mplex/mplex, yamux/yamux],
-  protocols/[identify, secure/secure, secure/noise, autonat],
+  protocols/[identify, secure/secure, secure/noise],
-  protocols/relay/[relay, client, rtransport],
+  protocols/connectivity/[autonat, relay/relay, relay/client, relay/rtransport],
   connmanager, upgrademngrs/muxedupgrade,
   nameresolving/nameresolver,
   errors, utility

libp2p/protocols/connectivity/autonat.nim

@@ -14,13 +14,13 @@ else:
 
 import std/[options, sets, sequtils]
 import chronos, chronicles, stew/objects
-import ./protocol,
+import ../protocol,
-       ../switch,
+       ../../switch,
-       ../multiaddress,
+       ../../multiaddress,
-       ../multicodec,
+       ../../multicodec,
-       ../peerid,
+       ../../peerid,
-       ../utils/semaphore,
+       ../../utils/semaphore,
-       ../errors
+       ../../errors
 
 logScope:
   topics = "libp2p autonat"

libp2p/protocols/connectivity/relay/client.nim

@@ -20,10 +20,10 @@ import ./relay,
        ./messages,
        ./rconn,
        ./utils,
-       ../../peerinfo,
+       ../../../peerinfo,
-       ../../switch,
+       ../../../switch,
-       ../../multiaddress,
+       ../../../multiaddress,
-       ../../stream/connection
+       ../../../stream/connection
 
 
 logScope:

libp2p/protocols/connectivity/relay/messages.nim

@@ -14,8 +14,8 @@ else:
 
 import options, macros, sequtils
 import stew/objects
-import ../../peerinfo,
+import ../../../peerinfo,
-       ../../signed_envelope
+       ../../../signed_envelope
 
 # Circuit Relay V1 Message
 

libp2p/protocols/connectivity/relay/rconn.nim

@@ -14,7 +14,7 @@ else:
 
 import chronos
 
-import ../../stream/connection
+import ../../../stream/connection
 
 type
   RelayConnection* = ref object of Connection

libp2p/protocols/connectivity/relay/relay.nim

@@ -19,16 +19,16 @@ import chronos, chronicles
 import ./messages,
        ./rconn,
        ./utils,
-       ../../peerinfo,
+       ../../../peerinfo,
-       ../../switch,
+       ../../../switch,
-       ../../multiaddress,
+       ../../../multiaddress,
-       ../../multicodec,
+       ../../../multicodec,
-       ../../stream/connection,
+       ../../../stream/connection,
-       ../../protocols/protocol,
+       ../../../protocols/protocol,
-       ../../transports/transport,
+       ../../../transports/transport,
-       ../../errors,
+       ../../../errors,
-       ../../utils/heartbeat,
+       ../../../utils/heartbeat,
-       ../../signed_envelope
+       ../../../signed_envelope
 
 # TODO:
 # * Eventually replace std/times by chronos/timer. Currently chronos/timer

libp2p/protocols/connectivity/relay/rtransport.nim

@@ -19,9 +19,9 @@ import chronos, chronicles
 import ./client,
        ./rconn,
        ./utils,
-       ../../switch,
+       ../../../switch,
-       ../../stream/connection,
+       ../../../stream/connection,
-       ../../transports/transport
+       ../../../transports/transport
 
 logScope:
   topics = "libp2p relay relay-transport"

libp2p/protocols/connectivity/relay/utils.nim

@@ -17,7 +17,7 @@ import options
 import chronos, chronicles
 
 import ./messages,
-       ../../stream/connection
+       ../../../stream/connection
 
 logScope:
   topics = "libp2p relay relay-utils"

tests/commoninterop.nim

@@ -3,7 +3,7 @@ import chronos, chronicles, stew/byteutils
 import helpers
 import ../libp2p
 import ../libp2p/[daemon/daemonapi, varint, transports/wstransport, crypto/crypto]
-import ../libp2p/protocols/relay/[relay, client, utils]
+import ../libp2p/protocols/connectivity/relay/[relay, client, utils]
 
 type
   SwitchCreator = proc(

tests/testautonat.nim

@@ -3,7 +3,7 @@ import chronos
 import
   ../libp2p/[
     builders,
-    protocols/autonat
+    protocols/connectivity/autonat
   ],
   ./helpers
 

tests/testinterop.nim

@@ -2,7 +2,7 @@ import stublogger
 
 import helpers, commoninterop
 import ../libp2p
-import ../libp2p/crypto/crypto, ../libp2p/protocols/relay/[relay, client]
+import ../libp2p/crypto/crypto, ../libp2p/protocols/connectivity/relay/[relay, client]
 
 proc switchMplexCreator(
     ma: MultiAddress = MultiAddress.init("/ip4/127.0.0.1/tcp/0").tryGet(),

tests/testrelayv1.nim

@@ -2,11 +2,11 @@
 
 import options, bearssl, chronos
 import stew/byteutils
-import ../libp2p/[protocols/relay/relay,
+import ../libp2p/[protocols/connectivity/relay/relay,
-                  protocols/relay/client,
+                  protocols/connectivity/relay/client,
-                  protocols/relay/messages,
+                  protocols/connectivity/relay/messages,
-                  protocols/relay/utils,
+                  protocols/connectivity/relay/utils,
-                  protocols/relay/rtransport,
+                  protocols/connectivity/relay/rtransport,
                   multiaddress,
                   peerinfo,
                   peerid,

tests/testrelayv2.nim

@@ -2,10 +2,10 @@
 
 import bearssl, chronos, options
 import ../libp2p
-import ../libp2p/[protocols/relay/relay,
+import ../libp2p/[protocols/connectivity/relay/relay,
-                  protocols/relay/messages,
+                  protocols/connectivity/relay/messages,
-                  protocols/relay/utils,
+                  protocols/connectivity/relay/utils,
-                  protocols/relay/client]
+                  protocols/connectivity/relay/client]
 import ./helpers
 import std/times
 import stew/byteutils