Incorporate feedback on #36

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

chunks_test.go

@@ -1,8 +1,7 @@
 package tsdb
 
 import (
-	"errors"
+	"github.com/pkg/errors"
-
 	"github.com/prometheus/tsdb/chunks"
 )
 

postings_test.go

@@ -138,7 +138,7 @@ func TestMultiMerge(t *testing.T) {
 	}
 }
 
-func TestMerge(t *testing.T) {
+func TestMergedPostings(t *testing.T) {
 	var cases = []struct {
 		a, b []uint32
 		res  []uint32
@@ -169,7 +169,9 @@ func TestMerge(t *testing.T) {
 		require.Equal(t, c.res, res)
 	}
 
-	t.Run("Seek", func(t *testing.T) {
+}
+
+func TestMergedPostingsSeek(t *testing.T) {
 	var cases = []struct {
 		a, b []uint32
 
@@ -234,7 +236,6 @@ func TestMerge(t *testing.T) {
 	}
 
 	return
-	})
 }
 
 func TestBigEndian(t *testing.T) {

querier_test.go

@@ -261,12 +261,26 @@ func TestBlockQuerier(t *testing.T) {
 		}
 	}
 
-	// Build the querier on data first. Then execute queries on it.
+	type query struct {
-	basedata := [][]struct {
+		dataIdx int
+
+		mint, maxt int64
+		ms         []labels.Matcher
+		exp        SeriesSet
+	}
+
+	cases := struct {
+		data []struct {
+			lset   map[string]string
+			chunks [][]sample
+		}
+
+		queries []query
+	}{
+		data: []struct {
 			lset   map[string]string
 			chunks [][]sample
 		}{
-		{
 			{
 				lset: map[string]string{
 					"a": "a",
@@ -308,15 +322,8 @@ func TestBlockQuerier(t *testing.T) {
 				},
 			},
 		},
-	}
 
-	cases := []struct {
+		queries: []query{
-		dataIdx int
-
-		mint, maxt int64
-		ms         []labels.Matcher
-		exp        SeriesSet
-	}{
 			{
 				dataIdx: 0,
 
@@ -361,12 +368,12 @@ func TestBlockQuerier(t *testing.T) {
 					),
 				}),
 			},
+		},
 	}
 
 Outer:
-	for _, c := range cases {
+	for _, c := range cases.queries {
-		ir, cr := createIdxChkReaders(basedata[c.dataIdx])
+		ir, cr := createIdxChkReaders(cases.data)
-
 		querier := &blockQuerier{
 			index:  ir,
 			chunks: cr,