channeldb+utxonursery+lnwire: use lnwire's OutPoint,TxOut serialization

lnwire/lnwire.go

@@ -4,13 +4,11 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"math"
 
 	"net"
 
 	"github.com/go-errors/errors"
 	"github.com/roasbeef/btcd/btcec"
-	"github.com/roasbeef/btcd/chaincfg/chainhash"
 	"github.com/roasbeef/btcd/wire"
 	"github.com/roasbeef/btcutil"
 )
@@ -189,21 +187,7 @@ func writeElement(w io.Writer, element interface{}) error {
 		}
 
 	case wire.OutPoint:
-		var h [32]byte
-		copy(h[:], e.Hash[:])
-		if _, err := w.Write(h[:]); err != nil {
-			return err
-		}
-
-		if e.Index > math.MaxUint16 {
-			return fmt.Errorf("index for outpoint (%v) is "+
-				"greater than max index of %v", e.Index,
-				math.MaxUint16)
-		}
-
-		var idx [2]byte
-		binary.BigEndian.PutUint16(idx[:], uint16(e.Index))
-		if _, err := w.Write(idx[:]); err != nil {
+		if err := WriteOutPoint(w, &e); err != nil {
 			return err
 		}
 
@@ -479,28 +463,7 @@ func readElement(r io.Reader, element interface{}) error {
 		}
 		*e = pkScript
 	case *wire.OutPoint:
-		var h [32]byte
-		if _, err = io.ReadFull(r, h[:]); err != nil {
-			return err
-		}
-		hash, err := chainhash.NewHash(h[:])
-		if err != nil {
-			return err
-		}
-
-		var idxBytes [2]byte
-		_, err = io.ReadFull(r, idxBytes[:])
-		if err != nil {
-			return err
-		}
-		index := binary.BigEndian.Uint16(idxBytes[:])
-
-		*e = wire.OutPoint{
-			Hash:  *hash,
-			Index: uint32(index),
-		}
-	case *FailCode:
-		if err := readElement(r, (*uint16)(e)); err != nil {
+		if err := ReadOutPoint(r, e); err != nil {
 			return err
 		}
 

lnwire/outpoint.go

@@ -0,0 +1,59 @@
+package lnwire
+
+import (
+	"encoding/binary"
+	"fmt"
+	"io"
+	"math"
+
+	"github.com/roasbeef/btcd/chaincfg/chainhash"
+	"github.com/roasbeef/btcd/wire"
+)
+
+// WriteOutPoint serializes a wire.OutPoint struct into the passed io.Writer
+// stream.
+func WriteOutPoint(w io.Writer, o *wire.OutPoint) error {
+	if _, err := w.Write(o.Hash[:chainhash.HashSize]); err != nil {
+		return err
+	}
+
+	if o.Index > math.MaxUint16 {
+		return fmt.Errorf("index for outpoint (%v) is "+
+			"greater than max index of %v", o.Index, math.MaxUint16)
+	}
+
+	var idx [2]byte
+	binary.BigEndian.PutUint16(idx[:], uint16(o.Index))
+	if _, err := w.Write(idx[:]); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ReadOutPoint deserializes a wire.OutPoint struct from the passed io.Reader
+// stream.
+func ReadOutPoint(r io.Reader, o *wire.OutPoint) error {
+	var h [chainhash.HashSize]byte
+	if _, err := io.ReadFull(r, h[:]); err != nil {
+		return err
+	}
+	hash, err := chainhash.NewHash(h[:])
+	if err != nil {
+		return err
+	}
+
+	var idxBytes [2]byte
+	_, err = io.ReadFull(r, idxBytes[:])
+	if err != nil {
+		return err
+	}
+	index := binary.BigEndian.Uint16(idxBytes[:])
+
+	*o = wire.OutPoint{
+		Hash:  *hash,
+		Index: uint32(index),
+	}
+
+	return nil
+}

lnwire/outpoint_test.go

@@ -0,0 +1,40 @@
+package lnwire
+
+import (
+	"bytes"
+	"reflect"
+	"testing"
+
+	"github.com/roasbeef/btcd/chaincfg/chainhash"
+	"github.com/roasbeef/btcd/wire"
+)
+
+func TestOutpointSerialization(t *testing.T) {
+	outpoint := wire.OutPoint{
+		Hash: [chainhash.HashSize]byte{
+			0x51, 0xb6, 0x37, 0xd8, 0xfc, 0xd2, 0xc6, 0xda,
+			0x48, 0x59, 0xe6, 0x96, 0x31, 0x13, 0xa1, 0x17,
+			0x2d, 0xe7, 0x93, 0xe4, 0xb7, 0x25, 0xb8, 0x4d,
+			0x1f, 0xb, 0x4c, 0xf9, 0x9e, 0xc5, 0x8c, 0xe9,
+		},
+		Index: 9,
+	}
+
+	var buf bytes.Buffer
+
+	if err := WriteOutPoint(&buf, &outpoint); err != nil {
+		t.Fatalf("unable to serialize outpoint: %v", err)
+	}
+
+	var deserializedOutpoint wire.OutPoint
+	if err := ReadOutPoint(&buf, &deserializedOutpoint); err != nil {
+		t.Fatalf("unable to deserialize outpoint: %v", err)
+	}
+
+	if !reflect.DeepEqual(outpoint, deserializedOutpoint) {
+		t.Fatalf("original and deserialized outpoints are different:\n"+
+			"original     : %+v\n"+
+			"deserialized : %+v\n",
+			outpoint, deserializedOutpoint)
+	}
+}

lnwire/txout.go

@@ -0,0 +1,46 @@
+package lnwire
+
+import (
+	"encoding/binary"
+	"io"
+
+	"github.com/roasbeef/btcd/wire"
+)
+
+// WriteTxOut serializes a wire.TxOut struct into the passed io.Writer stream.
+func WriteTxOut(w io.Writer, txo *wire.TxOut) error {
+	var scratch [8]byte
+
+	binary.BigEndian.PutUint64(scratch[:], uint64(txo.Value))
+	if _, err := w.Write(scratch[:]); err != nil {
+		return err
+	}
+
+	if err := wire.WriteVarBytes(w, 0, txo.PkScript); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ReadTxOut deserializes a wire.TxOut struct from the passed io.Reader stream.
+func ReadTxOut(r io.Reader, txo *wire.TxOut) error {
+	var scratch [8]byte
+
+	if _, err := io.ReadFull(r, scratch[:]); err != nil {
+		return err
+	}
+	value := int64(binary.BigEndian.Uint64(scratch[:]))
+
+	pkScript, err := wire.ReadVarBytes(r, 0, 80, "pkScript")
+	if err != nil {
+		return err
+	}
+
+	*txo = wire.TxOut{
+		Value:    value,
+		PkScript: pkScript,
+	}
+
+	return nil
+}

lnwire/txout_test.go

@@ -0,0 +1,46 @@
+package lnwire
+
+import (
+	"bytes"
+	"reflect"
+	"testing"
+
+	"github.com/roasbeef/btcd/wire"
+)
+
+func TestTxOutSerialization(t *testing.T) {
+	txo := wire.TxOut{
+		Value: 1e7,
+		PkScript: []byte{
+			0x41, // OP_DATA_65
+			0x04, 0xd6, 0x4b, 0xdf, 0xd0, 0x9e, 0xb1, 0xc5,
+			0xfe, 0x29, 0x5a, 0xbd, 0xeb, 0x1d, 0xca, 0x42,
+			0x81, 0xbe, 0x98, 0x8e, 0x2d, 0xa0, 0xb6, 0xc1,
+			0xc6, 0xa5, 0x9d, 0xc2, 0x26, 0xc2, 0x86, 0x24,
+			0xe1, 0x81, 0x75, 0xe8, 0x51, 0xc9, 0x6b, 0x97,
+			0x3d, 0x81, 0xb0, 0x1c, 0xc3, 0x1f, 0x04, 0x78,
+			0x34, 0xbc, 0x06, 0xd6, 0xd6, 0xed, 0xf6, 0x20,
+			0xd1, 0x84, 0x24, 0x1a, 0x6a, 0xed, 0x8b, 0x63,
+			0xa6, // 65-byte signature
+			0xac, // OP_CHECKSIG
+		},
+	}
+
+	var buf bytes.Buffer
+
+	if err := WriteTxOut(&buf, &txo); err != nil {
+		t.Fatalf("unable to serialize txout: %v", err)
+	}
+
+	var deserializedTxo wire.TxOut
+	if err := ReadTxOut(&buf, &deserializedTxo); err != nil {
+		t.Fatalf("unable to deserialize txout: %v", err)
+	}
+
+	if !reflect.DeepEqual(txo, deserializedTxo) {
+		t.Fatalf("original and deserialized txouts are different:\n"+
+			"original     : %+v\n"+
+			"deserialized : %+v\n",
+			txo, deserializedTxo)
+	}
+}