Move state network to separate folder (#800)

fluffy/fluffy.nim

@@ -13,7 +13,7 @@ import
   json_rpc/rpcproxy,
   eth/keys, eth/net/nat,
   eth/p2p/discoveryv5/protocol as discv5_protocol,
-  ./conf, ./network/portal_protocol, ./rpc/eth_api, ./rpc/bridge_client
+  ./conf, ./network/state/portal_protocol, ./rpc/eth_api, ./rpc/bridge_client
 
 proc initializeBridgeClient(maybeUri: Option[string]): Option[BridgeClient] =
   try:

fluffy/network/portalcli.nim

@@ -12,7 +12,7 @@ import
   eth/[keys, net/nat],
   eth/p2p/discoveryv5/[enr, node],
   eth/p2p/discoveryv5/protocol as discv5_protocol,
-  ./messages, ./portal_protocol
+  ./state/messages, ./state/portal_protocol
 
 type
   PortalCmd* = enum

fluffy/network/state/messages.nim

@@ -14,7 +14,7 @@ import
   options,
   stint, stew/[results, objects],
   eth/ssz/ssz_serialization,
-  ../content
+  ./content
 
 export ssz_serialization, stint, content
 

fluffy/network/state/portal_protocol.nim

@@ -11,8 +11,7 @@ import
   std/[sequtils, sets, algorithm],
   stew/[results, byteutils], chronicles, chronos,
   eth/rlp, eth/p2p/discoveryv5/[protocol, node, enr, routing_table, random2],
-  ../content,
-  ./messages
+  ./content, ./messages
 
 export messages
 

fluffy/tests/test_content_network.nim

@@ -10,7 +10,7 @@ import
   testutils/unittests,
   eth/[keys, trie/db, trie/hexary, ssz/ssz_serialization],
   ../../nimbus/[genesis, chain_config, db/db_chain],
-  ../network/portal_protocol, ../content,
+  ../network/state/portal_protocol, ../network/state/content,
   ./test_helpers
 
 proc genesisToTrie(filePath: string): HexaryTrie =

fluffy/tests/test_portal.nim

@@ -11,7 +11,7 @@ import
   chronos, testutils/unittests, stew/shims/net,
   eth/keys, eth/p2p/discoveryv5/routing_table,
   eth/p2p/discoveryv5/protocol as discv5_protocol,
-  ../network/portal_protocol,
+  ../network/state/portal_protocol,
   ./test_helpers
 
 proc random(T: type UInt256, rng: var BrHmacDrbgContext): T =

fluffy/tests/test_portal_encoding.nim

@@ -10,7 +10,7 @@
 import
   std/unittest,
   stint, stew/[byteutils, results], eth/p2p/discoveryv5/enr,
-  ../network/messages
+  ../network/state/messages
 
 suite "Portal Protocol Message Encodings":
   test "Ping Request":