From 944849201c470f563e21c7d0069864d581db1eef Mon Sep 17 00:00:00 2001
From: shayzluf <thezluf@gmail.com>
Date: Mon, 9 Mar 2020 10:54:06 +0530
Subject: [PATCH] on evict test fix

---
 slasher/cache/span_cache.go   | 5 ++++-
 slasher/db/kv/kv.go           | 3 ++-
 slasher/db/kv/kv_test.go      | 4 ++--
 slasher/db/kv/spanner_test.go | 2 +-
 slasher/node/node.go          | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/slasher/cache/span_cache.go b/slasher/cache/span_cache.go
index 65955fcdeed..4245727b2e5 100644
--- a/slasher/cache/span_cache.go
+++ b/slasher/cache/span_cache.go
@@ -27,7 +27,10 @@ type EpochSpansCache struct {
 }
 
 // NewEpochSpansCache initializes the map and underlying cache.
-func NewEpochSpansCache(onEvicted func(key interface{}, value interface {})) (*EpochSpansCache, error) {
+func NewEpochSpansCache(size int, onEvicted func(key interface{}, value interface{})) (*EpochSpansCache, error) {
+	if size != 0 {
+		epochSpansCacheSize = size
+	}
 	cache, err := lru.NewWithEvict(epochSpansCacheSize, onEvicted)
 	if err != nil {
 		return nil, err
diff --git a/slasher/db/kv/kv.go b/slasher/db/kv/kv.go
index c315fb3096e..87d2b8efd22 100644
--- a/slasher/db/kv/kv.go
+++ b/slasher/db/kv/kv.go
@@ -25,6 +25,7 @@ type Store struct {
 type Config struct {
 	// SpanCacheEnabled uses span cache to detect surround slashing.
 	SpanCacheEnabled bool
+	SpanCacheSize    int
 }
 
 // Close closes the underlying boltdb database.
@@ -85,7 +86,7 @@ func NewKVStore(dirPath string, cfg *Config) (*Store, error) {
 		return nil, err
 	}
 	kv := &Store{db: boltDB, databasePath: datafile, spanCacheEnabled: cfg.SpanCacheEnabled}
-	spanCache, err := cache.NewEpochSpansCache(persistSpanMapsOnEviction(kv))
+	spanCache, err := cache.NewEpochSpansCache(cfg.SpanCacheSize, persistSpanMapsOnEviction(kv))
 	if err != nil {
 		return nil, errors.Wrap(err, "could not create new cache")
 	}
diff --git a/slasher/db/kv/kv_test.go b/slasher/db/kv/kv_test.go
index f0d559edcd6..2f56e141fe8 100644
--- a/slasher/db/kv/kv_test.go
+++ b/slasher/db/kv/kv_test.go
@@ -31,7 +31,7 @@ func setupDB(t testing.TB, ctx *cli.Context) *Store {
 	return db
 }
 
-func setupDBDiffCacheSize(t testing.TB, cacheItems int64, maxCacheSize int64) *Store {
+func setupDBDiffCacheSize(t testing.TB, cacheSize int) *Store {
 	randPath, err := rand.Int(rand.Reader, big.NewInt(1000000))
 	if err != nil {
 		t.Fatalf("Could not generate random file path: %v", err)
@@ -40,7 +40,7 @@ func setupDBDiffCacheSize(t testing.TB, cacheItems int64, maxCacheSize int64) *S
 	if err := os.RemoveAll(p); err != nil {
 		t.Fatalf("Failed to remove directory: %v", err)
 	}
-	cfg := &Config{SpanCacheEnabled: true}
+	cfg := &Config{SpanCacheEnabled: true, SpanCacheSize: cacheSize}
 	newDB, err := NewKVStore(p, cfg)
 	if err != nil {
 		t.Fatalf("Failed to instantiate DB: %v", err)
diff --git a/slasher/db/kv/spanner_test.go b/slasher/db/kv/spanner_test.go
index a87e7dc867e..c87a0663719 100644
--- a/slasher/db/kv/spanner_test.go
+++ b/slasher/db/kv/spanner_test.go
@@ -207,7 +207,7 @@ func TestValidatorSpanMap_DeletesOnCacheSavesToDB(t *testing.T) {
 }
 
 func TestValidatorSpanMap_SaveOnEvict(t *testing.T) {
-	db := setupDBDiffCacheSize(t, 5, 5)
+	db := setupDBDiffCacheSize(t, 5)
 	defer teardownDB(t, db)
 	ctx := context.Background()
 
diff --git a/slasher/node/node.go b/slasher/node/node.go
index 43fcff387e9..ee26e96693e 100644
--- a/slasher/node/node.go
+++ b/slasher/node/node.go
@@ -9,11 +9,11 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/prysmaticlabs/prysm/shared/prometheus"
 	"github.com/prysmaticlabs/prysm/shared"
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/debug"
 	"github.com/prysmaticlabs/prysm/shared/event"
+	"github.com/prysmaticlabs/prysm/shared/prometheus"
 	"github.com/prysmaticlabs/prysm/shared/tracing"
 	"github.com/prysmaticlabs/prysm/slasher/beaconclient"
 	"github.com/prysmaticlabs/prysm/slasher/db"