From c0f1d125214dea6fbe68d2057235749aa3d031c6 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@mit.edu>
Date: Mon, 31 Jul 2017 18:43:22 -0700
Subject: [PATCH] utxonursery: refactors kidOutput SignDescriptor serialization

---
 utxonursery.go | 54 +++-----------------------------------------------
 1 file changed, 3 insertions(+), 51 deletions(-)

diff --git a/utxonursery.go b/utxonursery.go
index b4a1b196c..4d016cc0e 100644
--- a/utxonursery.go
+++ b/utxonursery.go
@@ -784,7 +784,7 @@ func fetchGraduatingOutputs(db *channeldb.DB, wallet *lnwallet.LightningWallet,
 	// our commitment transaction or theirs, and also if it's an HTLC
 	// output or not.
 	for _, kgtnOutput := range kgtnOutputs {
-		kgtnOutput.witnessFunc = kgtnOutput.witnessType.generateFunc(
+		kgtnOutput.witnessFunc = kgtnOutput.witnessType.GenWitnessFunc(
 			&wallet.Cfg.Signer, kgtnOutput.signDescriptor,
 		)
 	}
@@ -1011,25 +1011,7 @@ func serializeKidOutput(w io.Writer, kid *kidOutput) error {
 		return err
 	}
 
-	if err := lnwallet.WriteSignDescriptor(w, kid.signDescriptor); err != nil {
-		return err
-	}
-
-	if err := wire.WriteVarBytes(w, 0, kid.signDescriptor.SingleTweak); err != nil {
-		return err
-	}
-
-	if err := wire.WriteVarBytes(w, 0, kid.signDescriptor.WitnessScript); err != nil {
-		return err
-	}
-
-	if err := writeTxOut(w, kid.signDescriptor.Output); err != nil {
-		return err
-	}
-
-	byteOrder.PutUint32(scratch[:4], uint32(kid.signDescriptor.HashType))
-	_, err := w.Write(scratch[:4])
-	return err
+	return lnwallet.WriteSignDescriptor(w, kid.signDescriptor)
 }
 
 // deserializeKidOutput takes a byte array representation of a kidOutput
@@ -1072,37 +1054,7 @@ func deserializeKidOutput(r io.Reader) (*kidOutput, error) {
 	kid.witnessType = lnwallet.WitnessType(byteOrder.Uint16(scratch[:2]))
 
 	kid.signDescriptor = &lnwallet.SignDescriptor{}
-
-	descKeyBytes, err := wire.ReadVarBytes(r, 0, 34, "descKeyBytes")
-	if err != nil {
-		return nil, err
-	}
-
-	descKey, err := btcec.ParsePubKey(descKeyBytes, btcec.S256())
-	if err != nil {
-		return nil, err
-	}
-	kid.signDescriptor.PubKey = descKey
-
-	descPrivateTweak, err := wire.ReadVarBytes(r, 0, 32, "privateTweak")
-	if err != nil {
-		return nil, err
-	}
-	kid.signDescriptor.SingleTweak = descPrivateTweak
-
-	descWitnessScript, err := wire.ReadVarBytes(r, 0, 100, "witnessScript")
-	if err != nil {
-		return nil, err
-	}
-	kid.signDescriptor.WitnessScript = descWitnessScript
-
-	descTxOut := &wire.TxOut{}
-	if err := readTxOut(r, descTxOut); err != nil {
-		return nil, err
-	}
-	kid.signDescriptor.Output = descTxOut
-
-	if _, err := r.Read(scratch[:4]); err != nil {
+	if err := lnwallet.ReadSignDescriptor(r, kid.signDescriptor); err != nil {
 		return nil, err
 	}