gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

remove unneeded version constant in wire tests

Browse Source
This commit is contained in:
Marten Seemann
2022-05-25 15:38:17 +02:00
parent f10d4bd8f7
commit 909a3a9093
19 changed files with 225 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/wire/crypto_frame_test.go
View File

@@ -18,7 +18,7 @@ var _ = Describe("CRYPTO frame", func() {
data = append(data, encodeVarInt(6)...) // length
data = append(data, []byte("foobar")...)
r := bytes.NewReader(data)
frame, err := parseCryptoFrame(r, versionIETFFrames)
frame, err := parseCryptoFrame(r, protocol.Version1)
Expect(err).ToNot(HaveOccurred())
Expect(frame.Offset).To(Equal(protocol.ByteCount(0xdecafbad)))
Expect(frame.Data).To(Equal([]byte("foobar")))
@@ -30,10 +30,10 @@ var _ = Describe("CRYPTO frame", func() {
data = append(data, encodeVarInt(0xdecafbad)...) // offset
data = append(data, encodeVarInt(6)...) // data length
data = append(data, []byte("foobar")...)
_, err := parseCryptoFrame(bytes.NewReader(data), versionIETFFrames)
_, err := parseCryptoFrame(bytes.NewReader(data), protocol.Version1)
Expect(err).NotTo(HaveOccurred())
for i := range data {
_, err := parseCryptoFrame(bytes.NewReader(data[0:i]), versionIETFFrames)
_, err := parseCryptoFrame(bytes.NewReader(data[0:i]), protocol.Version1)
Expect(err).To(HaveOccurred())
}
})
@@ -46,7 +46,7 @@ var _ = Describe("CRYPTO frame", func() {
Data: []byte("foobar"),
}
b := &bytes.Buffer{}
err := f.Write(b, versionIETFFrames)
err := f.Write(b, protocol.Version1)
Expect(err).ToNot(HaveOccurred())
expected := []byte{0x6}
expected = append(expected, encodeVarInt(0x123456)...) // offset
@@ -73,13 +73,13 @@ var _ = Describe("CRYPTO frame", func() {
if maxDataLen == 0 { // 0 means that no valid CRYTPO frame can be written
// check that writing a minimal size CRYPTO frame (i.e. with 1 byte data) is actually larger than the desired size
f.Data = []byte{0}
err := f.Write(b, versionIETFFrames)
err := f.Write(b, protocol.Version1)
Expect(err).ToNot(HaveOccurred())
Expect(b.Len()).To(BeNumerically(">", i))
continue
}
f.Data = data[:int(maxDataLen)]
err := f.Write(b, versionIETFFrames)
err := f.Write(b, protocol.Version1)
Expect(err).ToNot(HaveOccurred())
// There's *one* pathological case, where a data length of x can be encoded into 1 byte
// but a data lengths of x+1 needs 2 bytes
@@ -100,7 +100,7 @@ var _ = Describe("CRYPTO frame", func() {
Offset: 0x1337,
Data: []byte("foobar"),
}
Expect(f.Length(versionIETFFrames)).To(Equal(1 + quicvarint.Len(0x1337) + quicvarint.Len(6) + 6))
Expect(f.Length(protocol.Version1)).To(Equal(1 + quicvarint.Len(0x1337) + quicvarint.Len(6) + 6))
})
})
@@ -110,8 +110,8 @@ var _ = Describe("CRYPTO frame", func() {
Offset: 0x1337,
Data: []byte("foobar"),
}
hdrLen := f.Length(versionIETFFrames) - 6
new, needsSplit := f.MaybeSplitOffFrame(hdrLen+3, versionIETFFrames)
hdrLen := f.Length(protocol.Version1) - 6
new, needsSplit := f.MaybeSplitOffFrame(hdrLen+3, protocol.Version1)
Expect(needsSplit).To(BeTrue())
Expect(new.Data).To(Equal([]byte("foo")))
Expect(new.Offset).To(Equal(protocol.ByteCount(0x1337)))
@@ -124,7 +124,7 @@ var _ = Describe("CRYPTO frame", func() {
Offset: 0x1337,
Data: []byte("foobar"),
}
f, needsSplit := f.MaybeSplitOffFrame(f.Length(versionIETFFrames), versionIETFFrames)
f, needsSplit := f.MaybeSplitOffFrame(f.Length(protocol.Version1), protocol.Version1)
Expect(needsSplit).To(BeFalse())
Expect(f).To(BeNil())
})
@@ -134,13 +134,13 @@ var _ = Describe("CRYPTO frame", func() {
Offset: 0x1337,
Data: []byte("foobar"),
}
length := f.Length(versionIETFFrames) - 6
length := f.Length(protocol.Version1) - 6
for i := protocol.ByteCount(0); i <= length; i++ {
f, needsSplit := f.MaybeSplitOffFrame(i, versionIETFFrames)
f, needsSplit := f.MaybeSplitOffFrame(i, protocol.Version1)
Expect(needsSplit).To(BeTrue())
Expect(f).To(BeNil())
}
f, needsSplit := f.MaybeSplitOffFrame(length+1, versionIETFFrames)
f, needsSplit := f.MaybeSplitOffFrame(length+1, protocol.Version1)
Expect(needsSplit).To(BeTrue())
Expect(f).ToNot(BeNil())
})