Skip to content

Commit

Permalink
satellite/repair/checker: fix conflict resolution
Browse files Browse the repository at this point in the history
Change-Id: I978bfbdf9e8dcbd742629a8fff500dac5923681d
  • Loading branch information
mniewrzal authored and andriikotko committed May 19, 2023
1 parent de6433c commit 5f61939
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions satellite/repair/checker/observer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"storj.io/storj/satellite"
"storj.io/storj/satellite/metabase"
"storj.io/storj/satellite/metabase/rangedloop"
"storj.io/storj/satellite/metabase/segmentloop"
"storj.io/storj/satellite/repair/checker"
"storj.io/storj/satellite/repair/queue"
)
Expand Down Expand Up @@ -556,10 +557,10 @@ func BenchmarkRemoteSegment(b *testing.B) {
segments, err := planet.Satellites[0].Metabase.DB.TestingAllSegments(ctx)
require.NoError(b, err)

loopSegments := []rangedloop.Segment{}
loopSegments := []segmentloop.Segment{}

for _, segment := range segments {
loopSegments = append(loopSegments, rangedloop.Segment{
loopSegments = append(loopSegments, segmentloop.Segment{
StreamID: segment.StreamID,
Position: segment.Position,
CreatedAt: segment.CreatedAt,
Expand Down

0 comments on commit 5f61939

Please sign in to comment.