Merge pull request #143 from ipfs/fix-staticcheck

fix staticcheck

Author: marten-seemann

api.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	gohttp "net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -14,7 +13,7 @@ import (
 	caopts "github.com/ipfs/interface-go-ipfs-core/options"
 	"github.com/mitchellh/go-homedir"
 	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 const (
@@ -34,7 +33,7 @@ var ErrApiNotFound = errors.New("ipfs api address could not be found")
 // https://godoc.org/github.com/ipfs/interface-go-ipfs-core#CoreAPI
 type HttpApi struct {
 	url         string
-	httpcli     gohttp.Client
+	httpcli     http.Client
 	Headers     http.Header
 	applyGlobal func(*requestBuilder)
 }
@@ -85,9 +84,9 @@ func ApiAddr(ipfspath string) (ma.Multiaddr, error) {
 
 // NewApi constructs HttpApi with specified endpoint
 func NewApi(a ma.Multiaddr) (*HttpApi, error) {
-	c := &gohttp.Client{
-		Transport: &gohttp.Transport{
-			Proxy:             gohttp.ProxyFromEnvironment,
+	c := &http.Client{
+		Transport: &http.Transport{
+			Proxy:             http.ProxyFromEnvironment,
 			DisableKeepAlives: true,
 		},
 	}
@@ -96,7 +95,7 @@ func NewApi(a ma.Multiaddr) (*HttpApi, error) {
 }
 
 // NewApiWithClient constructs HttpApi with specified endpoint and custom http client
-func NewApiWithClient(a ma.Multiaddr, c *gohttp.Client) (*HttpApi, error) {
+func NewApiWithClient(a ma.Multiaddr, c *http.Client) (*HttpApi, error) {
 	_, url, err := manet.DialArgs(a)
 	if err != nil {
 		return nil, err
@@ -112,7 +111,7 @@ func NewApiWithClient(a ma.Multiaddr, c *gohttp.Client) (*HttpApi, error) {
 	return NewURLApiWithClient(url, c)
 }
 
-func NewURLApiWithClient(url string, c *gohttp.Client) (*HttpApi, error) {
+func NewURLApiWithClient(url string, c *http.Client) (*HttpApi, error) {
 	api := &HttpApi{
 		url:         url,
 		httpcli:     *c,
@@ -121,7 +120,7 @@ func NewURLApiWithClient(url string, c *gohttp.Client) (*HttpApi, error) {
 	}
 
 	// We don't support redirects.
-	api.httpcli.CheckRedirect = func(_ *gohttp.Request, _ []*gohttp.Request) error {
+	api.httpcli.CheckRedirect = func(_ *http.Request, _ []*http.Request) error {
 		return fmt.Errorf("unexpected redirect")
 	}
 	return api, nil

api_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"io/ioutil"
 	"net/http"
-	gohttp "net/http"
 	"net/http/httptest"
 	"os"
 	"strconv"
@@ -163,9 +162,9 @@ func (NodeProvider) makeAPISwarm(ctx context.Context, fullIdentity bool, n int)
 				return
 			}
 
-			c := &gohttp.Client{
-				Transport: &gohttp.Transport{
-					Proxy:              gohttp.ProxyFromEnvironment,
+			c := &http.Client{
+				Transport: &http.Transport{
+					Proxy:              http.ProxyFromEnvironment,
 					DisableKeepAlives:  true,
 					DisableCompression: true,
 				},

object.go

@@ -10,7 +10,6 @@ import (
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
 	"github.com/ipfs/go-merkledag"
-	dag "github.com/ipfs/go-merkledag"
 	ft "github.com/ipfs/go-unixfs"
 	"github.com/ipfs/interface-go-ipfs-core"
 	caopts "github.com/ipfs/interface-go-ipfs-core/options"
@@ -32,7 +31,7 @@ func (api *ObjectAPI) New(ctx context.Context, opts ...caopts.ObjectNewOption) (
 	var n ipld.Node
 	switch options.Type {
 	case "empty":
-		n = new(dag.ProtoNode)
+		n = new(merkledag.ProtoNode)
 	case "unixfs-dir":
 		n = ft.EmptyDirNode()
 	default:

pin.go

@@ -93,7 +93,7 @@ func (api *PinAPI) IsPinned(ctx context.Context, p path.Path, opts ...caopts.Pin
 	if err != nil {
 		// TODO: This error-type discrimination based on sub-string matching is brittle.
 		// It is addressed by this open issue: https://github.com/ipfs/go-ipfs/issues/7563
-		if strings.Index(err.Error(), "is not pinned") != -1 {
+		if strings.Contains(err.Error(), "is not pinned") {
 			return "", false, nil
 		}
 		return "", false, err