From f9b2392e1c123e3c05d4f262a09f4cce9a645009 Mon Sep 17 00:00:00 2001
From: Dean Eigenmann <7621705+decanus@users.noreply.github.com>
Date: Tue, 28 Jul 2020 13:00:34 +0200
Subject: [PATCH] enhancement/move-standard-setup (#94)

* moves out

* oops

* setup

* fix
---
 tests/v2/utils.nim                         | 2 +-
 {tests => waku/node}/v2/standard_setup.nim | 2 +-
 waku/node/v2/waku_types.nim                | 2 +-
 waku/node/v2/wakunode2.nim                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename {tests => waku/node}/v2/standard_setup.nim (98%)

diff --git a/tests/v2/utils.nim b/tests/v2/utils.nim
index 1ce52a08f..3058f99e1 100644
--- a/tests/v2/utils.nim
+++ b/tests/v2/utils.nim
@@ -1,5 +1,5 @@
 import chronos
-import standard_setup
+import ../../waku/node/v2/standard_setup
 export standard_setup
 
 proc generateNodes*(num: Natural, gossip: bool = false): seq[Switch] =
diff --git a/tests/v2/standard_setup.nim b/waku/node/v2/standard_setup.nim
similarity index 98%
rename from tests/v2/standard_setup.nim
rename to waku/node/v2/standard_setup.nim
index 2d9b1dbb5..5f0fbdf89 100644
--- a/tests/v2/standard_setup.nim
+++ b/waku/node/v2/standard_setup.nim
@@ -12,7 +12,7 @@ import
   libp2p/muxers/[muxer, mplex/mplex, mplex/types],
   libp2p/protocols/[identify, secure/secure],
   libp2p/protocols/pubsub/[pubsub, gossipsub],
-  ../../waku/protocol/v2/waku_protocol2
+  ../../protocol/v2/waku_protocol2
 
 import
   libp2p/protocols/secure/noise,
diff --git a/waku/node/v2/waku_types.nim b/waku/node/v2/waku_types.nim
index a52100c24..586058129 100644
--- a/waku/node/v2/waku_types.nim
+++ b/waku/node/v2/waku_types.nim
@@ -2,7 +2,7 @@ import libp2p/multiaddress,
        libp2p/crypto/crypto,
        libp2p/protocols/protocol,
        libp2p/peerinfo,
-       ../../tests/v2/standard_setup
+       standard_setup
 
 type WakuProto* = ref object of LPProtocol
   switch*: Switch
diff --git a/waku/node/v2/wakunode2.nim b/waku/node/v2/wakunode2.nim
index 5465382c3..6f21ed93d 100644
--- a/waku/node/v2/wakunode2.nim
+++ b/waku/node/v2/wakunode2.nim
@@ -11,9 +11,9 @@ import
   libp2p/peerinfo,
   stew/shims/net as stewNet,
   rpc/wakurpc,
+  standard_setup,
   ../../protocol/v2/waku_protocol2,
   # TODO: Pull out standard switch from tests
-  ../../tests/v2/standard_setup,
   waku_types
 
 # key and crypto modules different