From 971c7a262b5b747de368ddccd6b66b4a3725b9e7 Mon Sep 17 00:00:00 2001
From: Oskar Thoren <ot@oskarthoren.com>
Date: Wed, 27 May 2020 12:07:11 +0800
Subject: [PATCH] Remove unused imports

---
 tests/v2/standard_setup.nim        |  2 +-
 waku/node/v2/quicksim.nim          |  3 +--
 waku/node/v2/rpc/wakurpc.nim       | 10 +++-------
 waku/node/v2/start_network.nim     |  3 +--
 waku/node/v2/wakunode.nim          |  8 +++-----
 waku/protocol/v2/waku_protocol.nim |  3 ++-
 6 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/tests/v2/standard_setup.nim b/tests/v2/standard_setup.nim
index 463e1bf4d..fcdff52b9 100644
--- a/tests/v2/standard_setup.nim
+++ b/tests/v2/standard_setup.nim
@@ -10,7 +10,7 @@ import
   libp2p/transports/[transport, tcptransport],
   libp2p/muxers/[muxer, mplex/mplex, mplex/types],
   libp2p/protocols/[identify, secure/secure],
-  libp2p/protocols/pubsub/[pubsub, gossipsub, floodsub],
+  libp2p/protocols/pubsub/[pubsub, gossipsub],
   ../../waku/protocol/v2/waku_protocol
 
 when libp2p_secure == "noise":
diff --git a/waku/node/v2/quicksim.nim b/waku/node/v2/quicksim.nim
index ecf9eea84..42f45a473 100644
--- a/waku/node/v2/quicksim.nim
+++ b/waku/node/v2/quicksim.nim
@@ -3,8 +3,7 @@ import
   eth/common as eth_common, eth/keys,
   # XXX: Replace me
   ../../protocol/v1/waku_protocol,
-  ../v1/rpc/[hexstrings, rpc_types, waku],
-  rpc/wakurpc,
+  ../v1/rpc/[hexstrings, rpc_types],
   options as what # TODO: Huh? Redefinition?
 
 from os import DirSep
diff --git a/waku/node/v2/rpc/wakurpc.nim b/waku/node/v2/rpc/wakurpc.nim
index 11704cffd..4551130a9 100644
--- a/waku/node/v2/rpc/wakurpc.nim
+++ b/waku/node/v2/rpc/wakurpc.nim
@@ -1,13 +1,9 @@
 import
-  json_rpc/rpcserver, tables, options,
+  json_rpc/rpcserver, options,
   eth/[common, rlp, keys, p2p],
   ../../../protocol/v2/waku_protocol,
-  nimcrypto/[sysrand, hmac, sha2, pbkdf2],
-  ../../v1/rpc/[rpc_types, hexstrings, key_storage],
-  ../waku_types,
-  libp2p/protocols/pubsub/pubsub
-
-from stew/byteutils import hexToSeqByte, hexToByteArray
+  nimcrypto/[sysrand, hmac, sha2],
+  ../waku_types
 
 # Instead of using rlpx waku_protocol here, lets do mock waku2_protocol
 # This should wrap GossipSub, not use EthereumNode here
diff --git a/waku/node/v2/start_network.nim b/waku/node/v2/start_network.nim
index e4e99f441..9745343ab 100644
--- a/waku/node/v2/start_network.nim
+++ b/waku/node/v2/start_network.nim
@@ -1,9 +1,8 @@
 import
-  strformat, os, osproc, net, confutils, strformat, chronicles, json,
+  strformat, os, osproc, net, strformat, chronicles,
   libp2p/multiaddress,
   libp2p/crypto/crypto,
   libp2p/crypto/secp,
-  libp2p/protocols/protocol,
   libp2p/peerinfo
 
 # Fix ambiguous call error
diff --git a/waku/node/v2/wakunode.nim b/waku/node/v2/wakunode.nim
index 11b184cc0..7f2005875 100644
--- a/waku/node/v2/wakunode.nim
+++ b/waku/node/v2/wakunode.nim
@@ -1,10 +1,8 @@
 import
   confutils, config, strutils, chronos, json_rpc/rpcserver, metrics,
   chronicles/topics_registry, # TODO: What? Need this for setLoglevel, weird.
-  eth/[keys, p2p, async_utils], eth/net/nat,
-  eth/p2p/[discovery, enode, peer_pool, bootnodes, whispernodes],
-  # TODO remove me
-  ../v1/rpc/[wakusim, key_storage],
+  eth/[keys, p2p], eth/net/nat,
+  eth/p2p/[discovery, enode],
   libp2p/multiaddress,
   libp2p/crypto/crypto,
   libp2p/protocols/protocol,
@@ -196,7 +194,6 @@ proc run(config: WakuNodeConf) =
   # Optionally direct connect with a set of nodes
   if config.staticnodes.len > 0: connectToNodes(wakuProto, config.staticnodes)
 
-  ### XXX: Fixup
   if config.logMetrics:
     proc logMetrics(udata: pointer) {.closure, gcsafe.} =
       {.gcsafe.}:
@@ -205,6 +202,7 @@ proc run(config: WakuNodeConf) =
           totalMessages = total_messages.value
           # NOTE: Just message volume for now, no valid/invalid envelopes
       info "Node metrics", connectedPeers, totalMessages
+      # FIXME Warning: Use setTimer/clearTimer instead; addTimer is deprecated [Deprecated]
       addTimer(Moment.fromNow(2.seconds), logMetrics)
     addTimer(Moment.fromNow(2.seconds), logMetrics)
 
diff --git a/waku/protocol/v2/waku_protocol.nim b/waku/protocol/v2/waku_protocol.nim
index 447f8587e..5415b759d 100644
--- a/waku/protocol/v2/waku_protocol.nim
+++ b/waku/protocol/v2/waku_protocol.nim
@@ -70,9 +70,10 @@ method subscribeTopic*(w: WakuSub,
   debug "subscribeTopic", topic=topic, subscribe=subscribe, peerId=peerId
   procCall FloodSub(w).subscribeTopic(topic, subscribe, peerId)
 
-# TODO: Decrement connected peers here
+# TODO: Fix decrement connected peers here or somewhere else
 method handleDisconnect*(w: WakuSub, peer: PubSubPeer) {.async.} =
   debug "handleDisconnect (NYI)"
+  #connected_peers.dec()
 
 method rpcHandler*(w: WakuSub,
                    peer: PubSubPeer,