From 04d441b8d66b393d7d38dfb7bfde1db7ccc007d6 Mon Sep 17 00:00:00 2001
From: Eugene <eugene@umputun.com>
Date: Wed, 20 Dec 2017 15:54:02 -0600
Subject: [PATCH] lint: error shadowing and missed return

---
 Dockerfile        |  2 +-
 app/store/bolt.go | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e21a2cf6..ef3ccac4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN cd app && go test -v $(go list -e ./... | grep -v vendor)
 
 RUN gometalinter --disable-all --deadline=300s --vendor --enable=vet --enable=vetshadow --enable=golint \
     --enable=staticcheck --enable=ineffassign --enable=goconst --enable=errcheck --enable=unconvert \
-    --enable=deadcode  --enable=gosimple --enable=gas -tests ./...
+    --enable=deadcode  --enable=gosimple --enable=gas --exclude=test ./...
 
 RUN /script/checkvendor.sh
 RUN mkdir -p target && /script/coverage.sh
diff --git a/app/store/bolt.go b/app/store/bolt.go
index 0285eb6c..8bdeddf1 100644
--- a/app/store/bolt.go
+++ b/app/store/bolt.go
@@ -87,7 +87,7 @@ func (b *BoltDB) Delete(url string, id int64) error {
 		}
 		key := []byte(fmt.Sprintf("%12d", id))
 		if err := bucket.Delete(key); err != nil {
-			errors.Wrapf(err, "can't delete key %s from bucket %s", key, url)
+			return errors.Wrapf(err, "can't delete key %s from bucket %s", key, url)
 		}
 		return nil
 	})
@@ -127,9 +127,9 @@ func (b *BoltDB) Last(locator Locator, max int) (result []Comment, err error) {
 
 		c := lastBk.Cursor()
 		for k, v := c.Last(); k != nil; k, v = c.Prev() {
-			url, id, err := refFromValue(v).parse()
-			if err != nil {
-				return err
+			url, id, e := refFromValue(v).parse()
+			if e != nil {
+				return e
 			}
 			urlBk := tx.Bucket([]byte(url))
 			if urlBk == nil {
@@ -163,7 +163,7 @@ func (b *BoltDB) keyFromValue(id int64) []byte {
 // buckets returns list of buckets, which is list of all commented posts
 func (b BoltDB) buckets() (result []string) {
 
-	b.View(func(tx *bolt.Tx) error {
+	_ = b.View(func(tx *bolt.Tx) error {
 		return tx.ForEach(func(name []byte, _ *bolt.Bucket) error {
 			result = append(result, string(name))
 			return nil