Skip to content

Commit 3c9b355

Browse files
feat: deprecate tree_path and rlnDB (#3577)
1 parent 04fdf0a commit 3c9b355

28 files changed

+31
-268
lines changed

apps/chat2/chat2.nim

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,6 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
567567
),
568568
userMessageLimit: conf.rlnRelayUserMessageLimit,
569569
epochSizeSec: conf.rlnEpochSizeSec,
570-
treePath: conf.rlnRelayTreePath,
571570
)
572571

573572
waitFor node.mountRlnRelay(rlnConf, spamHandler = some(spamHandler))

apps/chat2/config_chat2.nim

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,6 @@ type
283283
name: "rln-relay-epoch-sec"
284284
.}: uint64
285285

286-
rlnRelayTreePath* {.
287-
desc: "Path to the RLN merkle tree sled db (https://github.com/spacejam/sled)",
288-
defaultValue: "",
289-
name: "rln-relay-tree-path"
290-
.}: string
291-
292286
# NOTE: Keys are different in nim-libp2p
293287
proc parseCmdArg*(T: type crypto.PrivateKey, p: string): T =
294288
try:

apps/networkmonitor/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ The following options are available:
2929
--rln-relay Enable spam protection through rln-relay: true|false [=true].
3030
--rln-relay-dynamic Enable waku-rln-relay with on-chain dynamic group management: true|false
3131
[=true].
32-
--rln-relay-tree-path Path to the RLN merkle tree sled db (https://github.com/spacejam/sled).
3332
--rln-relay-eth-client-address HTTP address of an Ethereum testnet client e.g., http://localhost:8540/
3433
[=http://localhost:8540/].
3534
--rln-relay-eth-contract-address Address of membership contract on an Ethereum testnet.

apps/networkmonitor/networkmonitor.nim

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,6 @@ when isMainModule:
640640
credIndex: some(uint(0)),
641641
ethContractAddress: conf.rlnRelayEthContractAddress,
642642
ethClientUrls: conf.ethClientUrls.mapIt(string(it)),
643-
treePath: conf.rlnRelayTreePath,
644643
epochSizeSec: conf.rlnEpochSizeSec,
645644
creds: none(RlnRelayCreds),
646645
onFatalErrorAction: onFatalErrorAction,

apps/networkmonitor/networkmonitor_config.nim

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ type NetworkMonitorConf* = object
8080
name: "rln-relay-dynamic"
8181
.}: bool
8282

83-
rlnRelayTreePath* {.
84-
desc: "Path to the RLN merkle tree sled db (https://github.com/spacejam/sled)",
85-
defaultValue: "",
86-
name: "rln-relay-tree-path"
87-
.}: string
88-
8983
ethClientUrls* {.
9084
desc:
9185
"HTTP address of an Ethereum testnet client e.g., http://localhost:8540/. Argument may be repeated.",

apps/sonda/run_node.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ fi
6161

6262
if [ "${CLUSTER_ID}" -eq 1 ]; then
6363
RLN_RELAY_CRED_PATH=--rln-relay-cred-path=${RLN_RELAY_CRED_PATH:-/keystore/keystore.json}
64-
RLN_TREE_PATH=--rln-relay-tree-path="/etc/rln_tree"
6564
fi
6665

6766
if [ -n "${RLN_RELAY_CRED_PASSWORD}" ]; then

apps/wakunode2/wakunode2.nim

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import
1010
libp2p/crypto/crypto
1111
import
1212
../../tools/rln_keystore_generator/rln_keystore_generator,
13-
../../tools/rln_db_inspector/rln_db_inspector,
1413
waku/[
1514
common/logging,
1615
factory/external_config,
@@ -48,9 +47,6 @@ when isMainModule:
4847
of generateRlnKeystore:
4948
let conf = wakuNodeConf.toKeystoreGeneratorConf()
5049
doRlnKeystoreGenerator(conf)
51-
of inspectRlnDb:
52-
let conf = wakuNodeConf.toInspectRlnDbConf()
53-
doInspectRlnDb(conf)
5450
of noCommand:
5551
let conf = wakuNodeConf.toWakuConf().valueOr:
5652
error "Waku configuration failed", error = error

docs/tutorial/rln-db-inspector.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

tests/factory/test_external_config.nim

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ suite "Waku external config - apply preset":
6464
preset: "twn",
6565
relay: true,
6666
ethClientUrls: @["http://someaddress".EthRpcUrl],
67-
rlnRelayTreePath: "/tmp/sometreepath",
6867
)
6968

7069
## When
@@ -149,7 +148,6 @@ suite "Waku external config - apply preset":
149148
clusterId: 1.uint16,
150149
relay: true,
151150
ethClientUrls: @["http://someaddress".EthRpcUrl],
152-
rlnRelayTreePath: "/tmp/sometreepath",
153151
)
154152

155153
## When

tests/factory/test_waku_conf.nim

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ suite "Waku Conf - build with cluster conf":
2727
builder.rlnRelayConf.withEthClientUrls(@["https://my_eth_rpc_url/"])
2828
builder.withNetworkConf(networkConf)
2929
builder.withRelay(true)
30-
builder.rlnRelayConf.withTreePath("/tmp/test-tree-path")
3130

3231
## When
3332
let resConf = builder.build()
@@ -180,7 +179,6 @@ suite "Waku Conf - build with cluster conf":
180179
builder.rlnRelayConf.withEthContractAddress(contractAddress)
181180
builder.withNetworkConf(networkConf)
182181
builder.withRelay(true)
183-
builder.rlnRelayConf.withTreePath("/tmp/test")
184182

185183
## When
186184
let resConf = builder.build()

0 commit comments

Comments
 (0)