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

run gosimple in gometalinter

Browse Source
This commit is contained in:
Marten Seemann
2018-02-22 08:48:12 +08:00
parent 286a51bcc0
commit 81974d30d6
13 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/wire/header_test.go
View File

@@ -243,14 +243,14 @@ var _ = Describe("Header", func() {
(&Header{
IsLongHeader: true,
}).Log()
Expect(string(buf.Bytes())).To(ContainSubstring("Long Header"))
Expect(buf.String()).To(ContainSubstring("Long Header"))
})
It("logs a Public Header", func() {
(&Header{
isPublicHeader: true,
}).Log()
Expect(string(buf.Bytes())).To(ContainSubstring("Public Header"))
Expect(buf.String()).To(ContainSubstring("Public Header"))
})
})
})

6
internal/wire/ietf_header_test.go
View File

@@ -393,7 +393,7 @@ var _ = Describe("IETF draft Header", func() {
ConnectionID: 0xdeadbeef,
Version: 0xfeed,
}).logHeader()
Expect(string(buf.Bytes())).To(ContainSubstring("Long Header{Type: Handshake, ConnectionID: 0xdeadbeef, PacketNumber: 0x1337, Version: 0xfeed}"))
Expect(buf.String()).To(ContainSubstring("Long Header{Type: Handshake, ConnectionID: 0xdeadbeef, PacketNumber: 0x1337, Version: 0xfeed}"))
})
It("logs Short Headers containing a connection ID", func() {
@@ -403,7 +403,7 @@ var _ = Describe("IETF draft Header", func() {
PacketNumberLen: 4,
ConnectionID: 0xdeadbeef,
}).logHeader()
Expect(string(buf.Bytes())).To(ContainSubstring("Short Header{ConnectionID: 0xdeadbeef, PacketNumber: 0x1337, PacketNumberLen: 4, KeyPhase: 1}"))
Expect(buf.String()).To(ContainSubstring("Short Header{ConnectionID: 0xdeadbeef, PacketNumber: 0x1337, PacketNumberLen: 4, KeyPhase: 1}"))
})
It("logs Short Headers with omitted connection ID", func() {
@@ -412,7 +412,7 @@ var _ = Describe("IETF draft Header", func() {
PacketNumberLen: 1,
OmitConnectionID: true,
}).logHeader()
Expect(string(buf.Bytes())).To(ContainSubstring("Short Header{ConnectionID: (omitted), PacketNumber: 0x12, PacketNumberLen: 1, KeyPhase: 0}"))
Expect(buf.String()).To(ContainSubstring("Short Header{ConnectionID: (omitted), PacketNumber: 0x12, PacketNumberLen: 1, KeyPhase: 0}"))
})
})
})

2
internal/wire/public_header.go
View File

@@ -236,7 +236,7 @@ func (h *Header) logPublicHeader() {
}
ver := "(unset)"
if h.Version != 0 {
ver = fmt.Sprintf("%s", h.Version)
ver = h.Version.String()
}
utils.Debugf(" Public Header{ConnectionID: %s, PacketNumber: %#x, PacketNumberLen: %d, Version: %s, DiversificationNonce: %#v}", connID, h.PacketNumber, h.PacketNumberLen, ver, h.DiversificationNonce)
}

8
internal/wire/public_header_test.go
View File

@@ -504,7 +504,7 @@ var _ = Describe("Public Header", func() {
PacketNumberLen: 6,
Version: protocol.Version39,
}).logPublicHeader()
Expect(string(buf.Bytes())).To(ContainSubstring("Public Header{ConnectionID: 0xdecafbad, PacketNumber: 0x1337, PacketNumberLen: 6, Version: gQUIC 39"))
Expect(buf.String()).To(ContainSubstring("Public Header{ConnectionID: 0xdecafbad, PacketNumber: 0x1337, PacketNumberLen: 6, Version: gQUIC 39"))
})
It("logs a Public Header with omitted connection ID", func() {
@@ -514,7 +514,7 @@ var _ = Describe("Public Header", func() {
PacketNumberLen: 6,
Version: protocol.Version39,
}).logPublicHeader()
Expect(string(buf.Bytes())).To(ContainSubstring("Public Header{ConnectionID: (omitted)"))
Expect(buf.String()).To(ContainSubstring("Public Header{ConnectionID: (omitted)"))
})
It("logs a Public Header without a version", func() {
@@ -523,7 +523,7 @@ var _ = Describe("Public Header", func() {
PacketNumber: 0x1337,
PacketNumberLen: 6,
}).logPublicHeader()
Expect(string(buf.Bytes())).To(ContainSubstring("Version: (unset)"))
Expect(buf.String()).To(ContainSubstring("Version: (unset)"))
})
It("logs diversification nonces", func() {
@@ -531,7 +531,7 @@ var _ = Describe("Public Header", func() {
ConnectionID: 0xdecafbad,
DiversificationNonce: []byte{0xba, 0xdf, 0x00, 0x0d},
}).logPublicHeader()
Expect(string(buf.Bytes())).To(ContainSubstring("DiversificationNonce: []byte{0xba, 0xdf, 0x0, 0xd}"))
Expect(buf.String()).To(ContainSubstring("DiversificationNonce: []byte{0xba, 0xdf, 0x0, 0xd}"))
})
})