From 1093b43ccffe96a1237c6e16ad0c3e6aac8c0f99 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 29 Jan 2024 11:27:32 +1030
Subject: [PATCH] lnprototest: remove.

At this point it needs a complete rewrite to be useful, and it's just
constraining development.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 .github/workflows/prototest.yaml | 37 --------------------------------
 .gitmodules                      |  3 ---
 Makefile                         | 11 ++--------
 external/Makefile                |  3 +--
 external/lnprototest             |  1 -
 5 files changed, 3 insertions(+), 52 deletions(-)
 delete mode 100644 .github/workflows/prototest.yaml
 delete mode 160000 external/lnprototest

diff --git a/.github/workflows/prototest.yaml b/.github/workflows/prototest.yaml
deleted file mode 100644
index f333ef880..000000000
--- a/.github/workflows/prototest.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: LN Proto Test
-on:
-  push:
-    branches:
-      - "master"
-  pull_request:
-jobs:
-  proto-test:
-    name: Protocol Test Config
-    runs-on: ubuntu-22.04
-    timeout-minutes: 120
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - {compiler: clang, db: sqlite3}
-          - {compiler: gcc, db: postgres}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Build and run
-        run: |
-          docker build -f contrib/docker/Dockerfile.ubuntu -t cln-ci-ubuntu .
-          docker run -e ARCH=${{ matrix.arch }} \
-          -e COMPILER=${{ matrix.compiler }} \
-          -e DB=${{ matrix.db }} \
-          -e NETWORK=${{ matrix.network }} \
-          -e TARGET_HOST=${{ matrix.TARGET_HOST }} \
-          -e VALGRIND=${{ matrix.valgrind }} \
-          -e PYTEST_PAR=2 \
-          -e PYTEST_OPTS="--timeout=300" \
-          -e TEST_CMD="make check-protos" \
-          -e TEST_GROUP=1 \
-          -e TEST_GROUP_COUNT=1 \
-          -e TIMEOUT=120 \
-          cln-ci-ubuntu
diff --git a/.gitmodules b/.gitmodules
index 6dae35a54..4788bedb3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,9 +14,6 @@
 [submodule "external/gheap"]
 	path = external/gheap
 	url = https://github.com/valyala/gheap
-[submodule "external/lnprototest"]
-	path = external/lnprototest
-	url = https://github.com/rustyrussell/lnprototest.git
 [submodule "external/lowdown"]
 	path = external/lowdown
 	url = https://github.com/kristapsdz/lowdown.git
diff --git a/Makefile b/Makefile
index 4ebd47892..e6da7a1b8 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ endif
 
 # (method=thread to support xdist)
 PYTEST_OPTS := -v -p no:logging $(PYTEST_OPTS)
-MY_CHECK_PYTHONPATH=$${PYTHONPATH}$${PYTHONPATH:+:}$(shell pwd)/contrib/pyln-client:$(shell pwd)/contrib/pyln-testing:$(shell pwd)/contrib/pyln-proto/:$(shell pwd)/external/lnprototest:$(shell pwd)/contrib/pyln-spec/bolt1:$(shell pwd)/contrib/pyln-spec/bolt2:$(shell pwd)/contrib/pyln-spec/bolt4:$(shell pwd)/contrib/pyln-spec/bolt7
+MY_CHECK_PYTHONPATH=$${PYTHONPATH}$${PYTHONPATH:+:}$(shell pwd)/contrib/pyln-client:$(shell pwd)/contrib/pyln-testing:$(shell pwd)/contrib/pyln-proto/:$(shell pwd)/contrib/pyln-spec/bolt1:$(shell pwd)/contrib/pyln-spec/bolt2:$(shell pwd)/contrib/pyln-spec/bolt4:$(shell pwd)/contrib/pyln-spec/bolt7
 # Collect generated python files to be excluded from lint checks
 PYTHON_GENERATED= \
 	contrib/pyln-grpc-proto/pyln/grpc/primitives_pb2.py \
@@ -453,14 +453,7 @@ endif
 
 check-units:
 
-check: check-units installcheck check-protos pytest
-
-check-protos: $(ALL_PROGRAMS)
-ifeq ($(PYTEST),)
-	@echo "py.test is required to run the protocol tests, please install using 'pip3 install -r requirements.txt', and rerun 'configure'."; false
-else
-	@(cd external/lnprototest && PYTHONPATH=$(MY_CHECK_PYTHONPATH) LIGHTNING_SRC=../.. $(PYTEST) --runner lnprototest.clightning.Runner $(PYTEST_OPTS))
-endif
+check: check-units installcheck pytest
 
 pytest: $(ALL_PROGRAMS) $(DEFAULT_TARGETS) $(ALL_TEST_PROGRAMS) $(ALL_TEST_GEN)
 ifeq ($(PYTEST),)
diff --git a/external/Makefile b/external/Makefile
index 2767cc068..e199108bf 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -3,8 +3,7 @@ SUBMODULES =					\
 	external/libwally-core			\
 	external/gheap				\
 	external/jsmn				\
-	external/libbacktrace			\
-	external/lnprototest
+	external/libbacktrace
 
 ifeq ($(HAVE_LOWDOWN),0)
 SUBMODULES += external/lowdown
diff --git a/external/lnprototest b/external/lnprototest
deleted file mode 160000
index a8d4dcf6b..000000000
--- a/external/lnprototest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a8d4dcf6b859f3c11c92a917f7c48b2051dbb4c4