From 0ee96599f18da12a89589553a6c23d2feffbe8f6 Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Mon, 29 Jan 2024 21:03:10 -0500
Subject: [PATCH] refactoring: more refactoring to break import cycles

---
 service/storage.go           | 8 +++-----
 storage/provider/provider.go | 7 +++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/service/storage.go b/service/storage.go
index 48df0c3..2f3533a 100644
--- a/service/storage.go
+++ b/service/storage.go
@@ -216,11 +216,9 @@ func (s *StorageService) DownloadBytesByHash(hash *encoding.Multihash) ([]byte,
 			types.StorageLocationTypeFull,
 			types.StorageLocationTypeFile,
 		},
-		ServiceParams: ServiceParams{
-			Logger: s.logger,
-			Config: s.config,
-			Db:     s.db,
-		},
+		Logger: s.logger,
+		Config: s.config,
+		Db:     s.db,
 	})
 	err := dlUriProvider.Start()
 	if err != nil {
diff --git a/storage/provider/provider.go b/storage/provider/provider.go
index e27e11c..7556b33 100644
--- a/storage/provider/provider.go
+++ b/storage/provider/provider.go
@@ -3,10 +3,11 @@ package provider
 import (
 	"bytes"
 	"fmt"
+	"git.lumeweb.com/LumeWeb/libs5-go/config"
 	"git.lumeweb.com/LumeWeb/libs5-go/encoding"
-	"git.lumeweb.com/LumeWeb/libs5-go/service"
 	"git.lumeweb.com/LumeWeb/libs5-go/storage"
 	"git.lumeweb.com/LumeWeb/libs5-go/types"
+	bolt "go.etcd.io/bbolt"
 	"go.uber.org/zap"
 	"sync"
 	"time"
@@ -195,5 +196,7 @@ type StorageLocationProviderParams struct {
 	Services      storage.StorageLocationProviderServices
 	Hash          *encoding.Multihash
 	LocationTypes []types.StorageLocationType
-	service.ServiceParams
+	Logger        *zap.Logger
+	Config        *config.NodeConfig
+	Db            *bolt.DB
 }