From f2192f1b90f3b462b59dbb527af116bff6cbe123 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Sat, 17 Feb 2018 15:41:34 -0800 Subject: [PATCH] cmd/lncli: remove p2pkh as an option for the new address command --- cmd/lncli/commands.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd/lncli/commands.go b/cmd/lncli/commands.go index 20936a44..201ec2d6 100644 --- a/cmd/lncli/commands.go +++ b/cmd/lncli/commands.go @@ -91,9 +91,8 @@ var newAddressCommand = cli.Command{ ArgsUsage: "address-type", Description: ` Generate a wallet new address. Address-types has to be one of: - - p2wkh: Push to witness key hash - - np2wkh: Push to nested witness key hash - - p2pkh: Push to public key hash (can't be used to fund channels)`, + - p2wkh: Pay to witness key hash + - np2wkh: Pay to nested witness key hash`, Action: actionDecorator(newAddress), } @@ -111,11 +110,9 @@ func newAddress(ctx *cli.Context) error { addrType = lnrpc.NewAddressRequest_WITNESS_PUBKEY_HASH case "np2wkh": addrType = lnrpc.NewAddressRequest_NESTED_PUBKEY_HASH - case "p2pkh": - addrType = lnrpc.NewAddressRequest_PUBKEY_HASH default: return fmt.Errorf("invalid address type %v, support address type "+ - "are: p2wkh, np2wkh, p2pkh", stringAddrType) + "are: p2wkh and np2wkh", stringAddrType) } ctxb := context.Background()