add golangci-lint

.golangci.yml

@@ -0,0 +1,11 @@
+linters-settings:
+  gocritic:
+    disabled-checks:
+      - ifElseChain
+      - elseif
+
+linters:
+  enable:
+    - gofmt
+    - gocritic
+    - unconvert

.travis.yml

@@ -0,0 +1,16 @@
+language: go
+
+before_install:
+  - go get golang.org/x/lint/golint
+
+script:
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.16.0
+  - golangci-lint run
+  - go vet ./...
+  - golint ./...
+  - go test ./...
+
+go:
+  - 1.10.x
+  - 1.11.x
+  - 1.12.x

README.md

@@ -3,4 +3,6 @@ go-merkle-tree
 
 Go language to build and check keybase's sitewide merkle tree.
 
+[![Travis CI](https://travis-ci.org/keybase/go-merkle-tree.svg?branch=master)](https://travis-ci.org/keybase/go-merkle-tree)
+
 [![GoDoc](https://godoc.org/github.com/keybase/go-merkle-tree?status.svg)](https://godoc.org/github.com/keybase/go-merkle-tree)

config.go

@@ -57,7 +57,7 @@ func NewConfig(h Hasher, m ChildIndex, n ChildIndex, v ValueConstructor) Config
 
 func (c Config) prefixAndIndexAtLevel(level Level, h Hash) (Prefix, ChildIndex) {
 	prfx, ci := bitslice(h, int(c.c), int(level))
-	return Prefix(prfx), ChildIndex(ci)
+	return prfx, ChildIndex(ci)
 }
 func (c Config) prefixAtLevel(level Level, h Hash) Prefix {
 	ret, _ := c.prefixAndIndexAtLevel(level, h)
@@ -70,10 +70,6 @@ func (c Config) PrefixAtLevel(level Level, h Hash) Prefix {
 	return c.prefixAtLevel(level, h)
 }
 
-func div8roundUp(i ChildIndex) ChildIndex {
-	return ((i + 7) >> 3)
-}
-
 func (c Config) formatPrefix(index ChildIndex) Prefix {
 	ret := make([]byte, 4)
 	binary.BigEndian.PutUint32(ret, uint32(index))

example_test.go

@@ -15,30 +15,28 @@ func ExampleTree_Build() {
 	factory := merkleTree.NewTestObjFactory()
 
 	// Make a whole bunch of phony objects in our Object Factory.
-	var objs []merkleTree.KeyValuePair
-	objs = factory.Mproduce(1024)
+	objs := factory.Mproduce(1024)
 
 	// Collect and sort the objects into a "sorted map"
-	var sm *merkleTree.SortedMap
-	sm = merkleTree.NewSortedMapFromList(objs)
+	sm := merkleTree.NewSortedMapFromList(objs)
 
 	// Make a test storage engine
-	var eng merkleTree.StorageEngine
-	eng = merkleTree.NewMemEngine()
+	eng := merkleTree.NewMemEngine()
 
 	// 256 children per node; once there are 512 entries in a leaf,
 	// then split the leaf by adding more parents.
-	var config merkleTree.Config
-	config = merkleTree.NewConfig(merkleTree.SHA512Hasher{}, 256, 512, factory)
+	config := merkleTree.NewConfig(merkleTree.SHA512Hasher{}, 256, 512, factory)
 
 	// Make a new tree object with this engine and these config
 	// values
-	var tree *merkleTree.Tree
-	tree = merkleTree.NewTree(eng, config)
+	tree := merkleTree.NewTree(eng, config)
 
 	// Make an empty Tranaction info for now
 	var txInfo merkleTree.TxInfo
 
 	// Build the tree
-	tree.Build(context.TODO(), sm, txInfo)
+	err := tree.Build(context.TODO(), sm, txInfo)
+	if err != nil {
+		panic(err.Error())
+	}
 }

inode.go

@@ -1,7 +1,5 @@
 package merkleTree
 
-import ()
-
 type childPointerMap struct {
 	tab []Hash
 }

node.go

@@ -2,7 +2,6 @@ package merkleTree
 
 import (
 	"encoding/hex"
-	"encoding/json"
 )
 
 func (n *Node) findChildByIndex(i ChildIndex) (Hash, error) {
@@ -23,11 +22,6 @@ func (n Node) export(h Hasher, prevRoot Hash, level Level) (hash Hash, node Node
 	return hash, n, objExported, err
 }
 
-func dump(i interface{}) string {
-	ret, _ := json.MarshalIndent(i, "", "   ")
-	return string(ret)
-}
-
 // MarshalJSON prints out a hash for debugging purposes. Not recommended for actual
 // JSONing
 func (h Hash) MarshalJSON() ([]byte, error) {

obj_factory_test.go

@@ -3,21 +3,16 @@ package merkleTree
 import (
 	"crypto/rand"
 	"encoding/hex"
-	"fmt"
 )
 
-func genString(l int) string {
-	return hex.EncodeToString(genBinary((l + 2) / 1))[0:l]
-}
-
 func genBinary(l int) []byte {
 	b := make([]byte, l)
-	rand.Read(b)
+	_, _ = rand.Read(b)
 	return b
 }
 
 type testValue struct {
-	_struct bool `codec:",toarray"`
+	_struct bool `codec:",toarray"` //nolint
 	Seqno   int
 	Key     string
 	KeyRaw  []byte
@@ -36,14 +31,6 @@ func NewTestObjFactory() *TestObjFactory {
 	}
 }
 
-func (of TestObjFactory) dumpAll() []KeyValuePair {
-	var ret []KeyValuePair
-	for _, v := range of.objs {
-		ret = append(ret, v)
-	}
-	return ret
-}
-
 // Produce one test object
 func (of *TestObjFactory) Produce() KeyValuePair {
 	key := genBinary(8)
@@ -64,21 +51,6 @@ func (of *TestObjFactory) Mproduce(n int) []KeyValuePair {
 	return ret
 }
 
-func (of *TestObjFactory) modifySome(mod int) {
-	i := 0
-	for _, v := range of.objs {
-		tv, ok := v.Value.(testValue)
-		if !ok {
-			panic(fmt.Sprintf("Got value of wrong type: %T", v))
-		}
-		if (i % mod) == 0 {
-			tv.Seqno *= 2
-			tv.Key += "-yo-dawg"
-		}
-		i++
-	}
-}
-
 func (of *TestObjFactory) Construct() interface{} {
 	return testValue{}
 }

sorted_map.go

@@ -47,10 +47,6 @@ func (s *SortedMap) sort() {
 	sort.Sort(byKey(s.list))
 }
 
-func (s *SortedMap) push(kp KeyValuePair) {
-	s.list = append(s.list, kp)
-}
-
 func (s *SortedMap) exportToNode(h Hasher, prevRoot Hash, level Level) (hash Hash, node Node, objExported []byte, err error) {
 	node.Type = NodeTypeLeaf
 	node.Leafs = s.list

tree.go

@@ -186,12 +186,6 @@ func (t *Tree) Find(ctx context.Context, h Hash) (ret interface{}, root Hash, er
 	return t.findTyped(ctx, h, false)
 }
 
-// findUnsafe shouldn't be used, since it will skip hash comparisons
-// at interior nodes.  It's mainly here for testing.
-func (t *Tree) findUnsafe(ctx context.Context, h Hash) (ret interface{}, root Hash, err error) {
-	return t.findTyped(ctx, h, true)
-}
-
 type step struct {
 	p Prefix
 	i ChildIndex

types.go

@@ -18,7 +18,7 @@ type Prefix []byte
 // Note that though the key is of type `Hash`, it can be a smaller or different
 // hash from the one used for interior nodes.
 type KeyValuePair struct {
-	_struct bool        `codec:",toarray"`
+	_struct bool        `codec:",toarray"` //nolint
 	Key     Hash        `codec:"k"`
 	Value   interface{} `codec:"v"`
 }