From 192355cc542fb6407430f563cc7d8a90b0cab28f Mon Sep 17 00:00:00 2001
From: rymnc <rymnc@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:07:55 +0000
Subject: [PATCH] deploy: 7368c9e675cdb916187f02c04fee65586b223c96

---
 Makefile               | 19 ++++++-------------
 tests/all_tests_v2.nim |  5 ++---
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 9c3b84ce4..2e9bb1464 100644
--- a/Makefile
+++ b/Makefile
@@ -204,26 +204,19 @@ docs: | build deps
 
 ## RLN
 
-# control rln code compilation
-ifeq ($(RLN), true)
-NIM_PARAMS := $(NIM_PARAMS) -d:rln
-else ifeq ($(CI), true)
-NIM_PARAMS := $(NIM_PARAMS) -d:rln
+# Experimental flag for all experimental features
+ifeq ($(EXPERIMENTAL), true)
+$(eval RLN := true)
 endif
 
-# control compilation of rln tests that require on chain interaction
-ifeq ($(ONCHAIN_RLN), true) 
-NIM_PARAMS := $(NIM_PARAMS) -d:onchain_rln
-else ifeq ($(CI), true) 
-NIM_PARAMS := $(NIM_PARAMS) -d:onchain_rln
+# control rln code compilation
+ifeq ($(RLN), true)
+	NIM_PARAMS := $(NIM_PARAMS) -d:rln
 endif
 
 rlnlib:
 ifeq ($(RLN), true)
 	cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
-# Enable zerokit rln in CI
-else  ifeq ($(CI), true)
-	cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
 endif
 
 # clean the rln build (forces recompile of old crates on next build)
diff --git a/tests/all_tests_v2.nim b/tests/all_tests_v2.nim
index 979992a16..f01832b2b 100644
--- a/tests/all_tests_v2.nim
+++ b/tests/all_tests_v2.nim
@@ -61,9 +61,8 @@ import
 when defined(rln):
   import
     ./v2/test_waku_rln_relay,
-    ./v2/test_wakunode_rln_relay
-  when defined(onchain_rln):
-    import ./v2/test_waku_rln_relay_onchain
+    ./v2/test_wakunode_rln_relay,
+    ./v2/test_waku_rln_relay_onchain
 
 when defined(waku_exp_store_resume):
   # TODO: Review store resume test cases (#1282)