From 953bfac5725c4ac1797b7b00da02a3f57cb9c6ca Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Tue, 13 Nov 2018 09:51:55 +0100 Subject: [PATCH] remove unnecessary assignment --- common/uuid/uuid_test.go | 4 ++-- proxy/vmess/encoding/client.go | 4 ++-- proxy/vmess/encoding/server.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/uuid/uuid_test.go b/common/uuid/uuid_test.go index f6697abcd..e1ccb1b45 100644 --- a/common/uuid/uuid_test.go +++ b/common/uuid/uuid_test.go @@ -70,8 +70,8 @@ func TestRandom(t *testing.T) { func TestEquals(t *testing.T) { assert := With(t) - var uuid *UUID = nil - var uuid2 *UUID = nil + var uuid *UUID + var uuid2 *UUID assert(uuid.Equals(uuid2), IsTrue) uuid3 := New() diff --git a/proxy/vmess/encoding/client.go b/proxy/vmess/encoding/client.go index 6050bfabb..0df463ecc 100644 --- a/proxy/vmess/encoding/client.go +++ b/proxy/vmess/encoding/client.go @@ -103,7 +103,7 @@ func (c *ClientSession) EncodeRequestBody(request *protocol.RequestHeader, write if request.Option.Has(protocol.RequestOptionChunkMasking) { sizeParser = NewShakeSizeParser(c.requestBodyIV[:]) } - var padding crypto.PaddingLengthGenerator = nil + var padding crypto.PaddingLengthGenerator if request.Option.Has(protocol.RequestOptionGlobalPadding) { padding = sizeParser.(crypto.PaddingLengthGenerator) } @@ -200,7 +200,7 @@ func (c *ClientSession) DecodeResponseBody(request *protocol.RequestHeader, read if request.Option.Has(protocol.RequestOptionChunkMasking) { sizeParser = NewShakeSizeParser(c.responseBodyIV[:]) } - var padding crypto.PaddingLengthGenerator = nil + var padding crypto.PaddingLengthGenerator if request.Option.Has(protocol.RequestOptionGlobalPadding) { padding = sizeParser.(crypto.PaddingLengthGenerator) } diff --git a/proxy/vmess/encoding/server.go b/proxy/vmess/encoding/server.go index 5bf680b99..0840ce416 100644 --- a/proxy/vmess/encoding/server.go +++ b/proxy/vmess/encoding/server.go @@ -214,7 +214,7 @@ func (s *ServerSession) DecodeRequestBody(request *protocol.RequestHeader, reade if request.Option.Has(protocol.RequestOptionChunkMasking) { sizeParser = NewShakeSizeParser(s.requestBodyIV[:]) } - var padding crypto.PaddingLengthGenerator = nil + var padding crypto.PaddingLengthGenerator if request.Option.Has(protocol.RequestOptionGlobalPadding) { padding = sizeParser.(crypto.PaddingLengthGenerator) } @@ -293,7 +293,7 @@ func (s *ServerSession) EncodeResponseBody(request *protocol.RequestHeader, writ if request.Option.Has(protocol.RequestOptionChunkMasking) { sizeParser = NewShakeSizeParser(s.responseBodyIV[:]) } - var padding crypto.PaddingLengthGenerator = nil + var padding crypto.PaddingLengthGenerator if request.Option.Has(protocol.RequestOptionGlobalPadding) { padding = sizeParser.(crypto.PaddingLengthGenerator) }