From 6de5029c498124778c08632dc3a70b4c1a6da55d Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 25 Jun 2023 11:08:57 +0200 Subject: [PATCH] tests/trustedcoin: refactor - No need to wait for bitcoind: clightning being active implies that bitcoind is active. - Remove redundant log checks --- test/tests.nix | 3 +-- test/tests.py | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/test/tests.nix b/test/tests.nix index f220e88..5d26c7d 100644 --- a/test/tests.nix +++ b/test/tests.nix @@ -39,6 +39,7 @@ let tests.clightning = cfg.clightning.enable; test.data.clightning-replication = cfg.clightning.replication.enable; + tests.trustedcoin = cfg.clightning.plugins.trustedcoin.enable; # TODO-EXTERNAL: # When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s. @@ -317,9 +318,7 @@ let services.bitcoind.prune = 1000; }; - # Test the special clightning setup where trustedcoin plugin is used trustedcoin = { - tests.trustedcoin = true; services.clightning = { enable = true; plugins.trustedcoin.enable = true; diff --git a/test/tests.py b/test/tests.py index a97da3f..64ef7eb 100644 --- a/test/tests.py +++ b/test/tests.py @@ -429,13 +429,8 @@ def _(): @test("trustedcoin") def _(): - machine.wait_for_unit("bitcoind") machine.wait_for_unit("clightning") - - # Let's check the trustedcoin plugin was correctly initialized - machine.wait_until_succeeds(log_has_string("clightning", "plugin-trustedcoin[^^]\[0m\s+initialized plugin")) machine.wait_until_succeeds(log_has_string("clightning", "plugin-trustedcoin[^^]\[0m\s+bitcoind RPC working")) - machine.wait_until_succeeds(log_has_string("clightning", "plugin-trustedcoin[^^]\[0m\s+tip: 0")) machine.wait_until_succeeds(log_has_string("clightning", "plugin-trustedcoin[^^]\[0m\s+estimatefees error: none of the esploras returned usable responses"))