Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ issues:
- forbidigo
- godot

# Allow fmt.Printf() in lncli.
- path: cmd/lncli/*
# Allow fmt.Printf() in commands.
- path: cmd/commands/*
linters:
- forbidigo

Expand Down
6 changes: 3 additions & 3 deletions cmd/lncli/arg_parse.go → cmd/commands/arg_parse.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package commands

import (
"regexp"
Expand Down Expand Up @@ -42,7 +42,7 @@ func parseTime(s string, base time.Time) (uint64, error) {

var lightningPrefix = "lightning:"

// stripPrefix removes accidentally copied 'lightning:' prefix.
func stripPrefix(s string) string {
// StripPrefix removes accidentally copied 'lightning:' prefix.
func StripPrefix(s string) string {
return strings.TrimSpace(strings.TrimPrefix(s, lightningPrefix))
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package commands

import (
"testing"
Expand Down Expand Up @@ -111,7 +111,7 @@ func TestStripPrefix(t *testing.T) {
t.Parallel()

for _, test := range stripPrefixTests {
actual := stripPrefix(test.in)
actual := StripPrefix(test.in)
require.Equal(t, test.expected, actual)
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//go:build autopilotrpc
// +build autopilotrpc

package main
package commands

import (
"github.com/lightningnetwork/lnd/lnrpc/autopilotrpc"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//go:build !autopilotrpc
// +build !autopilotrpc

package main
package commands

import "github.com/urfave/cli"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//go:build chainrpc
// +build chainrpc

package main
package commands

import (
"bytes"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//go:build !chainrpc
// +build !chainrpc

package main
package commands

import "github.com/urfave/cli"

Expand Down
2 changes: 1 addition & 1 deletion cmd/lncli/cmd_custom.go → cmd/commands/cmd_custom.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package commands

import (
"encoding/hex"
Expand Down
2 changes: 1 addition & 1 deletion cmd/lncli/cmd_debug.go → cmd/commands/cmd_debug.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package commands

import (
"bytes"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package commands

import (
"context"
Expand Down
6 changes: 3 additions & 3 deletions cmd/lncli/cmd_invoice.go → cmd/commands/cmd_invoice.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package commands

import (
"encoding/hex"
Expand All @@ -9,7 +9,7 @@ import (
"github.com/urfave/cli"
)

var addInvoiceCommand = cli.Command{
var AddInvoiceCommand = cli.Command{
Name: "addinvoice",
Category: "Invoices",
Usage: "Add a new invoice.",
Expand Down Expand Up @@ -408,7 +408,7 @@ func decodePayReq(ctx *cli.Context) error {
}

resp, err := client.DecodePayReq(ctxc, &lnrpc.PayReqString{
PayReq: stripPrefix(payreq),
PayReq: StripPrefix(payreq),
})
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion cmd/lncli/cmd_macaroon.go → cmd/commands/cmd_macaroon.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package commands

import (
"bytes"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package commands

import (
"fmt"
Expand Down Expand Up @@ -265,6 +265,7 @@ func setCfg(ctx *cli.Context) error {
Config: mcCfg.Config,
},
)

return err
}

Expand Down Expand Up @@ -366,5 +367,6 @@ func resetMissionControl(ctx *cli.Context) error {

req := &routerrpc.ResetMissionControlRequest{}
_, err := client.ResetMissionControl(ctxc, req)

return err
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package commands

import (
"bytes"
Expand Down
Loading