all: use gometalinter.v2, fix new gosimple issues (#15650)

2 files changed, 3 insertions, 3 deletions

diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go
index f58758088..4dce79b77 100644
--- a/accounts/abi/bind/bind.go
+++ b/accounts/abi/bind/bind.go
@@ -129,7 +129,7 @@ func Bind(types []string, abis []string, bytecodes []string, pkg string, lang La
 		return string(code), nil
 	}
 	// For all others just return as is for now
-	return string(buffer.Bytes()), nil
+	return buffer.String(), nil
 }
 
 // bindType is a set of type binders that convert Solidity types to some supported
diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go
index 294908378..1e21aafc0 100644
--- a/accounts/abi/unpack_test.go
+++ b/accounts/abi/unpack_test.go
@@ -368,11 +368,11 @@ func TestUnmarshal(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	} else {
-		if bytes.Compare(p0, p0Exp) != 0 {
+		if !bytes.Equal(p0, p0Exp) {
 			t.Errorf("unexpected value unpacked: want %x, got %x", p0Exp, p0)
 		}
 
-		if bytes.Compare(p1[:], p1Exp) != 0 {
+		if !bytes.Equal(p1[:], p1Exp) {
 			t.Errorf("unexpected value unpacked: want %x, got %x", p1Exp, p1)
 		}
 	}