Formatting

ln/lnd.go

@@ -1,13 +1,13 @@
 package ln
 
 import (
-  "fmt"
 	"context"
+	"crypto/x509"
 	"encoding/hex"
+	"fmt"
 	"io/ioutil"
 	"log"
 	"os"
-	"crypto/x509"
 
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/macaroons"
@@ -29,11 +29,11 @@ type Invoice struct {
 
 // LNDoptions are the options for the connection to the lnd node.
 type LNDoptions struct {
-	Address string
+	Address      string
-	CertFile string
+	CertFile     string
-  CertHex string
+	CertHex      string
 	MacaroonFile string
-  MacaroonHex string
+	MacaroonHex  string
 }
 
 type LNDclient struct {
@@ -46,7 +46,7 @@ type LNDclient struct {
 func (c LNDclient) AddInvoice(value int64, memo string) (Invoice, error) {
 	result := Invoice{}
 
-	stdOutLogger.Printf("Adding invoice: memo=%s amount=%v ", memo, value)
+	stdOutLogger.Printf("Adding invoice: memo=%s value=%v ", memo, value)
 	invoice := lnrpc.Invoice{
 		Memo:  memo,
 		Value: value,
@@ -64,14 +64,14 @@ func (c LNDclient) AddInvoice(value int64, memo string) (Invoice, error) {
 // NewAddress gets the next BTC onchain address.
 func (c LNDclient) NewAddress() (string, error) {
 	stdOutLogger.Printf("Getting a new BTC address")
-  request := lnrpc.NewAddressRequest{
+	request := lnrpc.NewAddressRequest{
-    Type: lnrpc.AddressType_WITNESS_PUBKEY_HASH,
+		Type: lnrpc.AddressType_WITNESS_PUBKEY_HASH,
-  }
+	}
-  res, err := c.lndClient.NewAddress(c.ctx, &request)
+	res, err := c.lndClient.NewAddress(c.ctx, &request)
-  if err != nil {
+	if err != nil {
-    return "", err
+		return "", err
-  }
+	}
-  return res.Address, nil
+	return res.Address, nil
 }
 
 // GetInvoice takes an invoice ID and returns the invoice details including settlement details
@@ -107,50 +107,50 @@ func (c LNDclient) GetInvoice(paymentHashStr string) (Invoice, error) {
 func NewLNDclient(lndOptions LNDoptions) (LNDclient, error) {
 	result := LNDclient{}
 
-  // Get credentials either from a hex string or a file
+	// Get credentials either from a hex string or a file
-  var creds credentials.TransportCredentials
+	var creds credentials.TransportCredentials
-  // if a hex string is provided
+	// if a hex string is provided
-  if lndOptions.CertHex != "" {
+	if lndOptions.CertHex != "" {
-    cp := x509.NewCertPool()
+		cp := x509.NewCertPool()
-    cert, err := hex.DecodeString(lndOptions.CertHex)
+		cert, err := hex.DecodeString(lndOptions.CertHex)
-    if err != nil {
+		if err != nil {
-      return result, err
+			return result, err
-    }
+		}
-    cp.AppendCertsFromPEM(cert)
+		cp.AppendCertsFromPEM(cert)
-    creds = credentials.NewClientTLSFromCert(cp, "")
+		creds = credentials.NewClientTLSFromCert(cp, "")
-  // if a path to a cert file is provided
+		// if a path to a cert file is provided
-  } else if lndOptions.CertFile != "" {
+	} else if lndOptions.CertFile != "" {
-    credsFromFile, err := credentials.NewClientTLSFromFile(lndOptions.CertFile, "")
+		credsFromFile, err := credentials.NewClientTLSFromFile(lndOptions.CertFile, "")
-    if err != nil {
+		if err != nil {
-      return result, err
+			return result, err
-    }
+		}
-    creds = credsFromFile // make it available outside of the else if block
+		creds = credsFromFile // make it available outside of the else if block
-  } else {
+	} else {
-    return result, fmt.Errorf("LND credential is missing")
+		return result, fmt.Errorf("LND credential is missing")
-  }
+	}
 	opts := []grpc.DialOption{
 		grpc.WithTransportCredentials(creds),
 	}
 
-  var macaroonData []byte
+	var macaroonData []byte
-  if lndOptions.MacaroonHex  != "" {
+	if lndOptions.MacaroonHex != "" {
-    macBytes, err := hex.DecodeString(lndOptions.MacaroonHex)
+		macBytes, err := hex.DecodeString(lndOptions.MacaroonHex)
-	  if err != nil {
+		if err != nil {
-		  return result, err
+			return result, err
-	  }
+		}
-    macaroonData = macBytes
+		macaroonData = macBytes
-  } else if lndOptions.MacaroonFile != "" {
+	} else if lndOptions.MacaroonFile != "" {
-	  macBytes, err := ioutil.ReadFile(lndOptions.MacaroonFile)
+		macBytes, err := ioutil.ReadFile(lndOptions.MacaroonFile)
-	  if err != nil {
+		if err != nil {
-		  return result, err
+			return result, err
-	  }
+		}
-    macaroonData = macBytes // make it available outside of the else if block
+		macaroonData = macBytes // make it available outside of the else if block
-  } else {
+	} else {
-    return result, fmt.Errorf("LND macaroon is missing")
+		return result, fmt.Errorf("LND macaroon is missing")
-  }
+	}
 
-  mac := &macaroon.Macaroon{}
+	mac := &macaroon.Macaroon{}
-  if err := mac.UnmarshalBinary(macaroonData); err != nil {
+	if err := mac.UnmarshalBinary(macaroonData); err != nil {
 		return result, err
 	}
 	macCred := macaroons.NewMacaroonCredential(mac)

lnme.go

@@ -2,7 +2,12 @@ package main
 
 import (
 	"flag"
-	"github.com/GeertJohan/go.rice"
+	"log"
+	"net/http"
+	"os"
+	"strings"
+
+	rice "github.com/GeertJohan/go.rice"
 	"github.com/bumi/lnme/ln"
 	"github.com/didip/tollbooth/v6"
 	"github.com/didip/tollbooth/v6/limiter"
@@ -13,10 +18,6 @@ import (
 	"github.com/knadh/koanf/providers/file"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	"log"
-	"net/http"
-	"os"
-	"strings"
 )
 
 // Middleware for request limited to prevent too many requests
@@ -124,9 +125,9 @@ func main() {
 	})
 
 	// Check invoice status
-	e.GET("/v1/invoice/:invoiceId", func(c echo.Context) error {
+	e.GET("/v1/invoice/:paymentHash", func(c echo.Context) error {
-		invoiceId := c.Param("invoiceId")
+		paymentHash := c.Param("paymentHash")
-		invoice, err := lnClient.GetInvoice(invoiceId)
+		invoice, err := lnClient.GetInvoice(paymentHash)
 
 		if err != nil {
 			stdOutLogger.Printf("Error looking up invoice: %s", err)
@@ -141,10 +142,10 @@ func main() {
 		return c.JSON(http.StatusOK, "pong")
 	})
 
-  port := cfg.String("port")
+	port := cfg.String("port")
-  if os.Getenv("PORT") != "" {
+	if os.Getenv("PORT") != "" {
-    port = os.Getenv("PORT")
+		port = os.Getenv("PORT")
-  }
+	}
 	e.Logger.Fatal(e.Start(":" + port))
 }