From f0636bcd9d760d0482ec42be263996f7c898de88 Mon Sep 17 00:00:00 2001
From: Hanno Cornelius <68783915+jm-clius@users.noreply.github.com>
Date: Mon, 21 Dec 2020 11:14:51 +0200
Subject: [PATCH] enhancement/unused-import-cleanup (#322)

---
 examples/v2/chat2.nim                            | 1 -
 tests/v2/test_waku_swap.nim                      | 5 -----
 waku/common/wakubridge.nim                       | 2 +-
 waku/v2/node/jsonrpc/admin_api.nim               | 2 +-
 waku/v2/node/message_store.nim                   | 3 +--
 waku/v2/node/quicksim2.nim                       | 2 +-
 waku/v2/node/start_network2.nim                  | 2 +-
 waku/v2/protocol/waku_store/waku_store_types.nim | 2 +-
 waku/v2/waku_types.nim                           | 5 ++---
 9 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/examples/v2/chat2.nim b/examples/v2/chat2.nim
index f86808e69..5081f223b 100644
--- a/examples/v2/chat2.nim
+++ b/examples/v2/chat2.nim
@@ -6,7 +6,6 @@ import confutils, chronicles, chronos, stew/shims/net as stewNet,
        eth/keys, bearssl, stew/[byteutils, endians2],
        nimcrypto/pbkdf2
 import libp2p/[switch,                   # manage transports, a single entry point for dialing and listening
-               multistream,              # tag stream with short header to identify it
                crypto/crypto,            # cryptographic functions
                protocols/identify,       # identify the peer info of a peer
                stream/connection,        # create and close stream read / write connections
diff --git a/tests/v2/test_waku_swap.nim b/tests/v2/test_waku_swap.nim
index 612545bcc..040e69634 100644
--- a/tests/v2/test_waku_swap.nim
+++ b/tests/v2/test_waku_swap.nim
@@ -6,15 +6,10 @@ import
   libp2p/stream/[bufferstream, connection],
   libp2p/crypto/[crypto, secp],
   libp2p/switch,
-  libp2p/protocols/pubsub/rpc/message,
-  libp2p/multistream,
-  libp2p/transports/transport,
-  libp2p/transports/tcptransport,
   eth/keys,
   ../../waku/v2/protocol/[message_notifier],
   ../../waku/v2/protocol/waku_store/waku_store,
   ../../waku/v2/protocol/waku_swap/waku_swap,
-  ../../waku/v2/node/message_store,
   ../../waku/v2/node/wakunode2,
   ../test_helpers, ./utils,
   ../../waku/v2/waku_types
diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim
index a6884d068..e0a123365 100644
--- a/waku/common/wakubridge.nim
+++ b/waku/common/wakubridge.nim
@@ -7,7 +7,7 @@ import
   eth/p2p/[enode, whispernodes],
   ../v1/protocol/waku_protocol,
   ./utils/nat,
-  ../v1/node/rpc/[waku, wakusim, key_storage],
+  ../v1/node/rpc/wakusim,
   ../v1/node/waku_helpers,
   # Waku v2 imports
   libp2p/crypto/crypto,
diff --git a/waku/v2/node/jsonrpc/admin_api.nim b/waku/v2/node/jsonrpc/admin_api.nim
index 4c5873c03..770e7a9a1 100644
--- a/waku/v2/node/jsonrpc/admin_api.nim
+++ b/waku/v2/node/jsonrpc/admin_api.nim
@@ -9,7 +9,7 @@ import
   ../../protocol/waku_swap/[waku_swap_types, waku_swap],
   ../../protocol/waku_filter,
   ../wakunode2,
-  ./jsonrpc_types, ./jsonrpc_utils
+  ./jsonrpc_types
 
 proc constructMultiaddrStr*(peerInfo: PeerInfo): string =
   # Constructs a multiaddress with both location address and p2p identity
diff --git a/waku/v2/node/message_store.nim b/waku/v2/node/message_store.nim
index f0cb9e53b..b42a9108b 100644
--- a/waku/v2/node/message_store.nim
+++ b/waku/v2/node/message_store.nim
@@ -1,7 +1,6 @@
 import 
-  os, 
   sqlite3_abi,
-  chronos, chronicles, metrics, stew/results,
+  chronos, metrics, stew/results,
   libp2p/crypto/crypto,
   libp2p/protocols/protocol,
   libp2p/protobuf/minprotobuf,
diff --git a/waku/v2/node/quicksim2.nim b/waku/v2/node/quicksim2.nim
index e1a40d185..78510fda5 100644
--- a/waku/v2/node/quicksim2.nim
+++ b/waku/v2/node/quicksim2.nim
@@ -1,5 +1,5 @@
 import
-  os, strutils, strformat, chronicles, json_rpc/[rpcclient, rpcserver], nimcrypto/sysrand,
+  os, strutils, chronicles, json_rpc/[rpcclient, rpcserver],
   libp2p/protobuf/minprotobuf,
   eth/common as eth_common, eth/keys,
   options
diff --git a/waku/v2/node/start_network2.nim b/waku/v2/node/start_network2.nim
index 723648dba..f0ed45574 100644
--- a/waku/v2/node/start_network2.nim
+++ b/waku/v2/node/start_network2.nim
@@ -1,5 +1,5 @@
 import
-  strformat, os, osproc, net, confutils, strformat, chronicles, json,
+  strformat, os, osproc, net, strformat, chronicles, json,
   libp2p/multiaddress,
   libp2p/crypto/crypto,
   libp2p/crypto/secp,
diff --git a/waku/v2/protocol/waku_store/waku_store_types.nim b/waku/v2/protocol/waku_store/waku_store_types.nim
index 8a4e7741f..273ecb21a 100644
--- a/waku/v2/protocol/waku_store/waku_store_types.nim
+++ b/waku/v2/protocol/waku_store/waku_store_types.nim
@@ -1,7 +1,7 @@
 ## Types for waku_store protocol.
 
 import
-  bearssl, stew/[byteutils, endians2],
+  bearssl,
   libp2p/[switch, peerinfo],
   libp2p/protocols/protocol,
   ../../waku_types,
diff --git a/waku/v2/waku_types.nim b/waku/v2/waku_types.nim
index c16a33ae2..468149016 100644
--- a/waku/v2/waku_types.nim
+++ b/waku/v2/waku_types.nim
@@ -3,15 +3,14 @@
 ## TODO Move types here into their appropriate place
 
 import
-  std/[tables, times],
-  chronos, bearssl, stew/[byteutils, endians2],
+  std/tables,
+  chronos, bearssl, stew/byteutils,
   libp2p/[switch, peerinfo, multiaddress, crypto/crypto],
   libp2p/protobuf/minprotobuf,
   libp2p/protocols/protocol,
   libp2p/switch,
   libp2p/stream/connection,
   libp2p/protocols/pubsub/[pubsub, gossipsub],
-  protocol/waku_swap/waku_swap_types,
   nimcrypto/sha2,
   ./node/sqlite