From f4d17a50d9faf16bf19f4d270b3f7b9f622fa101 Mon Sep 17 00:00:00 2001
From: Oskar Thoren <ot@oskarthoren.com>
Date: Wed, 29 Apr 2020 13:02:42 +0800
Subject: [PATCH] Move protocol and rpc ns

---
 node/v2/{wakurpc2.nim => rpc/wakurpc.nim} | 9 +++++----
 node/v2/waku2_protocol.nim                | 3 ---
 node/v2/wakunode.nim                      | 6 ++++--
 protocol/v2/waku_protocol.nim             | 6 ++++++
 4 files changed, 15 insertions(+), 9 deletions(-)
 rename node/v2/{wakurpc2.nim => rpc/wakurpc.nim} (81%)
 delete mode 100644 node/v2/waku2_protocol.nim
 create mode 100644 protocol/v2/waku_protocol.nim

diff --git a/node/v2/wakurpc2.nim b/node/v2/rpc/wakurpc.nim
similarity index 81%
rename from node/v2/wakurpc2.nim
rename to node/v2/rpc/wakurpc.nim
index 24e77944f..a7a805cd8 100644
--- a/node/v2/wakurpc2.nim
+++ b/node/v2/rpc/wakurpc.nim
@@ -3,11 +3,11 @@ import
   eth/[common, rlp, keys, p2p],
   #DevP2P impl
   #eth/p2p/rlpx_protocols/waku_protocol,
-  waku2_protocol,
+  ../../../protocol/v2/waku_protocol,
   nimcrypto/[sysrand, hmac, sha2, pbkdf2],
-  ../../vendor/nimbus/nimbus/rpc/rpc_types,
-  ../../vendor/nimbus/nimbus/rpc/hexstrings,
-  ../../vendor/nimbus/nimbus/rpc/key_storage
+  ../../../vendor/nimbus/nimbus/rpc/rpc_types,
+  ../../../vendor/nimbus/nimbus/rpc/hexstrings,
+  ../../../vendor/nimbus/nimbus/rpc/key_storage
 
 from stew/byteutils import hexToSeqByte, hexToByteArray
 
@@ -18,6 +18,7 @@ from stew/byteutils import hexToSeqByte, hexToByteArray
 
 # XXX: Wrong, also what is wakuVersionStr?
 # We also have rlpx protocol here waku_protocol
+# XXX: WRong, should not be EthereumNode, should be libp2p node
 proc setupWakuRPC*(node: EthereumNode, keys: KeyStorage, rpcsrv: RpcServer) =
 
   # Seems easy enough, lets try to get this first
diff --git a/node/v2/waku2_protocol.nim b/node/v2/waku2_protocol.nim
deleted file mode 100644
index c514e2988..000000000
--- a/node/v2/waku2_protocol.nim
+++ /dev/null
@@ -1,3 +0,0 @@
-const wakuVersionStr = "2.0.0-alpha1"
-
-# TODO: Move me to protocol ns
diff --git a/node/v2/wakunode.nim b/node/v2/wakunode.nim
index 90531f396..59e6999e5 100644
--- a/node/v2/wakunode.nim
+++ b/node/v2/wakunode.nim
@@ -10,8 +10,10 @@ import
   ../../vendor/nim-libp2p/libp2p/crypto/crypto,
   ../../vendor/nim-libp2p/libp2p/protocols/protocol,
   ../../vendor/nim-libp2p/libp2p/peerinfo,
-  # TODO: RPC folder
-  wakurpc2
+  rpc/wakurpc
+
+  # TODO: Use
+  # protocol/waku_protocol
 
 # TODO: Better aliasing of vendor dirs
 
diff --git a/protocol/v2/waku_protocol.nim b/protocol/v2/waku_protocol.nim
new file mode 100644
index 000000000..1648fb38f
--- /dev/null
+++ b/protocol/v2/waku_protocol.nim
@@ -0,0 +1,6 @@
+## Waku on libp2p
+##
+## This file should eventually correspond to waku_protocol as RLPx subprotocol.
+## Instead, it should likely be on top of GossipSub with a similar interface.
+
+const wakuVersionStr = "2.0.0-alpha1"