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

lnwallet: move txout serialization out of lnwire

Browse Source
This commit is contained in:
Conner Fromknecht 2017-08-25 18:12:34 -07:00 committed by Olaoluwa Osuntokun
parent 4bae23a9a7
commit 8ef2263e46
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lnwallet/signdescriptor.go
View File

@ -5,7 +5,6 @@ import (
"errors" "errors"
"io" "io"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/roasbeef/btcd/btcec" "github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/txscript" "github.com/roasbeef/btcd/txscript"
"github.com/roasbeef/btcd/wire" "github.com/roasbeef/btcd/wire"
@ -104,7 +103,7 @@ func WriteSignDescriptor(w io.Writer, sd *SignDescriptor) error {
return err return err
} }
if err := lnwire.WriteTxOut(w, sd.Output); err != nil { if err := writeTxOut(w, sd.Output); err != nil {
return err return err
} }
@ -174,7 +173,7 @@ func ReadSignDescriptor(r io.Reader, sd *SignDescriptor) error {
sd.WitnessScript = witnessScript sd.WitnessScript = witnessScript
txOut := &wire.TxOut{} txOut := &wire.TxOut{}
if err := lnwire.ReadTxOut(r, txOut); err != nil { if err := readTxOut(r, txOut); err != nil {
return err return err
} }
sd.Output = txOut sd.Output = txOut

10
lnwire/txout.go → lnwallet/txout.go
View File

@ -1,4 +1,4 @@
package lnwire package lnwallet
import ( import (
"encoding/binary" "encoding/binary"
@ -7,8 +7,8 @@ import (
"github.com/roasbeef/btcd/wire" "github.com/roasbeef/btcd/wire"
) )
// WriteTxOut serializes a wire.TxOut struct into the passed io.Writer stream. // writeTxOut serializes a wire.TxOut struct into the passed io.Writer stream.
func WriteTxOut(w io.Writer, txo *wire.TxOut) error { func writeTxOut(w io.Writer, txo *wire.TxOut) error {
var scratch [8]byte var scratch [8]byte
binary.BigEndian.PutUint64(scratch[:], uint64(txo.Value)) binary.BigEndian.PutUint64(scratch[:], uint64(txo.Value))
@ -23,8 +23,8 @@ func WriteTxOut(w io.Writer, txo *wire.TxOut) error {
return nil return nil
} }
// ReadTxOut deserializes a wire.TxOut struct from the passed io.Reader stream. // readTxOut deserializes a wire.TxOut struct from the passed io.Reader stream.
func ReadTxOut(r io.Reader, txo *wire.TxOut) error { func readTxOut(r io.Reader, txo *wire.TxOut) error {
var scratch [8]byte var scratch [8]byte
if _, err := io.ReadFull(r, scratch[:]); err != nil { if _, err := io.ReadFull(r, scratch[:]); err != nil {

6
lnwire/txout_test.go → lnwallet/txout_test.go
View File

@ -1,4 +1,4 @@
package lnwire package lnwallet
import ( import (
"bytes" "bytes"
@ -28,12 +28,12 @@ func TestTxOutSerialization(t *testing.T) {
var buf bytes.Buffer var buf bytes.Buffer
if err := WriteTxOut(&buf, &txo); err != nil { if err := writeTxOut(&buf, &txo); err != nil {
t.Fatalf("unable to serialize txout: %v", err) t.Fatalf("unable to serialize txout: %v", err)
} }
var deserializedTxo wire.TxOut var deserializedTxo wire.TxOut
if err := ReadTxOut(&buf, &deserializedTxo); err != nil { if err := readTxOut(&buf, &deserializedTxo); err != nil {
t.Fatalf("unable to deserialize txout: %v", err) t.Fatalf("unable to deserialize txout: %v", err)
} }