From 0438e71abd093863431b3cc558b268e421073e90 Mon Sep 17 00:00:00 2001 From: fryorcraken Date: Tue, 16 Sep 2025 15:39:13 +1000 Subject: [PATCH] remove confutils dependency on the library --- apps/liteprotocoltester/diagnose_connections.nim | 2 +- apps/liteprotocoltester/liteprotocoltester.nim | 2 +- apps/liteprotocoltester/tester_config.nim | 11 +++-------- apps/wakunode2/wakunode2.nim | 8 +++++--- tests/all_tests_waku.nim | 3 +++ tests/common/test_all.nim | 2 -- tests/tools/test_all.nim | 3 +++ tests/{common => tools}/test_confutils_envvar.nim | 4 +--- .../test_confutils_envvar_serialization.nim} | 2 +- {apps/wakunode2 => tools/confutils}/cli_args.nim | 8 +++----- .../envvar/defs.nim => tools/confutils/envvar.nim | 2 +- .../std/net.nim => tools/confutils/envvar_net.nim | 2 +- .../confutils}/envvar_serialization.nim | 0 .../confutils}/envvar_serialization/reader.nim | 0 .../confutils}/envvar_serialization/utils.nim | 0 .../confutils}/envvar_serialization/writer.nim | 0 waku.nimble | 13 ------------- 17 files changed, 23 insertions(+), 39 deletions(-) create mode 100644 tests/tools/test_all.nim rename tests/{common => tools}/test_confutils_envvar.nim (93%) rename tests/{common/test_envvar_serialization.nim => tools/test_confutils_envvar_serialization.nim} (84%) rename {apps/wakunode2 => tools/confutils}/cli_args.nim (99%) rename waku/common/confutils/envvar/defs.nim => tools/confutils/envvar.nim (91%) rename waku/common/confutils/envvar/std/net.nim => tools/confutils/envvar_net.nim (94%) rename {waku/common => tools/confutils}/envvar_serialization.nim (100%) rename {waku/common => tools/confutils}/envvar_serialization/reader.nim (100%) rename {waku/common => tools/confutils}/envvar_serialization/utils.nim (100%) rename {waku/common => tools/confutils}/envvar_serialization/writer.nim (100%) diff --git a/apps/liteprotocoltester/diagnose_connections.nim b/apps/liteprotocoltester/diagnose_connections.nim index 7167d08a8..f595b4e03 100644 --- a/apps/liteprotocoltester/diagnose_connections.nim +++ b/apps/liteprotocoltester/diagnose_connections.nim @@ -14,7 +14,7 @@ import libp2p/wire import - ../wakunode2/cli_args, + ../../tools/confutils/cli_args, waku/[ node/peer_manager, waku_lightpush/common, diff --git a/apps/liteprotocoltester/liteprotocoltester.nim b/apps/liteprotocoltester/liteprotocoltester.nim index d3adf1a81..2db9bf5ed 100644 --- a/apps/liteprotocoltester/liteprotocoltester.nim +++ b/apps/liteprotocoltester/liteprotocoltester.nim @@ -11,7 +11,7 @@ import confutils import - ../wakunode2/cli_args, + ../../tools/confutils/cli_args, waku/[ common/enr, common/logging, diff --git a/apps/liteprotocoltester/tester_config.nim b/apps/liteprotocoltester/tester_config.nim index 0eca62f65..dee918b8c 100644 --- a/apps/liteprotocoltester/tester_config.nim +++ b/apps/liteprotocoltester/tester_config.nim @@ -12,14 +12,9 @@ import secp256k1 import - ../wakunode2/cli_args, - waku/[ - common/confutils/envvar/defs as confEnvvarDefs, - common/confutils/envvar/std/net as confEnvvarNet, - common/logging, - waku_core, - waku_core/topics/pubsub_topic, - ] + ../../tools/confutils/ + [cli_args, envvar as confEnvvarDefs, envvar_net as confEnvvarNet], + waku/[common/logging, waku_core, waku_core/topics/pubsub_topic] export confTomlDefs, confTomlNet, confEnvvarDefs, confEnvvarNet diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim index 0a48dc356..fe9c7e24f 100644 --- a/apps/wakunode2/wakunode2.nim +++ b/apps/wakunode2/wakunode2.nim @@ -9,9 +9,11 @@ import system/ansi_c, libp2p/crypto/crypto import - ./cli_args, - ../../tools/rln_keystore_generator/rln_keystore_generator, - ../../tools/rln_db_inspector/rln_db_inspector, + ../../tools/[ + rln_keystore_generator/rln_keystore_generator, + rln_db_inspector/rln_db_inspector, + confutils/cli_args, + ], waku/[ common/logging, factory/waku, diff --git a/tests/all_tests_waku.nim b/tests/all_tests_waku.nim index 77e80f0c3..3d22cd9c2 100644 --- a/tests/all_tests_waku.nim +++ b/tests/all_tests_waku.nim @@ -101,3 +101,6 @@ import ./factory/test_all # Waku API tests import ./api/test_all + +# Waku tools tests +import ./tools/test_all diff --git a/tests/common/test_all.nim b/tests/common/test_all.nim index ae37337cd..5b4515093 100644 --- a/tests/common/test_all.nim +++ b/tests/common/test_all.nim @@ -2,9 +2,7 @@ import ./test_base64_codec, - ./test_confutils_envvar, ./test_enr_builder, - ./test_envvar_serialization, ./test_protobuf_validation, ./test_sqlite_migrations, ./test_parse_size, diff --git a/tests/tools/test_all.nim b/tests/tools/test_all.nim new file mode 100644 index 000000000..e5ace3dfa --- /dev/null +++ b/tests/tools/test_all.nim @@ -0,0 +1,3 @@ +{.used.} + +import ./test_confutils_envvar, ./test_confutils_envvar_serialization.nim diff --git a/tests/common/test_confutils_envvar.nim b/tests/tools/test_confutils_envvar.nim similarity index 93% rename from tests/common/test_confutils_envvar.nim rename to tests/tools/test_confutils_envvar.nim index fca11cca6..ed559ad0b 100644 --- a/tests/common/test_confutils_envvar.nim +++ b/tests/tools/test_confutils_envvar.nim @@ -7,9 +7,7 @@ import confutils, confutils/defs, confutils/std/net -import - waku/common/confutils/envvar/defs as confEnvvarDefs, - waku/common/confutils/envvar/std/net as confEnvvarNet +import ../../tools/confutils/[envvar as confEnvvarDefs, envvar_net as confEnvvarNet] type ConfResult[T] = Result[T, string] diff --git a/tests/common/test_envvar_serialization.nim b/tests/tools/test_confutils_envvar_serialization.nim similarity index 84% rename from tests/common/test_envvar_serialization.nim rename to tests/tools/test_confutils_envvar_serialization.nim index 3a46ac537..c9639e284 100644 --- a/tests/common/test_envvar_serialization.nim +++ b/tests/tools/test_confutils_envvar_serialization.nim @@ -1,7 +1,7 @@ {.used.} import testutils/unittests -import waku/common/envvar_serialization/utils +import ../../tools/confutils/envvar_serialization/utils suite "nim-envvar-serialization - utils": test "construct env var key": diff --git a/apps/wakunode2/cli_args.nim b/tools/confutils/cli_args.nim similarity index 99% rename from apps/wakunode2/cli_args.nim rename to tools/confutils/cli_args.nim index 9c6c4c3f8..d13d87cb3 100644 --- a/apps/wakunode2/cli_args.nim +++ b/tools/confutils/cli_args.nim @@ -20,11 +20,7 @@ import import waku/factory/[waku_conf, conf_builder/conf_builder, networks_config], - waku/common/[ - confutils/envvar/defs as confEnvvarDefs, - confutils/envvar/std/net as confEnvvarNet, - logging, - ], + waku/common/[logging], waku/[ waku_enr, node/peer_manager, @@ -34,6 +30,8 @@ import ../../tools/ [rln_keystore_generator/rln_keystore_generator, rln_db_inspector/rln_db_inspector] +import ./envvar as confEnvvarDefs, ./envvar_net as confEnvvarNet + export confTomlDefs, confTomlNet, confEnvvarDefs, confEnvvarNet, ProtectedShard logScope: diff --git a/waku/common/confutils/envvar/defs.nim b/tools/confutils/envvar.nim similarity index 91% rename from waku/common/confutils/envvar/defs.nim rename to tools/confutils/envvar.nim index 4f71bd88f..ee73594aa 100644 --- a/waku/common/confutils/envvar/defs.nim +++ b/tools/confutils/envvar.nim @@ -1,7 +1,7 @@ {.push raises: [].} import confutils/defs as confutilsDefs -import ../../envvar_serialization +import ./envvar_serialization export envvar_serialization, confutilsDefs diff --git a/waku/common/confutils/envvar/std/net.nim b/tools/confutils/envvar_net.nim similarity index 94% rename from waku/common/confutils/envvar/std/net.nim rename to tools/confutils/envvar_net.nim index 4264373a6..0c689f0e2 100644 --- a/waku/common/confutils/envvar/std/net.nim +++ b/tools/confutils/envvar_net.nim @@ -1,7 +1,7 @@ {.push raises: [].} import std/[strutils, net] -import ../../../envvar_serialization +import ./envvar_serialization export net, envvar_serialization diff --git a/waku/common/envvar_serialization.nim b/tools/confutils/envvar_serialization.nim similarity index 100% rename from waku/common/envvar_serialization.nim rename to tools/confutils/envvar_serialization.nim diff --git a/waku/common/envvar_serialization/reader.nim b/tools/confutils/envvar_serialization/reader.nim similarity index 100% rename from waku/common/envvar_serialization/reader.nim rename to tools/confutils/envvar_serialization/reader.nim diff --git a/waku/common/envvar_serialization/utils.nim b/tools/confutils/envvar_serialization/utils.nim similarity index 100% rename from waku/common/envvar_serialization/utils.nim rename to tools/confutils/envvar_serialization/utils.nim diff --git a/waku/common/envvar_serialization/writer.nim b/tools/confutils/envvar_serialization/writer.nim similarity index 100% rename from waku/common/envvar_serialization/writer.nim rename to tools/confutils/envvar_serialization/writer.nim diff --git a/waku.nimble b/waku.nimble index 3ff628984..c76f47a3e 100644 --- a/waku.nimble +++ b/waku.nimble @@ -13,7 +13,6 @@ license = "MIT or Apache License 2.0" ### Dependencies requires "nim >= 2.2.4", "chronicles", - "confutils#e214b39", "chronos", "dnsdisc", "eth", @@ -228,15 +227,3 @@ task libWakuAndroid, "Build the mobile bindings for Android": let srcDir = "./library" let extraParams = "-d:chronicles_log_level=ERROR" buildMobileAndroid srcDir, extraParams - -import std/[os, strutils] #XXX from os import parentDir, getEnv, dirExists fails -proc getNimbleDir: string = - result = getEnv("NIMBLE_DIR", getEnv("nimbleDir", "")) - if result.len > 0: return - if (let (installDir, ex) = gorgeEx("nimble path procs"); ex == 0): - result = installDir.strip.parentDir.parentDir # Hopefully .ini nimbleDir - -task showPaths, "Show various paths": - echo "Nimble directory: ", getNimbleDir() - echo "Current directory: ", getCurrentDir() -