nits

Author: patrick-ogrady

cache/lru_cache_test.go

@@ -12,7 +12,13 @@ import (
 func TestLRU(t *testing.T) {
 	cache := &LRU{Size: 1}
 
-	BasicCache(t, cache)
+	TestBasic(t, cache)
+}
+
+func TestLRUEviction(t *testing.T) {
+	cache := &LRU{Size: 2}
+
+	TestEviction(t, cache)
 }
 
 func TestLRUResize(t *testing.T) {

cache/metercacher/meter_cacher.go renamed to cache/metercacher/cache.go

@@ -10,12 +10,12 @@ import (
 
 func TestInterface(t *testing.T) {
 	for _, test := range cache.CacherTests {
-		cache := &cache.LRU{Size: 1}
+		cache := &cache.LRU{Size: test.Size}
 		c, err := New("", prometheus.NewRegistry(), cache)
 		if err != nil {
 			t.Fatal(err)
 		}
 
-		test(t, c)
+		test.Func(t, c)
 	}
 }

cache/metercacher/meter_cacher_test.go renamed to cache/metercacher/cache_test.go

@@ -10,13 +10,17 @@ import (
 )
 
 var (
-	// Tests is a list of all LRU cache tests
-	CacherTests = []func(t *testing.T, c Cacher){
-		BasicCache,
+	// CacherTests is a list of all Cacher tests
+	CacherTests = []struct {
+		Size int
+		Func func(t *testing.T, c Cacher)
+	}{
+		{Size: 1, Func: TestBasic},
+		{Size: 2, Func: TestEviction},
 	}
 )
 
-func BasicCache(t *testing.T, cache Cacher) {
+func TestBasic(t *testing.T, cache Cacher) {
 	id1 := ids.ID{1}
 	if _, found := cache.Get(id1); found {
 		t.Fatalf("Retrieved value when none exists")
@@ -58,9 +62,7 @@ func BasicCache(t *testing.T, cache Cacher) {
 	}
 }
 
-func TestLRUEviction(t *testing.T) {
-	cache := LRU{Size: 2}
-
+func TestEviction(t *testing.T, cache Cacher) {
 	id1 := ids.ID{1}
 	id2 := ids.ID{2}
 	id3 := ids.ID{3}

cache/test_cache.go renamed to cache/test_cacher.go

@@ -361,7 +361,6 @@ func (vm *VMClient) GetBlock(id ids.ID) (snowman.Block, error) {
 	if blk, cached := vm.blks[id]; cached {
 		return blk, nil
 	}
-
 	if blkIntf, cached := vm.decidedBlocks.Get(id); cached {
 		return blkIntf.(*BlockClient), nil
 	}