Commit 7f42a06f authored by Andreas Bigger's avatar Andreas Bigger

minimize changeset

parent 73b682f6
...@@ -150,7 +150,7 @@ func (co *ChannelOut) Close() error { ...@@ -150,7 +150,7 @@ func (co *ChannelOut) Close() error {
// Returns an error if the `maxSize` < FrameV0OverHeadSize. // Returns an error if the `maxSize` < FrameV0OverHeadSize.
// Returns io.EOF when the channel is closed & there are no more frames. // Returns io.EOF when the channel is closed & there are no more frames.
// Returns nil if there is still more buffered data. // Returns nil if there is still more buffered data.
// Returns anderror if it ran into an error during processing. // Returns an error if it ran into an error during processing.
func (co *ChannelOut) OutputFrame(w *bytes.Buffer, maxSize uint64) (uint16, error) { func (co *ChannelOut) OutputFrame(w *bytes.Buffer, maxSize uint64) (uint16, error) {
f := Frame{ f := Frame{
ID: co.id, ID: co.id,
......
...@@ -80,42 +80,42 @@ func TestForceCloseTxData(t *testing.T) { ...@@ -80,42 +80,42 @@ func TestForceCloseTxData(t *testing.T) {
output: "", output: "",
}, },
{ {
frames: []Frame{{FrameNumber: 0, IsLast: false}, {ID: id, FrameNumber: 1, IsLast: true}}, frames: []Frame{Frame{FrameNumber: 0, IsLast: false}, Frame{ID: id, FrameNumber: 1, IsLast: true}},
errors: true, errors: true,
output: "", output: "",
}, },
{ {
frames: []Frame{{ID: id, FrameNumber: 0, IsLast: false}}, frames: []Frame{Frame{ID: id, FrameNumber: 0, IsLast: false}},
errors: false, errors: false,
output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000001", output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000001",
}, },
{ {
frames: []Frame{{ID: id, FrameNumber: 0, IsLast: true}}, frames: []Frame{Frame{ID: id, FrameNumber: 0, IsLast: true}},
errors: false, errors: false,
output: "00", output: "00",
}, },
{ {
frames: []Frame{{ID: id, FrameNumber: 1, IsLast: false}}, frames: []Frame{Frame{ID: id, FrameNumber: 1, IsLast: false}},
errors: false, errors: false,
output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000001", output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000001",
}, },
{ {
frames: []Frame{{ID: id, FrameNumber: 1, IsLast: true}}, frames: []Frame{Frame{ID: id, FrameNumber: 1, IsLast: true}},
errors: false, errors: false,
output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000000", output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000000",
}, },
{ {
frames: []Frame{{ID: id, FrameNumber: 2, IsLast: true}}, frames: []Frame{Frame{ID: id, FrameNumber: 2, IsLast: true}},
errors: false, errors: false,
output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000000deadbeefdeadbeefdeadbeefdeadbeef00010000000000", output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000000deadbeefdeadbeefdeadbeefdeadbeef00010000000000",
}, },
{ {
frames: []Frame{{ID: id, FrameNumber: 1, IsLast: false}, {ID: id, FrameNumber: 3, IsLast: true}}, frames: []Frame{Frame{ID: id, FrameNumber: 1, IsLast: false}, Frame{ID: id, FrameNumber: 3, IsLast: true}},
errors: false, errors: false,
output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000000deadbeefdeadbeefdeadbeefdeadbeef00020000000000", output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000000deadbeefdeadbeefdeadbeefdeadbeef00020000000000",
}, },
{ {
frames: []Frame{{ID: id, FrameNumber: 1, IsLast: false}, {ID: id, FrameNumber: 3, IsLast: true}, {ID: id, FrameNumber: 5, IsLast: true}}, frames: []Frame{Frame{ID: id, FrameNumber: 1, IsLast: false}, Frame{ID: id, FrameNumber: 3, IsLast: true}, Frame{ID: id, FrameNumber: 5, IsLast: true}},
errors: false, errors: false,
output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000000deadbeefdeadbeefdeadbeefdeadbeef00020000000000", output: "00deadbeefdeadbeefdeadbeefdeadbeef00000000000000deadbeefdeadbeefdeadbeefdeadbeef00020000000000",
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment