From ed26070d24c987e323d889167e25899d472113f5 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 10 Feb 2025 13:54:59 +0100 Subject: [PATCH] move utils to utils folder --- codexcrawler/application.nim | 5 ++--- codexcrawler/config.nim | 9 ++++++--- codexcrawler/dht.nim | 2 +- codexcrawler/{ => utils}/keyutils.nim | 0 codexcrawler/{ => utils}/logging.nim | 0 codexcrawler/{ => utils}/rng.nim | 0 codexcrawler/{utils.nim => utils/timeutils.nim} | 0 codexcrawler/{ => utils}/version.nim | 0 8 files changed, 9 insertions(+), 7 deletions(-) rename codexcrawler/{ => utils}/keyutils.nim (100%) rename codexcrawler/{ => utils}/logging.nim (100%) rename codexcrawler/{ => utils}/rng.nim (100%) rename codexcrawler/{utils.nim => utils/timeutils.nim} (100%) rename codexcrawler/{ => utils}/version.nim (100%) diff --git a/codexcrawler/application.nim b/codexcrawler/application.nim index 8909816..975ab65 100644 --- a/codexcrawler/application.nim +++ b/codexcrawler/application.nim @@ -1,5 +1,4 @@ import std/os -import std/sequtils import pkg/chronicles import pkg/chronos import pkg/questionable @@ -10,11 +9,11 @@ import pkg/datastore/typedds import pkg/metrics import ./config -import ./logging +import ./utils/logging import ./metrics import ./list import ./dht -import ./keyutils +import ./utils/keyutils import ./crawler import ./timetracker diff --git a/codexcrawler/config.nim b/codexcrawler/config.nim index 4692670..2f0e137 100644 --- a/codexcrawler/config.nim +++ b/codexcrawler/config.nim @@ -3,7 +3,7 @@ import std/sequtils import pkg/chronicles import pkg/libp2p import pkg/codexdht -import ./version +import ./utils/version let doc = """ @@ -13,15 +13,15 @@ Usage: codexcrawler [--logLevel=] [--publicIp=] [--metricsAddress=] [--metricsPort=

] [--dataDir=

] [--discoveryPort=

] [--bootNodes=] [--stepDelay=] [--revisitDelay=] Options: - --publicIp= Public IP address where this instance is reachable. --logLevel= Sets log level [default: INFO] + --publicIp= Public IP address where this instance is reachable. [default: 45.82.185.194] --metricsAddress= Listen address of the metrics server [default: 0.0.0.0] --metricsPort=

Listen HTTP port of the metrics server [default: 8008] --dataDir=

Directory for storing data [default: crawler_data] --discoveryPort=

Port used for DHT [default: 8090] --bootNodes= Semi-colon-separated list of Codex bootstrap SPRs [default: testnet_sprs] --stepDelay= Delay in milliseconds per crawl step [default: 1000] - --revisitDelay= Delay in minutes after which a node can be revisited [default: 1440] (24h) + --revisitDelay= Delay in minutes after which a node can be revisited [default: 1] (24h) """ import strutils @@ -54,6 +54,9 @@ proc getDefaultTestnetBootNodes(): seq[string] = "spr:CiUIAhIhAzZn3JmJab46BNjadVnLNQKbhnN3eYxwqpteKYY32SbOEgIDARo8CicAJQgCEiEDNmfcmYlpvjoE2Np1Wcs1ApuGc3d5jHCqm14phjfZJs4QrvWesAYaCwoJBKpA-TaRAnViKkcwRQIhANuMmZDD2c25xzTbKSirEpkZYoxbq-FU_lpI0K0e4mIVAiBfQX4yR47h1LCnHznXgDs6xx5DLO5q3lUcicqUeaqGeg", "spr:CiUIAhIhAgybmRwboqDdUJjeZrzh43sn5mp8jt6ENIb08tLn4x01EgIDARo8CicAJQgCEiECDJuZHBuioN1QmN5mvOHjeyfmanyO3oQ0hvTy0ufjHTUQh4ifsAYaCwoJBI_0zSiRAnVsKkcwRQIhAJCb_z0E3RsnQrEePdJzMSQrmn_ooHv6mbw1DOh5IbVNAiBbBJrWR8eBV6ftzMd6ofa5khNA2h88OBhMqHCIzSjCeA", "spr:CiUIAhIhAntGLadpfuBCD9XXfiN_43-V3L5VWgFCXxg4a8uhDdnYEgIDARo8CicAJQgCEiECe0Ytp2l-4EIP1dd-I3_jf5XcvlVaAUJfGDhry6EN2dgQsIufsAYaCwoJBNEmoCiRAnV2KkYwRAIgXO3bzd5VF8jLZG8r7dcLJ_FnQBYp1BcxrOvovEa40acCIDhQ14eJRoPwJ6GKgqOkXdaFAsoszl-HIRzYcXKeb7D9", + "spr:CiUIAhIhA2AEPzVj1Z_pshWAwvTp0xvRZTigIkYphXGZdiYGmYRwEgIDARo8CicAJQgCEiEDYAQ_NWPVn-myFYDC9OnTG9FlOKAiRimFcZl2JgaZhHAQvKCXugYaCwoJBES3CuORAnd-KkYwRAIgNwrc7n8A107pYUoWfJxL8X0f-flfUKeA6bFrjVKzEo0CID_0q-KO5ZAGf65VsK-d9rV3S0PbFg7Hj3Cv4aVX2Lnn", + "spr:CiUIAhIhAuhggJhkjeRoR7MHjZ_L_naZKnjF541X0GXTI7LEwXi_EgIDARo8CicAJQgCEiEC6GCAmGSN5GhHsweNn8v-dpkqeMXnjVfQZdMjssTBeL8Qop2quwYaCwoJBJK-4V-RAncuKkYwRAIgaXWoxvKkzrjUZ5K_ayQHKNlYhUEzBXhGviujxfJiGXkCICbsYFivi6Ny1FT6tbofVBRj7lnaR3K9_3j5pUT4862k", + "spr:CiUIAhIhA-pnA5sLGDVbqEXsRxDUjQEpiSAximHNbyqr2DwLmTq8EgIDARo8CicAJQgCEiED6mcDmwsYNVuoRexHENSNASmJIDGKYc1vKqvYPAuZOrwQyrekvAYaCwoJBIDHOw-RAnc4KkcwRQIhAJtKNeTykcE5bkKwe-vhSmqyBwc2AnexqFX1tAQGLQJ4AiBJOPseqvI3PyEM8l3hY3zvelZU9lT03O7MA_8cUfF4Uw", ] proc getBootNodeStrings(input: string): seq[string] = diff --git a/codexcrawler/dht.nim b/codexcrawler/dht.nim index a649ffe..3e8c2fb 100644 --- a/codexcrawler/dht.nim +++ b/codexcrawler/dht.nim @@ -7,7 +7,7 @@ import pkg/questionable/results import pkg/codexdht/discv5/[routing_table, protocol as discv5] from pkg/nimcrypto import keccak256 -import ./rng +import ./utils/rng export discv5 diff --git a/codexcrawler/keyutils.nim b/codexcrawler/utils/keyutils.nim similarity index 100% rename from codexcrawler/keyutils.nim rename to codexcrawler/utils/keyutils.nim diff --git a/codexcrawler/logging.nim b/codexcrawler/utils/logging.nim similarity index 100% rename from codexcrawler/logging.nim rename to codexcrawler/utils/logging.nim diff --git a/codexcrawler/rng.nim b/codexcrawler/utils/rng.nim similarity index 100% rename from codexcrawler/rng.nim rename to codexcrawler/utils/rng.nim diff --git a/codexcrawler/utils.nim b/codexcrawler/utils/timeutils.nim similarity index 100% rename from codexcrawler/utils.nim rename to codexcrawler/utils/timeutils.nim diff --git a/codexcrawler/version.nim b/codexcrawler/utils/version.nim similarity index 100% rename from codexcrawler/version.nim rename to codexcrawler/utils/version.nim