From 11e7394e0d767e3d7aa570c92d404c2c6e03bfce Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande <128452529+Ivansete-status@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:01:32 +0200 Subject: [PATCH] Adding 'librln' to `libwaku` and cleaning waku_example.c (#2044) * When adding the dependency with 'librln' to 'libwaku', it is required to remove the dependency with 'confutils' because the 'nim-confutils' module prevents the creation of a dynamic library (libwaku.so.) * waku_example.c: less code is needed because the Waku Thread attends any Waku event whereas the main thread can have a blocking scanf to retrieve user inputs. --- Makefile | 2 +- examples/cbindings/waku_example.c | 18 ------------------ waku/waku_rln_relay/rln_relay.nim | 1 - 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 586bdb82e..a5109bcf2 100644 --- a/Makefile +++ b/Makefile @@ -251,7 +251,7 @@ docker-push: STATIC ?= false -libwaku: | build deps +libwaku: | build deps librln rm -f build/libwaku* ifeq ($(STATIC), true) echo -e $(BUILD_MSG) "build/$@.a" && \ diff --git a/examples/cbindings/waku_example.c b/examples/cbindings/waku_example.c index f6d4a744b..b58dbc9a6 100644 --- a/examples/cbindings/waku_example.c +++ b/examples/cbindings/waku_example.c @@ -167,14 +167,6 @@ void show_main_menu() { printf("\t3.) Publish a message\n"); } -void set_scanf_to_not_block() { - fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK); -} - -void set_scanf_to_block() { - fcntl(0, F_SETFL, fcntl(0, F_GETFL) ^ O_NONBLOCK); -} - void handle_user_input() { char cmd[1024]; memset(cmd, 0, 1024); @@ -191,7 +183,6 @@ void handle_user_input() { case SUBSCRIBE_TOPIC_MENU: { printf("Indicate the Pubsubtopic to subscribe:\n"); - set_scanf_to_block(); char pubsubTopic[128]; scanf("%127s", pubsubTopic); @@ -199,7 +190,6 @@ void handle_user_input() { handle_error) ); printf("The subscription went well\n"); - set_scanf_to_not_block(); show_main_menu(); } break; @@ -207,17 +197,14 @@ void handle_user_input() { case CONNECT_TO_OTHER_NODE_MENU: printf("Connecting to a node. Please indicate the peer Multiaddress:\n"); printf("e.g.: /ip4/127.0.0.1/tcp/60001/p2p/16Uiu2HAmVFXtAfSj4EiR7mL2KvL4EE2wztuQgUSBoj2Jx2KeXFLN\n"); - set_scanf_to_block(); char peerAddr[512]; scanf("%511s", peerAddr); WAKU_CALL(waku_connect(peerAddr, 10000 /* timeoutMs */, handle_error)); - set_scanf_to_not_block(); show_main_menu(); break; case PUBLISH_MESSAGE_MENU: { - set_scanf_to_block(); printf("Indicate the Pubsubtopic:\n"); char pubsubTopic[128]; scanf("%127s", pubsubTopic); @@ -228,7 +215,6 @@ void handle_user_input() { publish_message(pubsubTopic, msg); - set_scanf_to_not_block(); show_main_menu(); } break; @@ -264,9 +250,6 @@ int main(int argc, char** argv) { cfgNode.key, cfgNode.relay ? "true":"false"); - // To allow non-blocking 'reads' from stdin - fcntl(0, F_SETFL, fcntl(0, F_GETFL) ^ O_NONBLOCK); - WAKU_CALL( waku_default_pubsub_topic(print_default_pubsub_topic) ); WAKU_CALL( waku_version(print_waku_version) ); @@ -289,6 +272,5 @@ int main(int argc, char** argv) { show_main_menu(); while(1) { handle_user_input(); - // waku_poll(); } } diff --git a/waku/waku_rln_relay/rln_relay.nim b/waku/waku_rln_relay/rln_relay.nim index d711a8d8c..15a85348b 100644 --- a/waku/waku_rln_relay/rln_relay.nim +++ b/waku/waku_rln_relay/rln_relay.nim @@ -6,7 +6,6 @@ else: import std/[algorithm, sequtils, strutils, tables, times, os, deques], chronicles, options, chronos, chronos/ratelimit, stint, - confutils, web3, json, web3/ethtypes, eth/keys,