mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

remove some unneccessary type conversions

Browse source
This commit is contained in:
Marten Seemann 2019-02-17 12:09:18 +08:00
parent 1e796fed4f
commit fbe8844006
7 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
framer_test.go
View file

@ -62,10 +62,10 @@ var _ = Describe("Stream Framer", func() {
for i := 0; i < numFrames+1; i++ { for i := 0; i < numFrames+1; i++ {
framer.QueueControlFrame(bf) framer.QueueControlFrame(bf)
} }
frames, length := framer.AppendControlFrames(nil, protocol.ByteCount(maxSize)) frames, length := framer.AppendControlFrames(nil, maxSize)
Expect(frames).To(HaveLen(numFrames)) Expect(frames).To(HaveLen(numFrames))
Expect(length).To(BeNumerically(">", maxSize-bfLen)) Expect(length).To(BeNumerically(">", maxSize-bfLen))
frames, length = framer.AppendControlFrames(nil, protocol.ByteCount(maxSize)) frames, length = framer.AppendControlFrames(nil, maxSize)
Expect(frames).To(HaveLen(1)) Expect(frames).To(HaveLen(1))
Expect(length).To(Equal(bfLen)) Expect(length).To(Equal(bfLen))
}) })

2
internal/congestion/prr_sender_test.go
View file

@ -70,7 +70,7 @@ var _ = Describe("PRR sender", func() {
}) })
It("burst loss results in slow start", func() { It("burst loss results in slow start", func() {
bytesInFlight := protocol.ByteCount(20 * protocol.DefaultTCPMSS) bytesInFlight := 20 * protocol.DefaultTCPMSS
const numPacketsLost = 13 const numPacketsLost = 13
const ssthreshAfterLoss = 10 const ssthreshAfterLoss = 10
const congestionWindow = ssthreshAfterLoss * protocol.DefaultTCPMSS const congestionWindow = ssthreshAfterLoss * protocol.DefaultTCPMSS

6
internal/flowcontrol/base_flow_controller_test.go
View file

@ -167,7 +167,7 @@ var _ = Describe("Base Flow controller", func() {
newWindowSize := controller.receiveWindowSize newWindowSize := controller.receiveWindowSize
Expect(newWindowSize).To(Equal(2 * oldWindowSize)) Expect(newWindowSize).To(Equal(2 * oldWindowSize))
// check that the new window size was used to increase the offset // check that the new window size was used to increase the offset
Expect(offset).To(Equal(protocol.ByteCount(bytesRead + dataRead + newWindowSize))) Expect(offset).To(Equal(bytesRead + dataRead + newWindowSize))
}) })
It("doesn't increase the window size if data is read so fast that the window would be consumed in less than 4 RTTs, but less than half the window has been read", func() { It("doesn't increase the window size if data is read so fast that the window would be consumed in less than 4 RTTs, but less than half the window has been read", func() {
@ -188,7 +188,7 @@ var _ = Describe("Base Flow controller", func() {
newWindowSize := controller.receiveWindowSize newWindowSize := controller.receiveWindowSize
Expect(newWindowSize).To(Equal(oldWindowSize)) Expect(newWindowSize).To(Equal(oldWindowSize))
// check that the new window size was used to increase the offset // check that the new window size was used to increase the offset
Expect(offset).To(Equal(protocol.ByteCount(bytesRead + dataRead + newWindowSize))) Expect(offset).To(Equal(bytesRead + dataRead + newWindowSize))
}) })
It("doesn't increase the window size if read too slowly", func() { It("doesn't increase the window size if read too slowly", func() {
@ -206,7 +206,7 @@ var _ = Describe("Base Flow controller", func() {
// check that the window size was not increased // check that the window size was not increased
Expect(controller.receiveWindowSize).To(Equal(oldWindowSize)) Expect(controller.receiveWindowSize).To(Equal(oldWindowSize))
// check that the new window size was used to increase the offset // check that the new window size was used to increase the offset
Expect(offset).To(Equal(protocol.ByteCount(bytesRead + dataRead + oldWindowSize))) Expect(offset).To(Equal(bytesRead + dataRead + oldWindowSize))
}) })
It("doesn't increase the window size to a value higher than the maxReceiveWindowSize", func() { It("doesn't increase the window size to a value higher than the maxReceiveWindowSize", func() {

4
internal/flowcontrol/connection_flow_controller_test.go
View file

@ -75,7 +75,7 @@ var _ = Describe("Connection Flow controller", func() {
dataRead := windowSize/2 - 1 // make sure not to trigger auto-tuning dataRead := windowSize/2 - 1 // make sure not to trigger auto-tuning
controller.AddBytesRead(dataRead) controller.AddBytesRead(dataRead)
offset := controller.GetWindowUpdate() offset := controller.GetWindowUpdate()
Expect(offset).To(Equal(protocol.ByteCount(oldOffset + dataRead + 60))) Expect(offset).To(Equal(oldOffset + dataRead + 60))
}) })
It("autotunes the window", func() { It("autotunes the window", func() {
@ -90,7 +90,7 @@ var _ = Describe("Connection Flow controller", func() {
offset := controller.GetWindowUpdate() offset := controller.GetWindowUpdate()
newWindowSize := controller.receiveWindowSize newWindowSize := controller.receiveWindowSize
Expect(newWindowSize).To(Equal(2 * oldWindowSize)) Expect(newWindowSize).To(Equal(2 * oldWindowSize))
Expect(offset).To(Equal(protocol.ByteCount(oldOffset + dataRead + newWindowSize))) Expect(offset).To(Equal(oldOffset + dataRead + newWindowSize))
}) })
}) })
}) })

2
internal/flowcontrol/stream_flow_controller_test.go
View file

@ -183,7 +183,7 @@ var _ = Describe("Stream Flow controller", func() {
controller.epochStartTime = time.Now().Add(-time.Millisecond) controller.epochStartTime = time.Now().Add(-time.Millisecond)
controller.AddBytesRead(55) controller.AddBytesRead(55)
offset := controller.GetWindowUpdate() offset := controller.GetWindowUpdate()
Expect(offset).To(Equal(protocol.ByteCount(oldOffset + 55 + 2*oldWindowSize))) Expect(offset).To(Equal(oldOffset + 55 + 2*oldWindowSize))
Expect(controller.receiveWindowSize).To(Equal(2 * oldWindowSize)) Expect(controller.receiveWindowSize).To(Equal(2 * oldWindowSize))
Expect(controller.connection.(*connectionFlowController).receiveWindowSize).To(Equal(protocol.ByteCount(float64(controller.receiveWindowSize) * protocol.ConnectionFlowControlMultiplier))) Expect(controller.connection.(*connectionFlowController).receiveWindowSize).To(Equal(protocol.ByteCount(float64(controller.receiveWindowSize) * protocol.ConnectionFlowControlMultiplier)))
}) })

2
internal/utils/log_test.go
View file

@ -80,7 +80,7 @@ var _ = Describe("Log", func() {
DefaultLogger.SetLogTimeFormat(format) DefaultLogger.SetLogTimeFormat(format)
DefaultLogger.SetLogLevel(LogLevelInfo) DefaultLogger.SetLogLevel(LogLevelInfo)
DefaultLogger.Infof("info") DefaultLogger.Infof("info")
t, err := time.Parse(format, string(b.String()[:b.Len()-6])) t, err := time.Parse(format, b.String()[:b.Len()-6])
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(t).To(BeTemporally("~", time.Now(), 25*time.Hour)) Expect(t).To(BeTemporally("~", time.Now(), 25*time.Hour))
}) })

8
session_test.go
View file

@ -678,7 +678,7 @@ var _ = Describe("Session", func() {
It("cuts packets to the right length", func() { It("cuts packets to the right length", func() {
hdrLen, packet := getPacketWithLength(sess.srcConnID, 456) hdrLen, packet := getPacketWithLength(sess.srcConnID, 456)
unpacker.EXPECT().Unpack(gomock.Any(), gomock.Any()).DoAndReturn(func(_ *wire.Header, data []byte) (*unpackedPacket, error) { unpacker.EXPECT().Unpack(gomock.Any(), gomock.Any()).DoAndReturn(func(_ *wire.Header, data []byte) (*unpackedPacket, error) {
Expect(data).To(HaveLen(int(hdrLen + 456 - 3))) Expect(data).To(HaveLen(hdrLen + 456 - 3))
return &unpackedPacket{ return &unpackedPacket{
encryptionLevel: protocol.EncryptionHandshake, encryptionLevel: protocol.EncryptionHandshake,
data: []byte{0}, data: []byte{0},
@ -690,7 +690,7 @@ var _ = Describe("Session", func() {
It("handles coalesced packets", func() { It("handles coalesced packets", func() {
hdrLen1, packet1 := getPacketWithLength(sess.srcConnID, 456) hdrLen1, packet1 := getPacketWithLength(sess.srcConnID, 456)
unpacker.EXPECT().Unpack(gomock.Any(), gomock.Any()).DoAndReturn(func(_ *wire.Header, data []byte) (*unpackedPacket, error) { unpacker.EXPECT().Unpack(gomock.Any(), gomock.Any()).DoAndReturn(func(_ *wire.Header, data []byte) (*unpackedPacket, error) {
Expect(data).To(HaveLen(int(hdrLen1 + 456 - 3))) Expect(data).To(HaveLen(hdrLen1 + 456 - 3))
return &unpackedPacket{ return &unpackedPacket{
encryptionLevel: protocol.EncryptionHandshake, encryptionLevel: protocol.EncryptionHandshake,
data: []byte{0}, data: []byte{0},
@ -698,7 +698,7 @@ var _ = Describe("Session", func() {
}) })
hdrLen2, packet2 := getPacketWithLength(sess.srcConnID, 123) hdrLen2, packet2 := getPacketWithLength(sess.srcConnID, 123)
unpacker.EXPECT().Unpack(gomock.Any(), gomock.Any()).DoAndReturn(func(_ *wire.Header, data []byte) (*unpackedPacket, error) { unpacker.EXPECT().Unpack(gomock.Any(), gomock.Any()).DoAndReturn(func(_ *wire.Header, data []byte) (*unpackedPacket, error) {
Expect(data).To(HaveLen(int(hdrLen2 + 123 - 3))) Expect(data).To(HaveLen(hdrLen2 + 123 - 3))
return &unpackedPacket{ return &unpackedPacket{
encryptionLevel: protocol.EncryptionHandshake, encryptionLevel: protocol.EncryptionHandshake,
data: []byte{0}, data: []byte{0},
@ -713,7 +713,7 @@ var _ = Describe("Session", func() {
Expect(sess.srcConnID).ToNot(Equal(wrongConnID)) Expect(sess.srcConnID).ToNot(Equal(wrongConnID))
hdrLen1, packet1 := getPacketWithLength(sess.srcConnID, 456) hdrLen1, packet1 := getPacketWithLength(sess.srcConnID, 456)
unpacker.EXPECT().Unpack(gomock.Any(), gomock.Any()).DoAndReturn(func(_ *wire.Header, data []byte) (*unpackedPacket, error) { unpacker.EXPECT().Unpack(gomock.Any(), gomock.Any()).DoAndReturn(func(_ *wire.Header, data []byte) (*unpackedPacket, error) {
Expect(data).To(HaveLen(int(hdrLen1 + 456 - 3))) Expect(data).To(HaveLen(hdrLen1 + 456 - 3))
return &unpackedPacket{ return &unpackedPacket{
encryptionLevel: protocol.EncryptionHandshake, encryptionLevel: protocol.EncryptionHandshake,
data: []byte{0}, data: []byte{0},