looprpc: split terms message

Author: joostjager

cmd/loop/terms.go

@@ -4,10 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/urfave/cli"
-
 	"github.com/btcsuite/btcutil"
 	"github.com/lightninglabs/loop/looprpc"
+	"github.com/urfave/cli"
 )
 
 var termsCommand = cli.Command{
@@ -23,10 +22,9 @@ func terms(ctx *cli.Context) error {
 	}
 	defer cleanup()
 
-	printTerms := func(terms *looprpc.TermsResponse) {
+	printAmountRange := func(min, max int64) {
 		fmt.Printf("Amount: %d - %d\n",
-			btcutil.Amount(terms.MinSwapAmount),
-			btcutil.Amount(terms.MaxSwapAmount),
+			btcutil.Amount(min), btcutil.Amount(max),
 		)
 	}
 
@@ -37,7 +35,10 @@ func terms(ctx *cli.Context) error {
 	if err != nil {
 		fmt.Println(err)
 	} else {
-		printTerms(loopOutTerms)
+		printAmountRange(
+			loopOutTerms.MinSwapAmount,
+			loopOutTerms.MaxSwapAmount,
+		)
 	}
 
 	fmt.Println()
@@ -50,7 +51,10 @@ func terms(ctx *cli.Context) error {
 	if err != nil {
 		fmt.Println(err)
 	} else {
-		printTerms(loopInTerms)
+		printAmountRange(
+			loopInTerms.MinSwapAmount,
+			loopInTerms.MaxSwapAmount,
+		)
 	}
 
 	return nil

loopd/swapclient_server.go

@@ -328,7 +328,7 @@ func (s *swapClientServer) SwapInfo(_ context.Context,
 
 // LoopOutTerms returns the terms that the server enforces for loop out swaps.
 func (s *swapClientServer) LoopOutTerms(ctx context.Context,
-	req *looprpc.TermsRequest) (*looprpc.TermsResponse, error) {
+	req *looprpc.TermsRequest) (*looprpc.OutTermsResponse, error) {
 
 	log.Infof("Loop out terms request received")
 
@@ -338,7 +338,7 @@ func (s *swapClientServer) LoopOutTerms(ctx context.Context,
 		return nil, err
 	}
 
-	return &looprpc.TermsResponse{
+	return &looprpc.OutTermsResponse{
 		MinSwapAmount: int64(terms.MinSwapAmount),
 		MaxSwapAmount: int64(terms.MaxSwapAmount),
 	}, nil
@@ -376,8 +376,8 @@ func (s *swapClientServer) LoopOutQuote(ctx context.Context,
 }
 
 // GetTerms returns the terms that the server enforces for swaps.
-func (s *swapClientServer) GetLoopInTerms(ctx context.Context, req *looprpc.TermsRequest) (
-	*looprpc.TermsResponse, error) {
+func (s *swapClientServer) GetLoopInTerms(ctx context.Context,
+	req *looprpc.TermsRequest) (*looprpc.InTermsResponse, error) {
 
 	log.Infof("Loop in terms request received")
 
@@ -387,7 +387,7 @@ func (s *swapClientServer) GetLoopInTerms(ctx context.Context, req *looprpc.Term
 		return nil, err
 	}
 
-	return &looprpc.TermsResponse{
+	return &looprpc.InTermsResponse{
 		MinSwapAmount: int64(terms.MinSwapAmount),
 		MaxSwapAmount: int64(terms.MaxSwapAmount),
 	}, nil