akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd/lncli: observe the --force parameter in the closechannel command

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2016-09-12 12:28:28 -07:00
parent a9f0caff87
commit 1a357755d7
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/lncli/commands.go
View File

@ -11,13 +11,13 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/BitfuryLightning/tools/prefix_tree"
"github.com/BitfuryLightning/tools/rt"
"github.com/BitfuryLightning/tools/rt/graph"
"github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc"
"github.com/roasbeef/btcd/wire" "github.com/roasbeef/btcd/wire"
"github.com/urfave/cli" "github.com/urfave/cli"
"golang.org/x/net/context" "golang.org/x/net/context"
"github.com/BitfuryLightning/tools/rt"
"github.com/BitfuryLightning/tools/prefix_tree"
"github.com/BitfuryLightning/tools/rt/graph"
"github.com/BitfuryLightning/tools/rt/visualizer" "github.com/BitfuryLightning/tools/rt/visualizer"
) )
@ -285,7 +285,7 @@ var CloseChannelCommand = cli.Command{
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "force", Name: "force",
Usage: "after the time limit has passed, attempted an " + Usage: "after the time limit has passed, attempt an " +
"uncooperative closure", "uncooperative closure",
}, },
cli.BoolFlag{ cli.BoolFlag{
@ -305,11 +305,13 @@ func closeChannel(ctx *cli.Context) error {
return err return err
} }
// TODO(roasbeef): implement time deadline within server
req := &lnrpc.CloseChannelRequest{ req := &lnrpc.CloseChannelRequest{
ChannelPoint: &lnrpc.ChannelPoint{ ChannelPoint: &lnrpc.ChannelPoint{
FundingTxid: txid[:], FundingTxid: txid[:],
OutputIndex: uint32(ctx.Int("output_index")), OutputIndex: uint32(ctx.Int("output_index")),
}, },
Force: ctx.Bool("force"),
} }
stream, err := client.CloseChannel(ctxb, req) stream, err := client.CloseChannel(ctxb, req)
@ -535,8 +537,8 @@ var ShowRoutingTableCommand = cli.Command{
Usage: "showroutingtable text|image", Usage: "showroutingtable text|image",
Subcommands: []cli.Command{ Subcommands: []cli.Command{
{ {
Name: "text", Name: "text",
Usage: "[--table|--human]", Usage: "[--table|--human]",
Description: "Show routing table in textual format. By default in JSON", Description: "Show routing table in textual format. By default in JSON",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.BoolFlag{ cli.BoolFlag{
@ -551,8 +553,8 @@ var ShowRoutingTableCommand = cli.Command{
Action: showRoutingTableAsText, Action: showRoutingTableAsText,
}, },
{ {
Name: "image", Name: "image",
Usage: "[--type <IMAGE_TYPE>] [--dest OUTPUT_FILE] [--open]", Usage: "[--type <IMAGE_TYPE>] [--dest OUTPUT_FILE] [--open]",
Description: "Create image with graphical representation of routing table", Description: "Create image with graphical representation of routing table",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
@ -597,11 +599,11 @@ func showRoutingTableAsText(ctx *cli.Context) error {
client := getClient(ctx) client := getClient(ctx)
r, err := getRoutingTable(ctxb, client) r, err := getRoutingTable(ctxb, client)
if err != nil{ if err != nil {
return err return err
} }
if ctx.Bool("table") && ctx.Bool("human"){ if ctx.Bool("table") && ctx.Bool("human") {
return fmt.Errorf("--table and --human cannot be used at the same time") return fmt.Errorf("--table and --human cannot be used at the same time")
} }
@ -620,7 +622,7 @@ func showRoutingTableAsImage(ctx *cli.Context) error {
client := getClient(ctx) client := getClient(ctx)
r, err := getRoutingTable(ctxb, client) r, err := getRoutingTable(ctxb, client)
if err != nil{ if err != nil {
return err return err
} }
@ -640,7 +642,7 @@ func showRoutingTableAsImage(ctx *cli.Context) error {
return fmt.Errorf("One or both of --type or --dest should be specified") return fmt.Errorf("One or both of --type or --dest should be specified")
} }
tempFile, err := ioutil.TempFile("", "") tempFile, err := ioutil.TempFile("", "")
if err != nil { if err != nil {
return err return err
} }
@ -651,7 +653,7 @@ func showRoutingTableAsImage(ctx *cli.Context) error {
} }
// if the filename is not specified explicitly use tempfile // if the filename is not specified explicitly use tempfile
if imgDest == "" { if imgDest == "" {
imageFile, err = TempFileWithSuffix("", "rt_", "."+ imgType) imageFile, err = TempFileWithSuffix("", "rt_", "."+imgType)
if err != nil { if err != nil {
return err return err
} }
@ -686,7 +688,7 @@ func writeToTempFile(r *rt.RoutingTable, file *os.File, self []byte) error {
slc := []graph.ID{graph.NewID(string(self))} slc := []graph.ID{graph.NewID(string(self))}
viz := visualizer.New(r.G, slc, nil, nil) viz := visualizer.New(r.G, slc, nil, nil)
viz.ApplyToNode = func(s string) string { return hex.EncodeToString([]byte(s)) } viz.ApplyToNode = func(s string) string { return hex.EncodeToString([]byte(s)) }
viz.ApplyToEdge = func(info interface{}) string { viz.ApplyToEdge = func(info interface{}) string {
if info, ok := info.(*rt.ChannelInfo); ok { if info, ok := info.(*rt.ChannelInfo); ok {
return fmt.Sprintf(`"%v"`, info.Capacity()) return fmt.Sprintf(`"%v"`, info.Capacity())
} }
@ -734,7 +736,7 @@ func TempFileWithSuffix(dir, prefix, suffix string) (*os.File, error) {
return nil, err return nil, err
} }
defer os.Remove(f.Name()) defer os.Remove(f.Name())
f, err = os.Create(f.Name()+suffix) f, err = os.Create(f.Name() + suffix)
return f, err return f, err
} }
@ -824,4 +826,4 @@ func printRTAsJSON(r *rt.RoutingTable) {
) )
} }
printRespJson(channels) printRespJson(channels)
} }