go: Avoid coupling of registration and beacon worker

Author: martintomazic

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

@@ -259,7 +259,7 @@ func (n *Node) initRuntimeWorkers(genesisDoc *genesisAPI.Document) error {
 	n.BeaconWorker, err = workerBeacon.New(
 		n.Identity,
 		n.Consensus,
-		n.RegistrationWorker,
+		n.EntityID != nil,
 	)
 	if err != nil {
 		return err

go/worker/beacon/worker.go

@@ -9,7 +9,6 @@ import (
 	"github.com/oasisprotocol/oasis-core/go/common/identity"
 	"github.com/oasisprotocol/oasis-core/go/common/logging"
 	consensus "github.com/oasisprotocol/oasis-core/go/consensus/api"
-	"github.com/oasisprotocol/oasis-core/go/worker/registration"
 )
 
 const workerName = "worker/beacon"
@@ -60,7 +59,7 @@ func (w *Worker) Name() string {
 func New(
 	identity *identity.Identity,
 	consensus consensus.Service,
-	registrationWorker *registration.Worker,
+	enabled bool,
 ) (*Worker, error) {
 	var (
 		err     error
@@ -74,9 +73,8 @@ func New(
 	}
 
 	initLogger := logging.GetLogger(workerName)
-	if registrationWorker.WillNeverRegister() {
-		// Some node configurations never register, and that's ok.
-		initLogger.Info("registration worker disabled, also disabling beacon worker")
+	if !enabled {
+		initLogger.Info("beacon worker disabled")
 		close(w.allQuitCh)
 		return w, nil
 	}

go/worker/registration/worker.go

@@ -1000,12 +1000,9 @@ func (w *Worker) RequestDeregistration() error {
 	return nil
 }
 
-// WillNeverRegister returns true iff the worker will never register.
-func (w *Worker) WillNeverRegister() bool {
-	return !w.enabled
-}
-
 // New constructs a new worker node registration service.
+//
+// Entity ID is optional. If not provided this will be a no-op worker.
 func New(
 	beacon beacon.Backend,
 	registry registry.Backend,
@@ -1078,9 +1075,9 @@ func (w *Worker) Name() string {
 func (w *Worker) Start() error {
 	w.logger.Info("starting node registration service")
 
-	// HACK: This can be ok in certain configurations.
-	if w.WillNeverRegister() {
-		w.logger.Warn("no entity ID configured for this node, registration will NEVER succeed")
+	// TODO: stop abusing no-op workers. Instead worker should never be started
+	// if configuration says so.
+	if !w.enabled {
 		// Make sure the node is stopped on quit and that it can still respond to
 		// shutdown requests from the control api.
 		go func() {