Skip to content

generate+parser: allow tapd protos to reference litcli #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2025
Merged

generate+parser: allow tapd protos to reference litcli #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions parser/proto_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down