From b9019d170dac9cb61145812e03141368938d3d7c Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Sun, 1 Dec 2024 13:40:02 +0000
Subject: [PATCH] test: remove clightning TODO-EXTERNAL requiring to disable
 offers

---
 examples/deploy-container-minimal.sh | 4 ----
 examples/deploy-container.sh         | 7 -------
 examples/deploy-qemu-vm.sh           | 7 -------
 examples/krops-vm-configuration.nix  | 7 -------
 examples/qemu-vm/minimal-vm.nix      | 4 ----
 test/clightning-replication.nix      | 4 ----
 test/tests.nix                       | 4 ----
 7 files changed, 37 deletions(-)

diff --git a/examples/deploy-container-minimal.sh b/examples/deploy-container-minimal.sh
index a0bad34..d5ed3df 100755
--- a/examples/deploy-container-minimal.sh
+++ b/examples/deploy-container-minimal.sh
@@ -21,12 +21,8 @@ cat > "$tmpDir/configuration.nix" <<EOF
       password = "a";
     };
     # When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s
-    # TODO-EXTERNAL:
-    # When bitcoind is not fully synced, the offers plugin in clightning 24.05
-    # crashes (see https://github.com/ElementsProject/lightning/issues/7378).
     services.clightning.extraConfig = ''
       disable-dns
-      disable-plugin=offers
     '';
   }
 EOF
diff --git a/examples/deploy-container.sh b/examples/deploy-container.sh
index decb4d3..9ec0bc1 100755
--- a/examples/deploy-container.sh
+++ b/examples/deploy-container.sh
@@ -83,13 +83,6 @@ read -rd '' src <<EOF || true
         $(realpath "$configuration")
       ];
       nix-bitcoin.generateSecrets = true;
-
-      # TODO-EXTERNAL:
-      # When bitcoind is not fully synced, the offers plugin in clightning 24.05
-      # crashes (see https://github.com/ElementsProject/lightning/issues/7378).
-      services.clightning.extraConfig = ''
-        disable-plugin=offers
-      '';
     };
   };
 }
diff --git a/examples/deploy-qemu-vm.sh b/examples/deploy-qemu-vm.sh
index e3a90ef..afadb30 100755
--- a/examples/deploy-qemu-vm.sh
+++ b/examples/deploy-qemu-vm.sh
@@ -30,13 +30,6 @@ nix-build --out-link "$tmpDir/vm" - <<'EOF'
       <qemu-vm/vm-config.nix>
     ];
     nix-bitcoin.generateSecrets = true;
-
-    # TODO-EXTERNAL:
-    # When bitcoind is not fully synced, the offers plugin in clightning 24.05
-    # crashes (see https://github.com/ElementsProject/lightning/issues/7378).
-    services.clightning.extraConfig = ''
-      disable-plugin=offers
-    '';
   };
 }).config.system.build.vm
 EOF
diff --git a/examples/krops-vm-configuration.nix b/examples/krops-vm-configuration.nix
index 83b43bd..bf4d894 100644
--- a/examples/krops-vm-configuration.nix
+++ b/examples/krops-vm-configuration.nix
@@ -4,11 +4,4 @@
     <nix-bitcoin/modules/deployment/krops.nix>
     <qemu-vm/vm-config.nix>
   ];
-
-  # TODO-EXTERNAL:
-  # When bitcoind is not fully synced, the offers plugin in clightning 24.05
-  # crashes (see https://github.com/ElementsProject/lightning/issues/7378).
-  services.clightning.extraConfig = ''
-    disable-plugin=offers
-  '';
 }
diff --git a/examples/qemu-vm/minimal-vm.nix b/examples/qemu-vm/minimal-vm.nix
index f5bea28..ebfc569 100644
--- a/examples/qemu-vm/minimal-vm.nix
+++ b/examples/qemu-vm/minimal-vm.nix
@@ -27,12 +27,8 @@ rec {
       nix-bitcoin.generateSecrets = true;
       services.clightning.enable = true;
       # disable-dns leads to faster startup in offline VMs
-      # TODO-EXTERNAL:
-      # When bitcoind is not fully synced, the offers plugin in clightning 24.05
-      # crashes (see https://github.com/ElementsProject/lightning/issues/7378).
       services.clightning.extraConfig = ''
         disable-dns
-        disable-plugin=offers
       '';
 
       # Avoid lengthy build of the nixos manual
diff --git a/test/clightning-replication.nix b/test/clightning-replication.nix
index 5b44681..729dd85 100644
--- a/test/clightning-replication.nix
+++ b/test/clightning-replication.nix
@@ -24,12 +24,8 @@ let
 
       # TODO-EXTERNAL:
       # When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
-      # TODO-EXTERNAL:
-      # When bitcoind is not fully synced, the offers plugin in clightning 24.05
-      # crashes (see https://github.com/ElementsProject/lightning/issues/7378).
       extraConfig = ''
         disable-dns
-        disable-plugin=offers
       '';
     };
   };
diff --git a/test/tests.nix b/test/tests.nix
index f950b62..89a1595 100644
--- a/test/tests.nix
+++ b/test/tests.nix
@@ -43,12 +43,8 @@ let
 
       # TODO-EXTERNAL:
       # When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
-      # TODO-EXTERNAL:
-      # When bitcoind is not fully synced, the offers plugin in clightning 24.05
-      # crashes (see https://github.com/ElementsProject/lightning/issues/7378).
       services.clightning.extraConfig = ''
         ${optionalString config.test.noConnections "disable-dns"}
-        disable-plugin=offers
       '';
       test.data.clightning-plugins = let
         plugins = config.services.clightning.plugins;