From 15d88df09cc502ed9929e411017e916ae76908d4 Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Thu, 11 Jun 2020 09:36:22 +0200
Subject: [PATCH] Remove unfinished rescuefunding command

---
 README.md             | 20 --------------------
 cmd/chantools/main.go | 11 ++++++-----
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 8b8f08d..e36a898 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,6 @@
   + [genimportscript](#genimportscript)
   + [forceclose](#forceclose)
   + [rescueclosed](#rescueclosed)
-  + [rescuefunding](#rescuefunding)
   + [showrootkey](#showrootkey)
   + [summary](#summary)
   + [sweeptimelock](#sweeptimelock)
@@ -70,7 +69,6 @@ Available commands:
   forceclose       Force-close the last state that is in the channel.db provided.
   genimportscript  Generate a script containing the on-chain keys of an lnd wallet that can be imported into other software like bitcoind.
   rescueclosed     Try finding the private keys for funds that are in outputs of remotely force-closed channels.
-  rescuefunding    Rescue funds locked in a funding multisig output that never resulted in a proper channel.
   showrootkey      Extract and show the BIP32 HD root key from the 24 word lnd aezeed.
   summary          Compile a summary about the current state of channels.
   sweeptimelock    Sweep the force-closed state after the time lock has expired.
@@ -332,24 +330,6 @@ chantools --fromsummary results/summary-xxxx-yyyy.json \
   --rootkey xprvxxxxxxxxxx
 ```
 
-### rescuefunding
-
-```text
-Usage:
-  chantools [OPTIONS] rescuefunding [rescuefunding-OPTIONS]
-
-[rescuefunding command options]
-          --rootkey=         BIP32 HD root (m/) key to derive the key for our node from.
-          --othernodepub=    The extended public key (xpub) of the other node's multisig branch (m/1017'/<coin_type>'/0'/0).
-          --fundingaddr=     The bech32 script address of the funding output where the coins to be spent are locked in.
-          --fundingoutpoint= The funding transaction outpoint (<txid>:<txindex>).
-          --fundingamount=   The exact amount in satoshis that is locked in the funding output.
-          --sweepaddr=       The address to sweep the rescued funds to.
-          --satperbyte=      The fee rate to use in satoshis/vByte.
-```
-
-**This command is not fully implemented yet and only listed here as a placeholder.**
-
 ### showrootkey
 
 This command converts the 24 word `lnd` aezeed phrase and password to the BIP32
diff --git a/cmd/chantools/main.go b/cmd/chantools/main.go
index ca0bc30..be25979 100644
--- a/cmd/chantools/main.go
+++ b/cmd/chantools/main.go
@@ -128,11 +128,12 @@ func runCommandParser() error {
 			"compacting it in the process.", "",
 		&compactDBCommand{},
 	)
-	_, _ = parser.AddCommand(
-		"rescuefunding", "Rescue funds locked in a funding multisig "+
-			"output that never resulted in a proper channel.", "",
-		&rescueFundingCommand{},
-	)
+	// TODO: uncomment when command is fully implemented.
+	//_, _ = parser.AddCommand(
+	//	"rescuefunding", "Rescue funds locked in a funding multisig "+
+	//		"output that never resulted in a proper channel.", "",
+	//	&rescueFundingCommand{},
+	//)
 
 	_, err := parser.Parse()
 	return err