From ac59f93e638261795fdf7977a8e518c455e4f70b Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 3 Aug 2023 17:26:15 +0200
Subject: [PATCH] trustedcoin: add regtest support, reenable test

---
 pkgs/trustedcoin/default.nix | 14 ++++++++++++--
 test/run-tests.sh            |  6 +-----
 test/tests.nix               |  2 ++
 test/tests.py                |  5 +++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/trustedcoin/default.nix b/pkgs/trustedcoin/default.nix
index 47c93f6..1a3c27f 100644
--- a/pkgs/trustedcoin/default.nix
+++ b/pkgs/trustedcoin/default.nix
@@ -1,15 +1,25 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
 
 buildGoModule rec {
   pname = "trustedcoin";
   version = "0.6.1";
+
   src = fetchFromGitHub {
     owner = "nbd-wtf";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-UNQjxhAT0mK1In7vUtIoMoMNBV+0wkrwbDmm7m+0R3o=";
+    hash = "sha256-UNQjxhAT0mK1In7vUtIoMoMNBV+0wkrwbDmm7m+0R3o=";
   };
 
+  patches = [
+    # https://github.com/nbd-wtf/trustedcoin/pull/22 required for regtest
+    (fetchpatch {
+      name = "add-regtest-support";
+      url = "https://github.com/nbd-wtf/trustedcoin/commit/aba05c55ccbfc50785328f556be8a5bd46e76beb.patch";
+      hash = "sha256-24mYyXjUMVSlr9IlaqaTVAPE6bxxScNgR8Bb3x2t90Y=";
+    })
+  ];
+
   vendorSha256 = "sha256-xvkK9rMQlXTnNyOMd79qxVSvhgPobcBk9cq4/YWbupY=";
 
   subPackages = [ "." ];
diff --git a/test/run-tests.sh b/test/run-tests.sh
index 5a69daf..223c980 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -295,11 +295,7 @@ buildable=(
     clightning-replication
     lndPruned
     wireguard-lndconnect
-
-    # TODO-EXTERNAL:
-    # Reenable when this has been fixed:
-    # https://github.com/nbd-wtf/trustedcoin/issues/21
-    # trustedcoin
+    trustedcoin
 )
 buildable() { buildTests buildable "$@"; }
 
diff --git a/test/tests.nix b/test/tests.nix
index 5d26c7d..a28232b 100644
--- a/test/tests.nix
+++ b/test/tests.nix
@@ -319,6 +319,8 @@ let
     };
 
     trustedcoin = {
+      imports = [ scenarios.regtestBase ];
+
       services.clightning = {
         enable = true;
         plugins.trustedcoin.enable = true;
diff --git a/test/tests.py b/test/tests.py
index 1f1ab09..c799dfc 100644
--- a/test/tests.py
+++ b/test/tests.py
@@ -435,6 +435,11 @@ def _():
     machine.wait_for_unit("clightning")
     expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+bitcoind RPC working")
     expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+estimatefees error: none of the esploras returned usable responses")
+    if "regtest" in enabled_tests:
+        num_blocks = test_data["num_blocks"]
+        expect_clightning_log(f"plugin-trustedcoin[^^]\[0m\s+tip: {num_blocks}")
+        expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+returning block")
+
 
 if "netns-isolation" in enabled_tests:
     def ip(name):