rename MaxDataFrame.ByteOffset to MaximumData

This commit is contained in:
Marten Seemann
2020-07-02 16:23:25 +07:00
parent 00f8028e52
commit f4519cfd32
16 changed files with 32 additions and 32 deletions

View File

@@ -143,7 +143,7 @@ var _ = Describe("Frame parsing", func() {
It("unpacks MAX_DATA frames", func() {
f := &MaxDataFrame{
ByteOffset: 0xcafe,
MaximumData: 0xcafe,
}
buf := &bytes.Buffer{}
err := f.Write(buf, versionIETFFrames)

View File

@@ -36,7 +36,7 @@ func LogFrame(logger utils.Logger, frame Frame, sent bool) {
logger.Debugf("\t%s &wire.AckFrame{LargestAcked: %d, LowestAcked: %d, DelayTime: %s}", dir, f.LargestAcked(), f.LowestAcked(), f.DelayTime.String())
}
case *MaxDataFrame:
logger.Debugf("\t%s &wire.MaxDataFrame{ByteOffset: %d}", dir, f.ByteOffset)
logger.Debugf("\t%s &wire.MaxDataFrame{MaximumData: %d}", dir, f.MaximumData)
case *MaxStreamDataFrame:
logger.Debugf("\t%s &wire.MaxStreamDataFrame{StreamID: %d, ByteOffset: %d}", dir, f.StreamID, f.ByteOffset)
case *DataBlockedFrame:

View File

@@ -98,10 +98,10 @@ var _ = Describe("Frame logging", func() {
It("logs MAX_DATA frames", func() {
frame := &MaxDataFrame{
ByteOffset: 42,
MaximumData: 42,
}
LogFrame(logger, frame, false)
Expect(buf.String()).To(ContainSubstring("\t<- &wire.MaxDataFrame{ByteOffset: 42}\n"))
Expect(buf.String()).To(ContainSubstring("\t<- &wire.MaxDataFrame{MaximumData: 42}\n"))
})
It("logs MAX_STREAM_DATA frames", func() {

View File

@@ -9,7 +9,7 @@ import (
// A MaxDataFrame carries flow control information for the connection
type MaxDataFrame struct {
ByteOffset protocol.ByteCount
MaximumData protocol.ByteCount
}
// parseMaxDataFrame parses a MAX_DATA frame
@@ -23,18 +23,18 @@ func parseMaxDataFrame(r *bytes.Reader, _ protocol.VersionNumber) (*MaxDataFrame
if err != nil {
return nil, err
}
frame.ByteOffset = protocol.ByteCount(byteOffset)
frame.MaximumData = protocol.ByteCount(byteOffset)
return frame, nil
}
//Write writes a MAX_STREAM_DATA frame
func (f *MaxDataFrame) Write(b *bytes.Buffer, version protocol.VersionNumber) error {
b.WriteByte(0x10)
utils.WriteVarInt(b, uint64(f.ByteOffset))
utils.WriteVarInt(b, uint64(f.MaximumData))
return nil
}
// Length of a written frame
func (f *MaxDataFrame) Length(version protocol.VersionNumber) protocol.ByteCount {
return 1 + utils.VarIntLen(uint64(f.ByteOffset))
return 1 + utils.VarIntLen(uint64(f.MaximumData))
}

View File

@@ -17,7 +17,7 @@ var _ = Describe("MAX_DATA frame", func() {
b := bytes.NewReader(data)
frame, err := parseMaxDataFrame(b, versionIETFFrames)
Expect(err).ToNot(HaveOccurred())
Expect(frame.ByteOffset).To(Equal(protocol.ByteCount(0xdecafbad123456)))
Expect(frame.MaximumData).To(Equal(protocol.ByteCount(0xdecafbad123456)))
Expect(b.Len()).To(BeZero())
})
@@ -36,7 +36,7 @@ var _ = Describe("MAX_DATA frame", func() {
Context("writing", func() {
It("has proper min length", func() {
f := &MaxDataFrame{
ByteOffset: 0xdeadbeef,
MaximumData: 0xdeadbeef,
}
Expect(f.Length(versionIETFFrames)).To(Equal(1 + utils.VarIntLen(0xdeadbeef)))
})
@@ -44,7 +44,7 @@ var _ = Describe("MAX_DATA frame", func() {
It("writes a MAX_DATA frame", func() {
b := &bytes.Buffer{}
f := &MaxDataFrame{
ByteOffset: 0xdeadbeefcafe,
MaximumData: 0xdeadbeefcafe,
}
err := f.Write(b, versionIETFFrames)
Expect(err).ToNot(HaveOccurred())