From 38123ac8149d655ddcf2d15b103f76198d647d9f Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Fri, 16 May 2025 16:49:27 +0200
Subject: [PATCH] generate+parser: allow tapd protos to reference litcli

The command line methods for tapd's channel related RPCs are part of
litcli. So we need to build the litcli command first in order for it to
be invoked later on by the tapd API build.
---
 generate.sh            | 40 ++++++++++++++++++++++------------------
 parser/proto_parser.go |  4 ++--
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/generate.sh b/generate.sh
index 84e0428..f80b2b9 100755
--- a/generate.sh
+++ b/generate.sh
@@ -150,9 +150,30 @@ GRPC_PORT=12010
 REST_PORT=8281
 compile
 
+########################
+## Compile docs for lit
+########################
+REPO_URL="https://github.com/${LIT_FORK}/lightning-terminal"
+CHECKOUT_COMMIT=$LIT_COMMIT
+COMPONENT=lit
+COMMAND=litcli
+DAEMON=litd
+PROTO_SRC_DIR="litrpc"
+EXCLUDE_PROTOS="none"
+EXCLUDE_SERVICES=""
+EXPERIMENTAL_PACKAGES=""
+INSTALL_CMD="make go-install"
+GRPC_PORT=8443
+REST_PORT=8443
+compile
+
 ########################
 ## Compile docs for taproot-assets
 ########################
+
+# This must come last, because some of the proto files reference litcli
+# commands. So we need to have litcli installed first.
+
 REPO_URL="https://github.com/${TAPD_FORK}/taproot-assets"
 CHECKOUT_COMMIT=$TAPD_COMMIT
 COMPONENT=taproot-assets
@@ -166,21 +187,4 @@ EXPERIMENTAL_PACKAGES=""
 INSTALL_CMD="make install"
 GRPC_PORT=10029
 REST_PORT=8089
-compile
-
-########################
-## Compile docs for lit
-########################
-REPO_URL="https://github.com/${LIT_FORK}/lightning-terminal"
-CHECKOUT_COMMIT=$LIT_COMMIT
-COMPONENT=lit
-COMMAND=litcli
-DAEMON=litd
-PROTO_SRC_DIR="litrpc"
-EXCLUDE_PROTOS="none"
-EXCLUDE_SERVICES=""
-EXPERIMENTAL_PACKAGES=""
-INSTALL_CMD="make install"
-GRPC_PORT=8443
-REST_PORT=8443
-compile
+compile
\ No newline at end of file
diff --git a/parser/proto_parser.go b/parser/proto_parser.go
index 69f903c..858d4d1 100644
--- a/parser/proto_parser.go
+++ b/parser/proto_parser.go
@@ -186,8 +186,8 @@ func parseMethodDescription(method *defs.ServiceMethod) {
 		cmd := exec.Command(matches[1], args...)
 		out, err := cmd.Output()
 		if err != nil {
-			fmt.Printf("error invoking %s: %s\n",
-				method.CommandLine, err.Error())
+			fmt.Printf("error invoking %s: %s\n", matches[1],
+				err.Error())
 			return
 		}