reordering into factory module

apps/wakunode2/app.nim

@@ -30,7 +30,6 @@ import
   ../../waku/node/waku_metrics,
   ../../waku/node/peer_manager,
   ../../waku/node/peer_manager/peer_store/waku_peer_storage,
-  ../../waku/node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations,
   ../../waku/waku_api/message_cache,
   ../../waku/waku_api/handlers,
   ../../waku/waku_api/rest/server,
@@ -57,7 +56,9 @@ import
   ../../waku/waku_lightpush/common,
   ../../waku/waku_filter,
   ../../waku/waku_filter_v2,
-  ./external_config
+  ../../waku/factory/node_factory,
+  ../../waku/factory/internal_config,
+  ../../waku/factory/external_config
 
 logScope:
   topics = "wakunode app"

apps/wakunode2/wakunode2.nim

@@ -15,7 +15,7 @@ import
 import
   ../../tools/rln_keystore_generator/rln_keystore_generator,
   ../../waku/common/logging,
-  ./external_config,
+  ../../waku/factory/external_config,
   ./networks_config,
   ./app
 

tests/testlib/wakunode.nim

@@ -13,7 +13,7 @@ import
   ../../../waku/node/peer_manager,
   ../../../waku/waku_enr,
   ../../../waku/waku_discv5,
-  ../../apps/wakunode2/external_config,
+  ../../../waku/factory/external_config,
   ./common
 
 

tests/wakunode2/test_validators.nim

@@ -13,11 +13,12 @@ import
   libp2p/multihash,
   secp256k1
 import
-  ../../apps/wakunode2/external_config,
+  ../../waku/factory/external_config,
   ../../waku/waku_core,
   ../../waku/node/peer_manager,
   ../../waku/waku_node,
   ../../waku/waku_relay,
+  ../../waku/waku_relay/types,
   ../testlib/wakucore,
   ../testlib/wakunode
 

tools/rln_db_inspector/rln_db_inspector.nim

@@ -11,7 +11,7 @@ import
 import
   ../../waku/waku_rln_relay/rln,
   ../../waku/waku_rln_relay/conversion_utils,
-  ./external_config
+  ../../waku/factory/external_config
 
 logScope:
   topics = "rln_db_inspector"

tools/rln_keystore_generator/rln_keystore_generator.nim

@@ -13,7 +13,7 @@ import
   ../../waku/waku_rln_relay/rln,
   ../../waku/waku_rln_relay/conversion_utils,
   ../../waku/waku_rln_relay/group_manager/on_chain,
-  ../../apps/wakunode2/external_config
+  ../../waku/factory/external_config
 
 logScope:
   topics = "rln_keystore_generator"

waku/factory/external_config.nim

@@ -14,14 +14,15 @@ import
   nimcrypto/utils,
   secp256k1
 import
-  ../../waku/common/confutils/envvar/defs as confEnvvarDefs,
-  ../../waku/common/confutils/envvar/std/net as confEnvvarNet,
-  ../../waku/common/logging,
-  ../../waku/waku_enr,
-  ../../waku/node/peer_manager
+  ../common/confutils/envvar/defs as confEnvvarDefs,
+  ../common/confutils/envvar/std/net as confEnvvarNet,
+  ../common/logging,
+  ../waku_enr,
+  ../waku_relay/types,
+  ../node/peer_manager
 
 include
-  ../../waku/waku_core/message/default_values
+  ../waku_core/message/default_values
 
 export
   confTomlDefs,
@@ -30,9 +31,6 @@ export
   confEnvvarNet
 
 type ConfResult*[T] = Result[T, string]
-type ProtectedTopic* = object
-  topic*: string
-  key*: secp256k1.SkPublicKey
 
 type ShardIdx = distinct uint16
 

waku/factory/internal_config.nim

@@ -8,12 +8,12 @@ import
   stew/results,
   stew/shims/net
 import
+  ./external_config,
   ../common/utils/nat,
   ../node/config,
   ../waku_enr/capabilities,
   ../waku_enr,
-  ../waku_core,
-  ../../apps/wakunode2/external_config
+  ../waku_core
 
 proc enrConfiguration*(conf: WakuNodeConf, netConfig: NetConfig, key: crypto.PrivateKey):
                       Result[enr.Record, string] =

waku/factory/node_factory.nim

@@ -8,15 +8,10 @@ import
   libp2p/crypto/crypto
 
 import
-  ./waku_node,
-  ./config,
-  ./builder,
   ./internal_config,
-  ./validator_signed,
-  ./peer_manager,
-  ./peer_manager/peer_store/waku_peer_storage,
-  ./peer_manager/peer_store/migrations as peer_store_sqlite_migrations,
+  ./external_config,
   ../waku_enr/sharding,
+  ../waku_node,
   ../waku_core,
   ../waku_rln_relay,
   ../waku_dnsdisc,
@@ -25,11 +20,15 @@ import
   ../waku_filter,
   ../waku_filter_v2,
   ../waku_peer_exchange,
+  ../node/peer_manager,
+  ../node/peer_manager/peer_store/waku_peer_storage,
+  ../node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations,
   ../waku_lightpush/common,
   ../waku_archive/driver/builder,
   ../waku_archive/retention_policy/builder,
-  ../common/utils/parse_size_units,
-  ../../apps/wakunode2/external_config
+  ../waku_relay/types,
+  ../waku_relay/validator_signed,
+  ../common/utils/parse_size_units
 
 ## Peer persistence
 

waku/waku_node.nim

@@ -1,17 +1,11 @@
 import
   ./node/config,
   ./node/builder,
-  ./node/node_factory,
-  ./node/internal_config,
-  ./node/validator_signed,
   ./node/waku_switch as switch,
   ./node/waku_node as node
 
 export
   config,
   builder,
-  node_factory,
-  internal_config,
-  validator_signed,
   switch,
   node

waku/waku_relay/types.nim

@@ -0,0 +1,5 @@
+import secp256k1
+
+type ProtectedTopic* = object
+    topic*: string
+    key*: secp256k1.SkPublicKey

waku/waku_relay/validator_signed.nim

@@ -19,9 +19,9 @@ import
 const MessageWindowInSec = 5*60 # +- 5 minutes
 
 import
-  ../waku_relay/protocol,
-  ../waku_core,
-  ../../apps/wakunode2/external_config
+  ./protocol,
+  ./types,
+  ../waku_core
 
 declarePublicCounter waku_msg_validator_signed_outcome, "number of messages for each validation outcome", ["result"]