Move protocol and rpc ns

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

node/v2/waku2_protocol.nim

@@ -1,3 +0,0 @@
-const wakuVersionStr = "2.0.0-alpha1"
-
-# TODO: Move me to protocol ns

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
 

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"