From 10ecaebbf20bf4060d46ed5898b1b6351b10fc2d Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Sun, 28 Jan 2024 03:58:49 -0500 Subject: [PATCH] fix: we need to pass out the protocol in both struct and interface form for fx to read it properly --- protocols/s5.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/protocols/s5.go b/protocols/s5.go index d0d8203..bfb9e0a 100644 --- a/protocols/s5.go +++ b/protocols/s5.go @@ -45,7 +45,8 @@ type S5ProtocolParams struct { type S5ProtocolResult struct { fx.Out - Protocol registry.Protocol `group:"protocol"` + Protocol registry.Protocol `group:"protocol"` + S5Protocol *S5Protocol } var S5ProtocolModule = fx.Module("s5_protocol", @@ -56,14 +57,17 @@ var S5ProtocolModule = fx.Module("s5_protocol", func NewS5Protocol( params S5ProtocolParams, ) (S5ProtocolResult, error) { + proto := &S5Protocol{ + config: params.Config, + logger: params.Logger, + storage: params.Storage, + identity: params.Identity, + providerStore: params.ProviderStore, + } + return S5ProtocolResult{ - Protocol: &S5Protocol{ - config: params.Config, - logger: params.Logger, - storage: params.Storage, - identity: params.Identity, - providerStore: params.ProviderStore, - }, + Protocol: proto, + S5Protocol: proto, }, nil }