From 95cfa393b4f3686ec6770ad236d2cf0197fb7182 Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Wed, 31 Jan 2024 22:51:51 -0500
Subject: [PATCH] fix: no need for singleton hack, use Replace not Decorate

---
 protocols/s5/s5.go | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/protocols/s5/s5.go b/protocols/s5/s5.go
index 1112b54..f467292 100644
--- a/protocols/s5/s5.go
+++ b/protocols/s5/s5.go
@@ -21,9 +21,8 @@ import (
 )
 
 var (
-	_        s5storage.ProviderStore = (*S5ProviderStore)(nil)
-	_        registry.Protocol       = (*S5Protocol)(nil)
-	instance *S5ProtocolResult
+	_ s5storage.ProviderStore = (*S5ProviderStore)(nil)
+	_ registry.Protocol       = (*S5Protocol)(nil)
 )
 
 type S5Protocol struct {
@@ -54,7 +53,7 @@ type S5ProtocolResult struct {
 var ProtocolModule = fx.Module("s5_api",
 	fx.Provide(NewS5Protocol),
 	fx.Provide(NewS5ProviderStore),
-	fx.Decorate(func(cfg *s5config.NodeConfig) *zap.Logger {
+	fx.Replace(func(cfg *s5config.NodeConfig) *zap.Logger {
 		return cfg.Logger
 	}),
 	s5fx.Module,
@@ -63,9 +62,6 @@ var ProtocolModule = fx.Module("s5_api",
 func NewS5Protocol(
 	params S5ProtocolParams,
 ) (S5ProtocolResult, error) {
-	if instance != nil {
-		return *instance, nil
-	}
 	proto := &S5Protocol{
 		config:   params.Config,
 		logger:   params.Logger,
@@ -78,14 +74,12 @@ func NewS5Protocol(
 		return S5ProtocolResult{}, err
 	}
 
-	instance = &S5ProtocolResult{
+	return S5ProtocolResult{
 		Protocol:     proto,
 		S5Protocol:   proto,
 		S5NodeConfig: cfg,
 		Db:           cfg.DB,
-	}
-
-	return *instance, nil
+	}, nil
 }
 
 func ConfigureS5Protocol(params S5ProtocolParams) (*s5config.NodeConfig, error) {