From b49dd976b59ecd57142e95634592d2f151395949 Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Mon, 29 Jan 2024 22:31:05 -0500
Subject: [PATCH] fix: bad imports and need to switch to interfaces

---
 node/node.go     |  9 +++++----
 node/services.go | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/node/node.go b/node/node.go
index 536001f..ad03d0f 100644
--- a/node/node.go
+++ b/node/node.go
@@ -6,6 +6,7 @@ import (
 	"git.lumeweb.com/LumeWeb/libs5-go/protocol"
 	"git.lumeweb.com/LumeWeb/libs5-go/protocol/signed"
 	"git.lumeweb.com/LumeWeb/libs5-go/service"
+	_default "git.lumeweb.com/LumeWeb/libs5-go/service/default"
 	bolt "go.etcd.io/bbolt"
 	"go.uber.org/zap"
 )
@@ -79,10 +80,10 @@ func DefaultNode(config *config.NodeConfig) *Node {
 	}
 
 	// Initialize services first
-	p2pService := service.NewP2P(params)
-	registryService := service.NewRegistry(params)
-	httpService := service.NewHTTP(params)
-	storageService := service.NewStorage(params)
+	p2pService := _default.NewP2P(params)
+	registryService := _default.NewRegistry(params)
+	httpService := _default.NewHTTP(params)
+	storageService := _default.NewStorage(params)
 
 	// Aggregate services
 	services := NewServices(ServicesParams{
diff --git a/node/services.go b/node/services.go
index 1bb0763..8b31197 100644
--- a/node/services.go
+++ b/node/services.go
@@ -9,25 +9,25 @@ var (
 )
 
 type ServicesParams struct {
-	P2P      *service.P2PService
-	Registry *service.RegistryService
-	HTTP     *service.HTTPService
-	Storage  *service.StorageService
+	P2P      service.P2PService
+	Registry service.RegistryService
+	HTTP     service.HTTPService
+	Storage  service.StorageService
 }
 
 type ServicesImpl struct {
-	p2p      *service.P2PService
-	registry *service.RegistryService
-	http     *service.HTTPService
-	storage  *service.StorageService
+	p2p      service.P2PService
+	registry service.RegistryService
+	http     service.HTTPService
+	storage  service.StorageService
 	started  bool
 }
 
-func (s *ServicesImpl) HTTP() *service.HTTPService {
+func (s *ServicesImpl) HTTP() service.HTTPService {
 	return s.http
 }
 
-func (s *ServicesImpl) Storage() *service.StorageService {
+func (s *ServicesImpl) Storage() service.StorageService {
 	return s.storage
 }
 
@@ -41,7 +41,7 @@ func (s *ServicesImpl) All() []service.Service {
 	return services
 }
 
-func (s *ServicesImpl) Registry() *service.RegistryService {
+func (s *ServicesImpl) Registry() service.RegistryService {
 	return s.registry
 }
 
@@ -61,7 +61,7 @@ func NewServices(params ServicesParams) service.Services {
 	return sc
 }
 
-func (s *ServicesImpl) P2P() *service.P2PService {
+func (s *ServicesImpl) P2P() service.P2PService {
 	return s.p2p
 }