go: Avoid coupling of common and registration worker

Author: martintomazic

go/oasis-node/cmd/node/node.go

@@ -13,6 +13,7 @@ import (
 	"github.com/oasisprotocol/oasis-core/go/common/grpc"
 	"github.com/oasisprotocol/oasis-core/go/common/identity"
 	"github.com/oasisprotocol/oasis-core/go/common/logging"
+	"github.com/oasisprotocol/oasis-core/go/common/node"
 	"github.com/oasisprotocol/oasis-core/go/common/persistent"
 	"github.com/oasisprotocol/oasis-core/go/common/version"
 	"github.com/oasisprotocol/oasis-core/go/config"
@@ -193,9 +194,18 @@ func (n *Node) startRuntimeServices(genesisDoc *genesisAPI.Document) error {
 }
 
 func (n *Node) initRuntimeWorkers(genesisDoc *genesisAPI.Document) error {
-	var err error
+	// Parse sentry configuration.
+	var sentryAddresses []node.TLSAddress
+	for _, v := range config.GlobalConfig.Runtime.SentryAddresses {
+		var tlsAddr node.TLSAddress
+		if err := tlsAddr.UnmarshalText([]byte(v)); err != nil {
+			return fmt.Errorf("bad sentry address (%s): %w", v, err)
+		}
+		sentryAddresses = append(sentryAddresses, tlsAddr)
+	}
 
 	// Initialize runtime provisioner.
+	var err error
 	n.Provisioner, err = provisioner.New(n.dataDir, n.commonStore, n.Identity, n.Consensus, genesisDoc)
 	if err != nil {
 		return err
@@ -229,8 +239,6 @@ func (n *Node) initRuntimeWorkers(genesisDoc *genesisAPI.Document) error {
 	}
 	n.svcMgr.Register(n.CommonWorker)
 
-	workerCommonCfg := n.CommonWorker.GetConfig()
-
 	// Initialize the registration worker.
 	n.RegistrationWorker, err = workerRegistration.New(
 		n.Consensus.Beacon(),
@@ -239,7 +247,7 @@ func (n *Node) initRuntimeWorkers(genesisDoc *genesisAPI.Document) error {
 		n.EntityID,
 		n.Consensus,
 		n.P2P,
-		&workerCommonCfg,
+		sentryAddresses,
 		n.commonStore,
 		n, // the delegate to be called on registration shutdown
 		n.RuntimeRegistry,

go/worker/common/config.go

@@ -1,39 +1,23 @@
 package common
 
 import (
-	"fmt"
-
 	"github.com/oasisprotocol/oasis-core/go/common/logging"
-	"github.com/oasisprotocol/oasis-core/go/common/node"
 	"github.com/oasisprotocol/oasis-core/go/config"
 	tpConfig "github.com/oasisprotocol/oasis-core/go/runtime/txpool/config"
 )
 
 // Config contains common worker config.
 type Config struct {
-	SentryAddresses []node.TLSAddress
-
 	TxPool tpConfig.Config
 
 	logger *logging.Logger
 }
 
 // NewConfig creates a new worker config.
 func NewConfig() (*Config, error) {
-	// Parse sentry configuration.
-	var sentryAddresses []node.TLSAddress
-	for _, v := range config.GlobalConfig.Runtime.SentryAddresses {
-		var tlsAddr node.TLSAddress
-		if err := tlsAddr.UnmarshalText([]byte(v)); err != nil {
-			return nil, fmt.Errorf("worker: bad sentry address (%s): %w", v, err)
-		}
-		sentryAddresses = append(sentryAddresses, tlsAddr)
-	}
-
 	cfg := Config{
-		SentryAddresses: sentryAddresses,
-		TxPool:          config.GlobalConfig.Runtime.TxPool,
-		logger:          logging.GetLogger("worker/config"),
+		TxPool: config.GlobalConfig.Runtime.TxPool,
+		logger: logging.GetLogger("worker/config"),
 	}
 
 	return &cfg, nil

go/worker/registration/worker.go

@@ -31,7 +31,6 @@ import (
 	registry "github.com/oasisprotocol/oasis-core/go/registry/api"
 	runtimeRegistry "github.com/oasisprotocol/oasis-core/go/runtime/registry"
 	sentryClient "github.com/oasisprotocol/oasis-core/go/sentry/client"
-	workerCommon "github.com/oasisprotocol/oasis-core/go/worker/common"
 )
 
 const (
@@ -177,8 +176,6 @@ type Worker struct {
 
 	enabled bool
 
-	workerCommonCfg *workerCommon.Config
-
 	store            *persistent.ServiceStore
 	storedDeregister bool
 	deregRequested   uint32
@@ -1010,7 +1007,7 @@ func New(
 	entityID *signature.PublicKey,
 	consensus consensus.Service,
 	p2p p2p.Service,
-	workerCommonCfg *workerCommon.Config,
+	sentryAddresses []node.TLSAddress,
 	store *persistent.CommonStore,
 	delegate Delegate,
 	runtimeRegistry runtimeRegistry.Registry,
@@ -1026,10 +1023,9 @@ func New(
 	}
 
 	w := &Worker{
-		workerCommonCfg: workerCommonCfg,
 		store:           serviceStore,
 		delegate:        delegate,
-		sentryAddresses: workerCommonCfg.SentryAddresses,
+		sentryAddresses: sentryAddresses,
 		runtimeRegistry: runtimeRegistry,
 		beacon:          beacon,
 		registry:        registry,