From ca3f634239d779443759bccdeea45ded9bcd4bdd Mon Sep 17 00:00:00 2001
From: Csaba Kiraly <csaba.kiraly@gmail.com>
Date: Wed, 23 Feb 2022 22:11:27 +0100
Subject: [PATCH] import eth/[rlp, keys, async_utils, net/utils] directly from
 eth

---
 eth/p2p/discoveryv5/encoding.nim          | 2 +-
 eth/p2p/discoveryv5/enr.nim               | 2 +-
 eth/p2p/discoveryv5/messages.nim          | 2 +-
 eth/p2p/discoveryv5/messages_encoding.nim | 2 +-
 eth/p2p/discoveryv5/node.nim              | 2 +-
 eth/p2p/discoveryv5/protocol.nim          | 2 +-
 eth/p2p/discoveryv5/routing_table.nim     | 2 +-
 tests/p2p/discv5_test_helper.nim          | 2 +-
 tests/p2p/test_discoveryv5.nim            | 2 +-
 tests/p2p/test_discoveryv5_encoding.nim   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eth/p2p/discoveryv5/encoding.nim b/eth/p2p/discoveryv5/encoding.nim
index 7c0b160..7115778 100644
--- a/eth/p2p/discoveryv5/encoding.nim
+++ b/eth/p2p/discoveryv5/encoding.nim
@@ -16,7 +16,7 @@
 import
   std/[tables, options, hashes, net],
   nimcrypto, stint, chronicles, bearssl, stew/[results, byteutils], metrics,
-  ".."/../[rlp, keys],
+  eth/[rlp, keys],
   "."/[messages, messages_encoding, node, enr, hkdf, sessions]
 
 from stew/objects import checkedEnumAssign
diff --git a/eth/p2p/discoveryv5/enr.nim b/eth/p2p/discoveryv5/enr.nim
index b342a97..a774c6f 100644
--- a/eth/p2p/discoveryv5/enr.nim
+++ b/eth/p2p/discoveryv5/enr.nim
@@ -13,7 +13,7 @@
 import
   std/[strutils, macros, algorithm, options],
   stew/shims/net, stew/[base64, results], nimcrypto,
-  ".."/../[rlp, keys]
+  eth/[rlp, keys]
 
 export options, results
 
diff --git a/eth/p2p/discoveryv5/messages.nim b/eth/p2p/discoveryv5/messages.nim
index 1ff1dd0..46a9117 100644
--- a/eth/p2p/discoveryv5/messages.nim
+++ b/eth/p2p/discoveryv5/messages.nim
@@ -15,7 +15,7 @@
 import
   std/[hashes, net],
   stew/arrayops,
-  ".."/../[rlp, keys],
+  eth/[rlp, keys],
   ./enr
 
 type
diff --git a/eth/p2p/discoveryv5/messages_encoding.nim b/eth/p2p/discoveryv5/messages_encoding.nim
index a1be75f..7c13ce2 100644
--- a/eth/p2p/discoveryv5/messages_encoding.nim
+++ b/eth/p2p/discoveryv5/messages_encoding.nim
@@ -1,5 +1,5 @@
 import
-  ".."/../[rlp],
+  eth/[rlp],
   "."/[messages, enr]
 
 from stew/objects import checkedEnumAssign
diff --git a/eth/p2p/discoveryv5/node.nim b/eth/p2p/discoveryv5/node.nim
index 3b311b9..4a9bbdb 100644
--- a/eth/p2p/discoveryv5/node.nim
+++ b/eth/p2p/discoveryv5/node.nim
@@ -10,7 +10,7 @@
 import
   std/hashes,
   nimcrypto, stint, chronos, stew/shims/net, chronicles,
-  ../../keys, ../../net/utils,
+  eth/keys, eth/net/utils,
   ./enr
 
 export stint
diff --git a/eth/p2p/discoveryv5/protocol.nim b/eth/p2p/discoveryv5/protocol.nim
index ff54f19..09fb2df 100644
--- a/eth/p2p/discoveryv5/protocol.nim
+++ b/eth/p2p/discoveryv5/protocol.nim
@@ -77,7 +77,7 @@ import
   std/[tables, sets, options, math, sequtils, algorithm],
   stew/shims/net as stewNet, json_serialization/std/net,
   stew/[endians2, results], chronicles, chronos, stint, bearssl, metrics,
-  ".."/../[rlp, keys, async_utils],
+  eth/[rlp, keys, async_utils],
   "."/[transport, messages, messages_encoding, node, routing_table, enr, random2, ip_vote, nodes_verification]
 
 import nimcrypto except toHex
diff --git a/eth/p2p/discoveryv5/routing_table.nim b/eth/p2p/discoveryv5/routing_table.nim
index 136ad39..441d99d 100644
--- a/eth/p2p/discoveryv5/routing_table.nim
+++ b/eth/p2p/discoveryv5/routing_table.nim
@@ -10,7 +10,7 @@
 import
   std/[algorithm, times, sequtils, bitops, sets, options],
   stint, chronicles, metrics, bearssl, chronos, stew/shims/net as stewNet,
-  ../../net/utils,
+  eth/net/utils,
   "."/[node, random2, enr]
 
 export options
diff --git a/tests/p2p/discv5_test_helper.nim b/tests/p2p/discv5_test_helper.nim
index 397bed5..bf8e6ee 100644
--- a/tests/p2p/discv5_test_helper.nim
+++ b/tests/p2p/discv5_test_helper.nim
@@ -1,6 +1,6 @@
 import
   stew/shims/net, bearssl, chronos,
-  ../../eth/keys,
+  eth/keys,
   ../../eth/p2p/discoveryv5/[enr, node, routing_table],
   ../../eth/p2p/discoveryv5/protocol as discv5_protocol
 
diff --git a/tests/p2p/test_discoveryv5.nim b/tests/p2p/test_discoveryv5.nim
index 56d5df3..8773d9f 100644
--- a/tests/p2p/test_discoveryv5.nim
+++ b/tests/p2p/test_discoveryv5.nim
@@ -4,7 +4,7 @@ import
   std/tables,
   chronos, chronicles, stint, testutils/unittests, stew/shims/net,
   stew/byteutils, bearssl,
-  ../../eth/keys,
+  eth/keys,
   ../../eth/p2p/discoveryv5/[transport, enr, node, routing_table, encoding, sessions, messages, nodes_verification],
   ../../eth/p2p/discoveryv5/protocol as discv5_protocol,
   ./discv5_test_helper
diff --git a/tests/p2p/test_discoveryv5_encoding.nim b/tests/p2p/test_discoveryv5_encoding.nim
index 796d5d8..cff6662 100644
--- a/tests/p2p/test_discoveryv5_encoding.nim
+++ b/tests/p2p/test_discoveryv5_encoding.nim
@@ -4,7 +4,7 @@ import
   std/[options, sequtils, tables],
   unittest2,
   stint, stew/byteutils, stew/shims/net,
-  ../../eth/[keys,rlp],
+  eth/[keys,rlp],
   ../../eth/p2p/discoveryv5/[messages, messages_encoding, encoding, enr, node, sessions]
 
 let rng = newRng()