Skip to content

loopd: fix crash in instant if no --experimental #1030

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
Oct 31, 2025
+15 −0
Merged

loopd: fix crash in instant if no --experimental #1030

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
15 changes: 15 additions & 0 deletions loopd/swapclient_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,6 +1490,11 @@ func (s *swapClientServer) InstantOut(ctx context.Context,
req *looprpc.InstantOutRequest) (*looprpc.InstantOutResponse,
error) {

if s.instantOutManager == nil {
return nil, status.Error(codes.Unimplemented,
"Restart loop with --experimental")
}
Comment on lines +1493 to +1496
Copy link

@gemini-code-assist gemini-code-assist bot Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This check is duplicated in InstantOutQuote (line 1537) and ListInstantOuts (line 1561). To improve maintainability and reduce code duplication, consider extracting this logic into a private helper method on swapClientServer.

For example:

func (s *swapClientServer) requireInstantOutManager() error {
	if s.instantOutManager == nil {
		return status.Error(codes.Unimplemented, "Restart loop with --experimental")
	}
	return nil
}

You could then call this helper at the beginning of InstantOut, InstantOutQuote, and ListInstantOuts:

if err := s.requireInstantOutManager(); err != nil {
	return nil, err
}

This would also make the code more consistent, as ListReservations has a similar check for reservationManager.


reservationIds := make([]reservation.ID, len(req.ReservationIds))
for i, id := range req.ReservationIds {
if len(id) != reservation.IdLength {
Expand Down Expand Up @@ -1529,6 +1534,11 @@ func (s *swapClientServer) InstantOutQuote(ctx context.Context,
req *looprpc.InstantOutQuoteRequest) (
*looprpc.InstantOutQuoteResponse, error) {

if s.instantOutManager == nil {
return nil, status.Error(codes.Unimplemented,
"Restart loop with --experimental")
}

quote, err := s.instantOutManager.GetInstantOutQuote(
ctx, btcutil.Amount(req.Amt), req.ReservationIds,
)
Expand All @@ -1548,6 +1558,11 @@ func (s *swapClientServer) ListInstantOuts(ctx context.Context,
_ *looprpc.ListInstantOutsRequest) (
*looprpc.ListInstantOutsResponse, error) {

if s.instantOutManager == nil {
return nil, status.Error(codes.Unimplemented,
"Restart loop with --experimental")
}

instantOuts, err := s.instantOutManager.ListInstantOuts(ctx)
if err != nil {
return nil, err
Expand Down
Loading