From 77e46d549567dc3ee8d85a93bc8ac4531aaa7817 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Tue, 22 Aug 2023 16:42:57 +0200 Subject: [PATCH 1/2] daemon: remove 'help' detection in command line arguments This is superfluous and prevents using config files with "-h" in their path. --- src/bin/daemon.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/bin/daemon.rs b/src/bin/daemon.rs index 0856cfb7..3c5c5d8e 100644 --- a/src/bin/daemon.rs +++ b/src/bin/daemon.rs @@ -19,10 +19,7 @@ fn parse_args(args: Vec) -> Option { return None; } - let is_help = args - .iter() - .any(|arg| arg.contains("help") || arg.contains("-h")); - if args.len() != 3 || is_help { + if args.len() != 3 { print_help_exit(); } From 7ecefdebdfaa8cc6e4641615009c03d6f1b07941 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Tue, 22 Aug 2023 16:44:22 +0200 Subject: [PATCH 2/2] Revert "tests: don't wait for lianad to log on shutdown" This reverts commit 97abc4699c7343e4be6a0596a25481f9e07bb3bb. --- tests/test_framework/lianad.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_framework/lianad.py b/tests/test_framework/lianad.py index 30fb4c94..eb273c31 100644 --- a/tests/test_framework/lianad.py +++ b/tests/test_framework/lianad.py @@ -127,6 +127,9 @@ class Lianad(TailableProc): def stop(self, timeout=5): try: self.rpc.stop() + self.wait_for_log( + "Stopping the liana daemon.", + ) self.proc.wait(timeout) except Exception as e: logging.error(f"{self.prefix} : error when calling stop: '{e}'")