apply the megacheck code vetting tool for idiomatic go

.codeclimate.yml

@@ -11,6 +11,12 @@ exclude_paths:
 engines:
   fixme:
     enabled: true
+    config:
+      strings:
+      - FIXME
+      - HACK
+      - XXX
+      - BUG
   golint:
     enabled: true
   govet:

Rules.mk

@@ -66,13 +66,6 @@ include $(dir)/Rules.mk
 # -------------------- #
 #     core targets     #
 # -------------------- #
-PACKAGES_NOVENDOR := $(shell go list github.com/ipfs/go-ipfs/... | grep -v /Godeps/)
-
-megacheck:
-	@go get honnef.co/go/tools/cmd/megacheck
-	@for pkg in ${PACKAGES_NOVENDOR}; do megacheck "$$pkg"; done
-
-.PHONY: megacheck
 
 build: $(TGT_BIN)
 .PHONY: build
@@ -149,6 +142,7 @@ help:
 	@echo '  test_go_short'
 	@echo '  test_go_expensive'
 	@echo '  test_go_race'
+	@echo '  test_go_megacheck'	 - Run the `megacheck` vetting tool
 	@echo '  test_sharness_short'
 	@echo '  test_sharness_expensive'
 	@echo '  test_sharness_race'

blocks/blockstore/blockstore.go

@@ -102,10 +102,6 @@ func NewBlockstore(d ds.Batching) Blockstore {
 type blockstore struct {
 	datastore ds.Batching
 
-	lk      sync.RWMutex
-	gcreq   int32
-	gcreqlk sync.Mutex
-
 	rehash bool
 }
 
@@ -246,9 +242,8 @@ func NewGCLocker() GCLocker {
 }
 
 type gclocker struct {
-	lk      sync.RWMutex
-	gcreq   int32
-	gcreqlk sync.Mutex
+	lk    sync.RWMutex
+	gcreq int32
 }
 
 // Unlocker represents an object which can Unlock

cmd/ipfs/main.go

@@ -37,17 +37,12 @@ import (
 // log is the command logger
 var log = logging.Logger("cmd/ipfs")
 
-var (
-	// errUnexpectedApiOutput = errors.New("api returned unexpected output")
-	// errApiVersionMismatch  = errors.New("api version mismatch")
-	errRequestCanceled = errors.New("request canceled")
-)
+var errRequestCanceled = errors.New("request canceled")
 
 const (
 	EnvEnableProfiling = "IPFS_PROF"
 	cpuProfile         = "ipfs.cpuprof"
 	heapProfile        = "ipfs.memprof"
-	// errorFormat        = "ERROR: %v\n\n"
 )
 
 type cmdInvocation struct {

commands/files/multipartfile.go

@@ -10,7 +10,6 @@ import (
 
 const (
 	multipartFormdataType = "multipart/form-data"
-	// multipartMixedType    = "multipart/mixed"
 
 	applicationDirectory = "application/x-directory"
 	applicationSymlink   = "application/symlink"

commands/http/handler.go

@@ -47,12 +47,9 @@ const (
 	extraContentLengthHeader = "X-Content-Length"
 	uaHeader                 = "User-Agent"
 	contentTypeHeader        = "Content-Type"
-	// contentDispHeader        = "Content-Disposition"
-	// transferEncodingHeader   = "Transfer-Encoding"
-	applicationJson        = "application/json"
-	applicationOctetStream = "application/octet-stream"
-	plainText              = "text/plain"
-	// originHeader             = "origin"
+	applicationJson          = "application/json"
+	applicationOctetStream   = "application/octet-stream"
+	plainText                = "text/plain"
 )
 
 var AllowedExposedHeadersArr = []string{streamHeader, channelHeader, extraContentLengthHeader}

core/commands/files/files.go

@@ -664,11 +664,6 @@ stat' on the file or any of its ancestors.
 			return
 		}
 
-		var r io.Reader = input
-		if countfound {
-			r = io.LimitReader(r, int64(count))
-		}
-
 		n, err := io.Copy(wfd, input)
 		if err != nil {
 			res.SetError(err, cmds.ErrNormal)

core/core.go

@@ -74,7 +74,6 @@ import (
 
 const IpnsValidatorTag = "ipns"
 
-// const kSizeBlockstoreWriteCache = 100
 const kReprovideFrequency = time.Hour * 12
 const discoveryConnTimeout = time.Second * 30
 
@@ -84,8 +83,7 @@ type mode int
 
 const (
 	// zero value is not a valid mode, must be explicitly set
-	invalidMode mode = iota
-	localMode
+	localMode mode = iota
 	offlineMode
 	onlineMode
 )

core/corerouting/core.go

@@ -18,12 +18,7 @@ import (
 // default and 2) to avoid a circular dependency (it needs to be referenced in
 // the core if it's going to be the default)
 
-var (
-	// errHostMissing      = errors.New("supernode routing client requires a Host component")
-	// errIdentityMissing  = errors.New("supernode routing server requires a peer ID identity")
-	// errPeerstoreMissing = errors.New("supernode routing server requires a peerstore")
-	errServersMissing = errors.New("supernode routing client requires at least 1 server peer")
-)
+var errServersMissing = errors.New("supernode routing client requires at least 1 server peer")
 
 // SupernodeServer returns a configuration for a routing server that stores
 // routing records to the provided datastore. Only routing records are store in

exchange/bitswap/bitswap.go

@@ -37,9 +37,8 @@ const (
 	// TODO: if a 'non-nice' strategy is implemented, consider increasing this value
 	maxProvidersPerRequest = 3
 	providerRequestTimeout = time.Second * 10
-	// hasBlockTimeout        = time.Second * 15
-	provideTimeout       = time.Second * 15
-	sizeBatchRequestChan = 32
+	provideTimeout         = time.Second * 15
+	sizeBatchRequestChan   = 32
 	// kMaxPriority is the max priority as defined by the bitswap protocol
 	kMaxPriority = math.MaxInt32
 )

exchange/bitswap/bitswap_test.go

@@ -601,14 +601,14 @@ func TestBitswapLedgerTwoWay(t *testing.T) {
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
-	blk, err := instances[1].Exchange.GetBlock(ctx, blocks[0].Cid())
+	_, err = instances[1].Exchange.GetBlock(ctx, blocks[0].Cid())
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	ctx, cancel = context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
-	blk, err = instances[0].Exchange.GetBlock(ctx, blocks[1].Cid())
+	blk, err := instances[0].Exchange.GetBlock(ctx, blocks[1].Cid())
 	if err != nil {
 		t.Fatal(err)
 	}

exchange/bitswap/decision/ledger.go

@@ -27,9 +27,6 @@ type ledger struct {
 	// Accounting tracks bytes sent and recieved.
 	Accounting debtRatio
 
-	// firstExchnage is the time of the first data exchange.
-	firstExchange time.Time
-
 	// lastExchange is the time of the last data exchange.
 	lastExchange time.Time
 

exchange/bitswap/testutils.go

@@ -88,8 +88,6 @@ func (i *Instance) SetBlockstoreLatency(t time.Duration) time.Duration {
 // just a much better idea.
 func Session(ctx context.Context, net tn.Network, p testutil.Identity) Instance {
 	bsdelay := delay.Fixed(0)
-	// const bloomSize = 512
-	// const writeCacheElems = 100
 
 	adapter := net.Adapter(p)
 	dstore := ds_sync.MutexWrap(datastore2.WithDelay(ds.NewMapDatastore(), bsdelay))

exchange/bitswap/wantmanager.go

@@ -55,16 +55,6 @@ func NewWantManager(ctx context.Context, network bsnet.BitSwapNetwork) *WantMana
 	}
 }
 
-/*type msgPair struct {
-	to  peer.ID
-	msg bsmsg.BitSwapMessage
-}
-
-type cancellation struct {
-	who peer.ID
-	blk *cid.Cid
-}*/
-
 type msgQueue struct {
 	p peer.ID
 

fuse/node/mount_unix.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"strings"
-	"time"
 
 	core "github.com/ipfs/go-ipfs/core"
 	ipns "github.com/ipfs/go-ipfs/fuse/ipns"
@@ -18,10 +17,6 @@ import (
 
 var log = logging.Logger("node")
 
-// amount of time to wait for mount errors
-// TODO is this non-deterministic?
-const mountTimeout = time.Second
-
 // fuseNoDirectory used to check the returning fuse error
 const fuseNoDirectory = "fusermount: failed to access mountpoint"
 

fuse/readonly/readonly_unix.go

@@ -85,7 +85,6 @@ func (*Root) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
 type Node struct {
 	Ipfs   *core.IpfsNode
 	Nd     *mdag.ProtoNode
-	fd     *uio.DagReader
 	cached *ftpb.Data
 }
 

importer/balanced/balanced_test.go

@@ -12,7 +12,6 @@ import (
 	h "github.com/ipfs/go-ipfs/importer/helpers"
 	dag "github.com/ipfs/go-ipfs/merkledag"
 	mdtest "github.com/ipfs/go-ipfs/merkledag/test"
-	pin "github.com/ipfs/go-ipfs/pin"
 	uio "github.com/ipfs/go-ipfs/unixfs/io"
 
 	"context"
@@ -124,11 +123,6 @@ func dagrArrComp(t *testing.T, r io.Reader, should []byte) {
 	}
 }
 
-type dagservAndPinner struct {
-	ds dag.DAGService
-	mp pin.Pinner
-}
-
 func TestIndirectBlocks(t *testing.T) {
 	ds := mdtest.Mock()
 	dag, buf := getTestDag(t, ds, 1024*1024, 512)

importer/helpers/helpers.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 
-	chunk "github.com/ipfs/go-ipfs/importer/chunk"
 	dag "github.com/ipfs/go-ipfs/merkledag"
 	pi "github.com/ipfs/go-ipfs/thirdparty/posinfo"
 	ft "github.com/ipfs/go-ipfs/unixfs"
@@ -18,7 +17,6 @@ import (
 var BlockSizeLimit = 1048576 // 1 MB
 
 // rough estimates on expected sizes
-var roughDataBlockSize = chunk.DefaultBlockSize
 var roughLinkBlockSize = 1 << 13 // 8KB
 var roughLinkSize = 34 + 8 + 5   // sha256 multihash + size + no name + protobuf framing
 

importer/trickle/trickle_test.go

@@ -13,7 +13,6 @@ import (
 	h "github.com/ipfs/go-ipfs/importer/helpers"
 	merkledag "github.com/ipfs/go-ipfs/merkledag"
 	mdtest "github.com/ipfs/go-ipfs/merkledag/test"
-	pin "github.com/ipfs/go-ipfs/pin"
 	ft "github.com/ipfs/go-ipfs/unixfs"
 	uio "github.com/ipfs/go-ipfs/unixfs/io"
 
@@ -125,11 +124,6 @@ func arrComp(a, b []byte) error {
 	return nil
 }
 
-type dagservAndPinner struct {
-	ds merkledag.DAGService
-	mp pin.Pinner
-}
-
 func TestIndirectBlocks(t *testing.T) {
 	splitter := chunk.SizeSplitterGen(512)
 	nbytes := 1024 * 1024
@@ -565,31 +559,3 @@ func TestAppendSingleBytesToEmpty(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
-func printDag(nd *merkledag.ProtoNode, ds merkledag.DAGService, indent int) {
-	pbd, err := ft.FromBytes(nd.Data())
-	if err != nil {
-		panic(err)
-	}
-
-	for i := 0; i < indent; i++ {
-		fmt.Print(" ")
-	}
-	fmt.Printf("{size = %d, type = %s, nc = %d", pbd.GetFilesize(), pbd.GetType().String(), len(pbd.GetBlocksizes()))
-	if len(nd.Links()) > 0 {
-		fmt.Println()
-	}
-	for _, lnk := range nd.Links() {
-		child, err := lnk.GetNode(context.Background(), ds)
-		if err != nil {
-			panic(err)
-		}
-		printDag(child.(*merkledag.ProtoNode), ds, indent+1)
-	}
-	if len(nd.Links()) > 0 {
-		for i := 0; i < indent; i++ {
-			fmt.Print(" ")
-		}
-	}
-	fmt.Println("}")
-}

mk/golang.mk

@@ -13,6 +13,7 @@ CHECK_GO :=
 go-pkg-name=$(shell go list $(go-tags) github.com/ipfs/go-ipfs/$(1))
 go-main-name=$(notdir $(call go-pkg-name,$(1)))$(?exe)
 go-curr-pkg-tgt=$(d)/$(call go-main-name,$(d))
+go-pkgs-novendor=$(shell go list github.com/ipfs/go-ipfs/... | grep -v /Godeps/)
 
 go-tags=$(if $(GOTAGS), -tags="$(call join-with,$(space),$(GOTAGS))")
 go-flags-with-tags=$(GOFLAGS)$(go-tags)
@@ -39,6 +40,11 @@ test_go_fmt:
 .PHONY: test_go_fmt
 TEST_GO += test_go_fmt
 
+test_go_megacheck:
+	@go get honnef.co/go/tools/cmd/megacheck
+	@for pkg in $(go-pkgs-novendor); do megacheck "$$pkg"; done
+.PHONY: megacheck
+
 test_go: $(TEST_GO)
 
 check_go_version:

namesys/publisher.go

@@ -160,17 +160,11 @@ func PutRecordToRouting(ctx context.Context, k ci.PrivKey, value path.Path, seqn
 		errs <- PublishPublicKey(ctx, r, namekey, k.GetPublic())
 	}()
 
-	err = waitOnErrChan(ctx, errs)
-	if err != nil {
-		return err
-	}
-
-	err = waitOnErrChan(ctx, errs)
-	if err != nil {
+	if err := waitOnErrChan(ctx, errs); err != nil {
 		return err
 	}
 
-	return nil
+	return waitOnErrChan(ctx, errs)
 }
 
 func waitOnErrChan(ctx context.Context, errs chan error) error {
@@ -340,12 +334,7 @@ func InitializeKeyspace(ctx context.Context, ds dag.DAGService, pub Publisher, p
 		return err
 	}
 
-	err = pub.Publish(ctx, key, path.FromCid(nodek))
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return pub.Publish(ctx, key, path.FromCid(nodek))
 }
 
 func IpnsKeysForID(id peer.ID) (name, ipns string) {

repo/config/supernode.go

@@ -20,13 +20,6 @@ var DefaultSNRServers = []string{
 	"/ip4/178.62.61.185/tcp/4002/ipfs/QmVw6fGNqBixZE4bewRLT2VXX7fAHUHs8JyidDiJ1P7RUN",
 }
 
-func initSNRConfig() (*SupernodeClientConfig, error) {
-	// TODO perform validation
-	return &SupernodeClientConfig{
-		Servers: DefaultSNRServers,
-	}, nil
-}
-
 func (gcr *SupernodeClientConfig) ServerIPFSAddrs() ([]ipfsaddr.IPFSAddr, error) {
 	var addrs []ipfsaddr.IPFSAddr
 	for _, server := range gcr.Servers {