input+sweep: rework witness type into an interface

This commit is contained in:
Oliver Gugger committed 2019-10-14 15:32:54 +02:00
1 parent 8e4a897a60
commit fb0051a318
5 files changed
+196 -144

No files matched your search

+3 -3
View File
@@ -1344,7 +1344,7 @@ type kidOutput struct {
}
func makeKidOutput(outpoint, originChanPoint *wire.OutPoint,
blocksToMaturity uint32, witnessType input.WitnessType,
blocksToMaturity uint32, witnessType input.StandardWitnessType,
signDescriptor *input.SignDescriptor,
absoluteMaturity uint32) kidOutput {
@@ -1423,7 +1423,7 @@ func (k *kidOutput) Encode(w io.Writer) error {
return err
}
byteOrder.PutUint16(scratch[:2], uint16(k.WitnessType()))
byteOrder.PutUint16(scratch[:2], uint16(k.witnessType))
if _, err := w.Write(scratch[:2]); err != nil {
return err
}
@@ -1473,7 +1473,7 @@ func (k *kidOutput) Decode(r io.Reader) error {
if _, err := r.Read(scratch[:2]); err != nil {
return err
}
k.witnessType = input.WitnessType(byteOrder.Uint16(scratch[:2]))
k.witnessType = input.StandardWitnessType(byteOrder.Uint16(scratch[:2]))
return input.ReadSignDescriptor(r, &k.signDesc)
}