Use inline factoryParams in ringpop factory

temporalio · Jun 27, 2023 · 81abb35 · 81abb35
1 parent 1e18621
commit 81abb35
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/common/membership/ringpop/factory.go b/common/membership/ringpop/factory.go
@@ -69,14 +69,7 @@ type factoryParams struct {
 
 // factory provides ringpop based membership objects
 type factory struct {
-	Config          *config.Membership
-	ServiceName     primitives.ServiceName
-	ServicePortMap  config.ServicePortMap
-	Logger          log.Logger
-	MetadataManager persistence.ClusterMetadataManager
-	RPCConfig       *config.RPC
-	TLSFactory      encryption.TLSConfigProvider
-	DC              *dynamicconfig.Collection
+	*factoryParams
 
 	channel *tchannel.Channel
 	monitor *monitor
@@ -98,14 +91,7 @@ func newFactory(params factoryParams) (*factory, error) {
 	}
 
 	return &factory{
-		Config:          params.Config,
-		ServiceName:     params.ServiceName,
-		ServicePortMap:  params.ServicePortMap,
-		Logger:          params.Logger,
-		MetadataManager: params.MetadataManager,
-		RPCConfig:       params.RPCConfig,
-		TLSFactory:      params.TLSFactory,
-		DC:              params.DC,
+		factoryParams: &params,
 	}, nil
 }
 

diff --git a/common/membership/ringpop/factory_test.go b/common/membership/ringpop/factory_test.go
@@ -179,11 +179,12 @@ func newTestRingpopFactory(
 	dc *dynamicconfig.Collection,
 ) *factory {
 	return &factory{
-		ServiceName: serviceName,
-		Logger:      logger,
-		RPCConfig:   rpcConfig,
-		TLSFactory:  tlsProvider,
-		DC:          dc,
+		factoryParams: &factoryParams{ServiceName: serviceName,
+			Logger:     logger,
+			RPCConfig:  rpcConfig,
+			TLSFactory: tlsProvider,
+			DC:         dc,
+		},
 	}
 }