From c0cfcc65a3c96dc2abec90e519f92bc165593052 Mon Sep 17 00:00:00 2001
From: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>
Date: Sat, 19 Aug 2023 19:44:22 +0200
Subject: [PATCH] Fixes after rebase

---
 pkg/store/bucket_test.go             | 2 +-
 pkg/store/storepb/testutil/series.go | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/store/bucket_test.go b/pkg/store/bucket_test.go
index 0f5b2768db9..652e27f30fc 100644
--- a/pkg/store/bucket_test.go
+++ b/pkg/store/bucket_test.go
@@ -3229,7 +3229,7 @@ func TestExpandedPostingsRace(t *testing.T) {
 		Random:           rand.New(rand.NewSource(120)),
 		SkipChunks:       true,
 	})
-	blockID := createBlockFromHead(t, tmpDir, head)
+	blockID := storetestutil.CreateBlockFromHead(t, tmpDir, head)
 
 	bucketBlocks := make([]*bucketBlock, 0, blockCount)
 
diff --git a/pkg/store/storepb/testutil/series.go b/pkg/store/storepb/testutil/series.go
index 67b6879b4cf..641751b6ec4 100644
--- a/pkg/store/storepb/testutil/series.go
+++ b/pkg/store/storepb/testutil/series.go
@@ -19,7 +19,6 @@ import (
 	"github.com/efficientgo/core/testutil"
 	"github.com/go-kit/log"
 	"github.com/gogo/protobuf/types"
-	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/oklog/ulid"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/storage"