Use bytes.Equal instead of Compare (bfenetworks#172)

scriptkids · iyangsj · commit 28b155452eec · 2019-12-12T11:12:52.000+08:00
diff --git a/bfe_proxy/conn_test.go b/bfe_proxy/conn_test.go
@@ -89,7 +89,7 @@ func TestProxyConnReadNormal(t *testing.T) {
 		buf := make([]byte, 16*1024)
 		_, err := io.ReadFull(c, buf)
 		checkError(t, "", err)
-		if bytes.Compare(msg, buf) != 0 {
+		if !bytes.Equal(msg, buf) {
 			t.Errorf("Read want %v: \ngot %v", msg, buf)
 		}
 	})
diff --git a/bfe_util/byte_pool/byte_pool_test.go b/bfe_util/byte_pool/byte_pool_test.go
@@ -38,7 +38,7 @@ func TestBytePool(t *testing.T) {
 		t.Error("result should keep length")
 	}
 
-	if bytes.Compare(key, result) != 0 {
+	if !bytes.Equal(key, result) {
 		t.Error("item should keep unchanged")
 	}
 
diff --git a/bfe_util/byte_pool/fixed_byte_pool_test.go b/bfe_util/byte_pool/fixed_byte_pool_test.go
@@ -38,7 +38,7 @@ func TestFixedBytePool(t *testing.T) {
 	if len(key) != len(resuItem) {
 		t.Error("testItem and resuItem not same len")
 	}
-	if bytes.Compare(key, resuItem) != 0 {
+	if !bytes.Equal(key, resuItem) {
 		t.Error("testItem, and resuItem not equal")
 	}
 
diff --git a/bfe_util/copy_util_test.go b/bfe_util/copy_util_test.go
@@ -115,7 +115,7 @@ func TestCopyWithoutBuffer(t *testing.T) {
 			}
 		}
 		expectBytes := cases[i].data[:written]
-		if bytes.Compare(wf.sink.Bytes(), expectBytes) != 0 {
+		if !bytes.Equal(wf.sink.Bytes(), expectBytes) {
 			t.Fatalf("Case %d: written bytes not match.\n", i)
 		}
 		fmt.Printf("Case %d: written=%d, err=%v, expectWritten=%d, expectErr=%v.\n", i, written, err, expectWritten, expectErr)
diff --git a/bfe_util/hash_set/node_pool_test.go b/bfe_util/hash_set/node_pool_test.go
@@ -32,7 +32,7 @@ func TestAddItem(t *testing.T) {
 	if node != 0 {
 		t.Errorf("node should be 0 %d", node)
 	}
-	if bytes.Compare(np.element(0), Item) != 0 {
+	if !bytes.Equal(np.element(0), Item) {
 		t.Error("element is wrong")
 	}
 
@@ -44,7 +44,7 @@ func TestAddItem(t *testing.T) {
 	if node != 1 {
 		t.Errorf("node should be 0 %d", node)
 	}
-	if bytes.Compare(np.element(1), Item) != 0 {
+	if !bytes.Equal(np.element(1), Item) {
 		t.Error("element is wrong")
 	}
 	if !np.exist(0, Item) {
diff --git a/bfe_util/ipdict/txt_load/txt_info.go b/bfe_util/ipdict/txt_load/txt_info.go
@@ -132,7 +132,7 @@ func getActualFileInfo(path string) (*MetaInfo, error) {
 		}
 
 		// insert start ip and end ip into dict
-		if bytes.Compare(startIP, endIP) == 0 {
+		if bytes.Equal(startIP, endIP) {
 			singleIPCounter += 1
 		} else {
 			pairIPCounter += 1
diff --git a/go.mod b/go.mod
@@ -15,6 +15,7 @@ require (
 	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413
 	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
 	golang.org/x/sys v0.0.0-20191210023423-ac6580df4449
+	golang.org/x/tools v0.0.0-20191210221141-98df12377212 // indirect
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -8,6 +8,8 @@ github.com/baidu/go-lib v0.0.0-20191102055223-5926b52ca0eb h1:DDyxlHtwU2BjVvtpSg
 github.com/baidu/go-lib v0.0.0-20191102055223-5926b52ca0eb/go.mod h1:FneHDqz3wLeDGdWfRyW4CzBbCwaqesLGIFb09N80/ww=
 github.com/baidu/go-lib v0.0.0-20191203131845-1dc193267345 h1:goQn0mElfbw8RpE4fsD8wSQQSpeRyXFXhoT0IMSSYEk=
 github.com/baidu/go-lib v0.0.0-20191203131845-1dc193267345/go.mod h1:FneHDqz3wLeDGdWfRyW4CzBbCwaqesLGIFb09N80/ww=
+github.com/baidu/go-lib v0.0.0-20191211084149-f80a8a568e3f h1:vLf+yVameFrWRLdHpg62lpx6mBXdldjEEHiIN2GBqoo=
+github.com/baidu/go-lib v0.0.0-20191211084149-f80a8a568e3f/go.mod h1:FneHDqz3wLeDGdWfRyW4CzBbCwaqesLGIFb09N80/ww=
 github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uczJe5YQdrYB16oTJlGSC/OyZDqUk9xX4=
@@ -29,18 +31,24 @@ golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 h1:8dUaAV7K4uHsF56JQWkpre
 golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e h1:egKlR8l7Nu9vHGWbcUV8lqR4987UfUbBd7GbhqGzNYU=
 golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a h1:+HHJiFUXVOIS9mr1ThqkQD1N8vpFCfCShqADBM12KTc=
 golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed h1:uPxWBzB3+mlnjy9W58qY1j/cjyFjutgw/Vhan2zLy/A=
 golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e h1:9vRrk9YW2BTzLP0VCB9ZDjU4cPqkg+IDWL7XgxA1yxQ=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 h1:gSbV7h1NRL2G1xTg/owz62CST1oJBmxy4QpMMregXVQ=
+golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20191120221951-8fd459516a27 h1:Hnjbvuhm7GOIJHtxOlsKcq7CEDvPLMHawSA1AzKVlxA=
 golang.org/x/tools v0.0.0-20191120221951-8fd459516a27/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -60,6 +68,8 @@ golang.org/x/tools v0.0.0-20191204011308-9611592c72f6 h1:BP62y4oUl8+/CvHuvVqHIPm
 golang.org/x/tools v0.0.0-20191204011308-9611592c72f6/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191206204035-259af5ff87bd h1:Zc7EU2PqpsNeIfOoVA7hvQX4cS3YDJEs5KlfatT3hLo=
 golang.org/x/tools v0.0.0-20191206204035-259af5ff87bd/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191210221141-98df12377212 h1:p0cPlrIZeu8wy/7Cyva+AvJjWtO3ehLV9TloLyItKIc=
+golang.org/x/tools v0.0.0-20191210221141-98df12377212/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs=
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func TestProxyConnReadNormal(t *testing.T) {`
`89`	`89`	`buf := make([]byte, 16*1024)`
`90`	`90`	`_, err := io.ReadFull(c, buf)`
`91`	`91`	`checkError(t, "", err)`
`92`		`- if bytes.Compare(msg, buf) != 0 {`
	`92`	`+ if !bytes.Equal(msg, buf) {`
`93`	`93`	`t.Errorf("Read want %v: \ngot %v", msg, buf)`
`94`	`94`	`}`
`95`	`95`	`})`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func TestBytePool(t *testing.T) {`
`38`	`38`	`t.Error("result should keep length")`
`39`	`39`	`}`
`40`	`40`
`41`		`- if bytes.Compare(key, result) != 0 {`
	`41`	`+ if !bytes.Equal(key, result) {`
`42`	`42`	`t.Error("item should keep unchanged")`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func TestFixedBytePool(t *testing.T) {`
`38`	`38`	`if len(key) != len(resuItem) {`
`39`	`39`	`t.Error("testItem and resuItem not same len")`
`40`	`40`	`}`
`41`		`- if bytes.Compare(key, resuItem) != 0 {`
	`41`	`+ if !bytes.Equal(key, resuItem) {`
`42`	`42`	`t.Error("testItem, and resuItem not equal")`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func TestCopyWithoutBuffer(t *testing.T) {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`expectBytes := cases[i].data[:written]`
`118`		`- if bytes.Compare(wf.sink.Bytes(), expectBytes) != 0 {`
	`118`	`+ if !bytes.Equal(wf.sink.Bytes(), expectBytes) {`
`119`	`119`	`t.Fatalf("Case %d: written bytes not match.\n", i)`
`120`	`120`	`}`
`121`	`121`	`fmt.Printf("Case %d: written=%d, err=%v, expectWritten=%d, expectErr=%v.\n", i, written, err, expectWritten, expectErr)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func TestAddItem(t *testing.T) {`
`32`	`32`	`if node != 0 {`
`33`	`33`	`t.Errorf("node should be 0 %d", node)`
`34`	`34`	`}`
`35`		`- if bytes.Compare(np.element(0), Item) != 0 {`
	`35`	`+ if !bytes.Equal(np.element(0), Item) {`
`36`	`36`	`t.Error("element is wrong")`
`37`	`37`	`}`
`38`	`38`
`@@ -44,7 +44,7 @@ func TestAddItem(t *testing.T) {`
`44`	`44`	`if node != 1 {`
`45`	`45`	`t.Errorf("node should be 0 %d", node)`
`46`	`46`	`}`
`47`		`- if bytes.Compare(np.element(1), Item) != 0 {`
	`47`	`+ if !bytes.Equal(np.element(1), Item) {`
`48`	`48`	`t.Error("element is wrong")`
`49`	`49`	`}`
`50`	`50`	`if !np.exist(0, Item) {`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func getActualFileInfo(path string) (*MetaInfo, error) {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`// insert start ip and end ip into dict`
`135`		`- if bytes.Compare(startIP, endIP) == 0 {`
	`135`	`+ if bytes.Equal(startIP, endIP) {`
`136`	`136`	`singleIPCounter += 1`
`137`	`137`	`} else {`
`138`	`138`	`pairIPCounter += 1`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ require (`
`15`	`15`	`golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413`
`16`	`16`	`golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553`
`17`	`17`	`golang.org/x/sys v0.0.0-20191210023423-ac6580df4449`
	`18`	`+ golang.org/x/tools v0.0.0-20191210221141-98df12377212 // indirect`
`18`	`19`	`gopkg.in/gcfg.v1 v1.2.3`
`19`	`20`	`gopkg.in/warnings.v0 v0.1.2 // indirect`
`20`	`21`	`)`