From b577dc19bf4023f96a409bfc46d8d6c2068c7621 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@hashicorp.com>
Date: Thu, 29 Oct 2020 15:22:30 -0400
Subject: [PATCH] Merge pull request #9068 from
 hashicorp/restore-test-signature

restore prior signature of test helper so enterprise compiles
---
 agent/consul/usagemetrics/usagemetrics_oss_test.go | 4 ++--
 agent/consul/usagemetrics/usagemetrics_test.go     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/agent/consul/usagemetrics/usagemetrics_oss_test.go b/agent/consul/usagemetrics/usagemetrics_oss_test.go
index ec564e39fe..d4919914ff 100644
--- a/agent/consul/usagemetrics/usagemetrics_oss_test.go
+++ b/agent/consul/usagemetrics/usagemetrics_oss_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
-func newStateStore() *state.Store {
-	return state.NewStateStore(nil)
+func newStateStore() (*state.Store, error) {
+	return state.NewStateStore(nil), nil
 }
 
 func TestUsageReporter_emitServiceUsage_OSS(t *testing.T) {
diff --git a/agent/consul/usagemetrics/usagemetrics_test.go b/agent/consul/usagemetrics/usagemetrics_test.go
index a91fdf151e..cd34581c61 100644
--- a/agent/consul/usagemetrics/usagemetrics_test.go
+++ b/agent/consul/usagemetrics/usagemetrics_test.go
@@ -62,7 +62,8 @@ func TestUsageReporter_Run_Nodes(t *testing.T) {
 			metrics.NewGlobal(cfg, sink)
 
 			mockStateProvider := &mockStateProvider{}
-			s := newStateStore()
+			s, err := newStateStore()
+			require.NoError(t, err)
 			if tcase.modfiyStateStore != nil {
 				tcase.modfiyStateStore(t, s)
 			}