address review comments

Author: chaitanyaprem

nix/default.nix

@@ -45,6 +45,9 @@ in stdenv.mkDerivation {
     pkgs.darwin.cctools gcc # Necessary for libbacktrace
   ];
 
+  # Environment variables required for Android builds
+  ANDROID_SDK_ROOT = "${pkgs.androidPkgs.sdk}";
+  ANDROID_NDK_HOME = "${pkgs.androidPkgs.ndk}";
   NIMFLAGS = "-d:disableMarchNative -d:git_revision_override=${revision}";
   XDG_CACHE_HOME = "/tmp";
 
@@ -104,9 +107,6 @@ in stdenv.mkDerivation {
     cp library/libwaku.h $out/include/
   '';
 
-  ANDROID_SDK_ROOT = "${pkgs.androidPkgs.sdk}";
-  ANDROID_NDK_HOME = "${pkgs.androidPkgs.ndk}";
-
   meta = with pkgs.lib; {
     description = "NWaku derivation to build libwaku for mobile targets using Android NDK and Rust.";
     homepage = "https://github.com/status-im/nwaku";

waku/factory/conf_builder/kademlia_discovery_conf_builder.nim

@@ -9,14 +9,14 @@ logScope:
 ## Kademlia Discovery Config Builder ##
 #######################################
 type KademliaDiscoveryConfBuilder* = object
-  enabled*: Option[bool]
+  enabled*: bool
   bootstrapNodes*: seq[string]
 
 proc init*(T: type KademliaDiscoveryConfBuilder): KademliaDiscoveryConfBuilder =
   KademliaDiscoveryConfBuilder()
 
 proc withEnabled*(b: var KademliaDiscoveryConfBuilder, enabled: bool) =
-  b.enabled = some(enabled)
+  b.enabled = enabled
 
 proc withBootstrapNodes*(
     b: var KademliaDiscoveryConfBuilder, bootstrapNodes: seq[string]
@@ -49,7 +49,7 @@ proc build*(
     b: KademliaDiscoveryConfBuilder
 ): Result[Option[KademliaDiscoveryConf], string] =
   # Kademlia is enabled if explicitly enabled OR if bootstrap nodes are provided
-  let enabled = b.enabled.get(false) or b.bootstrapNodes.len > 0
+  let enabled = b.enabled or b.bootstrapNodes.len > 0
   if not enabled:
     return ok(none(KademliaDiscoveryConf))
 

waku/node/waku_node.nim

@@ -701,7 +701,6 @@ proc stop*(node: WakuNode) {.async.} =
   if not node.wakuPeerExchangeClient.isNil() and
       not node.wakuPeerExchangeClient.pxLoopHandle.isNil():
     await node.wakuPeerExchangeClient.pxLoopHandle.cancelAndWait()
-    node.wakuPeerExchangeClient.pxLoopHandle = nil
 
   if not node.wakuKademlia.isNil():
     await node.wakuKademlia.stop()