Skip to content

Commit

Permalink
Adding 'librln' to libwaku and cleaning waku_example.c (#2044)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
Ivansete-status authored Sep 19, 2023
1 parent d6c7cd2 commit 11e7394
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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" && \
Expand Down
18 changes: 0 additions & 18 deletions examples/cbindings/waku_example.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -191,33 +183,28 @@ 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);

WAKU_CALL( waku_relay_subscribe(pubsubTopic,
handle_error) );
printf("The subscription went well\n");

set_scanf_to_not_block();
show_main_menu();
}
break;

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);
Expand All @@ -228,7 +215,6 @@ void handle_user_input() {

publish_message(pubsubTopic, msg);

set_scanf_to_not_block();
show_main_menu();
}
break;
Expand Down Expand Up @@ -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) );

Expand All @@ -289,6 +272,5 @@ int main(int argc, char** argv) {
show_main_menu();
while(1) {
handle_user_input();
// waku_poll();
}
}
1 change: 0 additions & 1 deletion waku/waku_rln_relay/rln_relay.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 11e7394

Please sign in to comment.