go/worker: Remove unused variables

Author: martintomazic

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

@@ -219,9 +219,11 @@ func (n *Node) initRuntimeWorkers(genesisDoc *genesisAPI.Document) error {
 	n.svcMgr.Register(n.RuntimeRegistry)
 
 	// Initialize the common worker.
+	commonCfg := workerCommon.Config{
+		TxPool: config.GlobalConfig.Runtime.TxPool,
+	}
 	n.CommonWorker, err = workerCommon.New(
-		n,
-		n.dataDir,
+		commonCfg,
 		n.chainContext,
 		n.Identity,
 		n.Consensus,

go/worker/common/committee/node.go

@@ -15,7 +15,6 @@ import (
 	"github.com/oasisprotocol/oasis-core/go/common/version"
 	"github.com/oasisprotocol/oasis-core/go/config"
 	consensus "github.com/oasisprotocol/oasis-core/go/consensus/api"
-	control "github.com/oasisprotocol/oasis-core/go/control/api"
 	keymanager "github.com/oasisprotocol/oasis-core/go/keymanager/api"
 	cmmetrics "github.com/oasisprotocol/oasis-core/go/oasis-node/cmd/common/metrics"
 	p2pAPI "github.com/oasisprotocol/oasis-core/go/p2p/api"
@@ -56,8 +55,6 @@ type Node struct {
 	Runtime         runtimeRegistry.Runtime
 	RuntimeRegistry runtimeRegistry.Registry
 
-	HostNode control.NodeController
-
 	Identity         *identity.Identity
 	KeyManager       keymanager.Backend
 	KeyManagerClient *KeyManagerClientWrapper
@@ -632,7 +629,6 @@ func (n *Node) handleDispatchInfo() {
 
 func NewNode(
 	chainContext string,
-	hostNode control.NodeController,
 	runtime runtimeRegistry.Runtime,
 	provisioner host.Provisioner,
 	rtRegistry runtimeRegistry.Registry,
@@ -660,7 +656,6 @@ func NewNode(
 
 	n := &Node{
 		ChainContext:    chainContext,
-		HostNode:        hostNode,
 		Runtime:         runtime,
 		RuntimeRegistry: rtRegistry,
 		Identity:        identity,

go/worker/common/config.go

@@ -1,24 +1,10 @@
 package common
 
 import (
-	"github.com/oasisprotocol/oasis-core/go/common/logging"
-	"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 {
 	TxPool tpConfig.Config
-
-	logger *logging.Logger
-}
-
-// NewConfig creates a new worker config.
-func NewConfig() (*Config, error) {
-	cfg := Config{
-		TxPool: config.GlobalConfig.Runtime.TxPool,
-		logger: logging.GetLogger("worker/config"),
-	}
-
-	return &cfg, nil
 }

go/worker/common/worker.go

@@ -1,8 +1,6 @@
 package common
 
 import (
-	"fmt"
-
 	"github.com/oasisprotocol/oasis-core/go/common"
 	"github.com/oasisprotocol/oasis-core/go/common/identity"
 	"github.com/oasisprotocol/oasis-core/go/common/logging"
@@ -22,7 +20,6 @@ type Worker struct {
 	cfg     Config
 
 	HostNode        control.NodeController
-	DataDir         string
 	ChainContext    string
 	Identity        *identity.Identity
 	Consensus       consensus.Service
@@ -131,11 +128,6 @@ func (w *Worker) Initialized() <-chan struct{} {
 	return w.initCh
 }
 
-// GetConfig returns the worker's configuration.
-func (w *Worker) GetConfig() Config {
-	return w.cfg
-}
-
 // GetRuntimes returns a map of configured runtimes.
 func (w *Worker) GetRuntimes() map[common.Namespace]*committee.Node {
 	return w.runtimes
@@ -156,7 +148,6 @@ func (w *Worker) registerRuntime(runtime runtimeRegistry.Runtime) error {
 
 	node, err := committee.NewNode(
 		w.ChainContext,
-		w.HostNode,
 		runtime,
 		w.Provisioner,
 		w.RuntimeRegistry,
@@ -181,8 +172,7 @@ func (w *Worker) registerRuntime(runtime runtimeRegistry.Runtime) error {
 
 // New creates a new worker.
 func New(
-	hostNode control.NodeController,
-	dataDir string,
+	cfg Config,
 	chainContext string,
 	identity *identity.Identity,
 	consensus consensus.Service,
@@ -203,16 +193,9 @@ func New(
 		enabled = true
 	}
 
-	cfg, err := NewConfig()
-	if err != nil {
-		return nil, fmt.Errorf("worker/common: failed to initialize config: %w", err)
-	}
-
 	w := &Worker{
 		enabled:         enabled,
-		cfg:             *cfg,
-		HostNode:        hostNode,
-		DataDir:         dataDir,
+		cfg:             cfg,
 		ChainContext:    chainContext,
 		Identity:        identity,
 		Consensus:       consensus,

go/worker/compute/executor/committee/node.go

@@ -29,7 +29,6 @@ import (
 	"github.com/oasisprotocol/oasis-core/go/runtime/transaction"
 	"github.com/oasisprotocol/oasis-core/go/runtime/txpool"
 	storage "github.com/oasisprotocol/oasis-core/go/storage/api"
-	commonWorker "github.com/oasisprotocol/oasis-core/go/worker/common"
 	"github.com/oasisprotocol/oasis-core/go/worker/common/committee"
 	"github.com/oasisprotocol/oasis-core/go/worker/common/p2p/txsync"
 	"github.com/oasisprotocol/oasis-core/go/worker/registration"
@@ -56,7 +55,6 @@ type Node struct {
 	runtimeTrustSyncCancel context.CancelFunc
 
 	commonNode   *committee.Node
-	commonCfg    commonWorker.Config
 	roleProvider registration.RoleProvider
 
 	committeeTopic string
@@ -1511,7 +1509,6 @@ func (n *Node) roundWorker(ctx context.Context) {
 // NewNode initializes a new executor node.
 func NewNode(
 	commonNode *committee.Node,
-	commonCfg commonWorker.Config,
 	roleProvider registration.RoleProvider,
 ) (*Node, error) {
 	initMetrics()
@@ -1522,7 +1519,6 @@ func NewNode(
 
 	n := &Node{
 		commonNode:       commonNode,
-		commonCfg:        commonCfg,
 		roleProvider:     roleProvider,
 		committeeTopic:   committeeTopic,
 		proposals:        newPendingProposals(),

go/worker/compute/executor/worker.go

@@ -148,7 +148,6 @@ func (w *Worker) registerRuntime(commonNode *committeeCommon.Node) error {
 	// Create committee node for the given runtime.
 	node, err := committee.NewNode(
 		commonNode,
-		w.commonWorker.GetConfig(),
 		rp,
 	)
 	if err != nil {

go/worker/storage/committee/worker.go

@@ -27,7 +27,6 @@ import (
 	storageApi "github.com/oasisprotocol/oasis-core/go/storage/api"
 	"github.com/oasisprotocol/oasis-core/go/storage/mkvs/checkpoint"
 	dbApi "github.com/oasisprotocol/oasis-core/go/storage/mkvs/db/api"
-	workerCommon "github.com/oasisprotocol/oasis-core/go/worker/common"
 	"github.com/oasisprotocol/oasis-core/go/worker/common/committee"
 	"github.com/oasisprotocol/oasis-core/go/worker/registration"
 	"github.com/oasisprotocol/oasis-core/go/worker/storage/api"
@@ -148,8 +147,6 @@ type Worker struct {
 
 	undefinedRound uint64
 
-	workerCommonCfg workerCommon.Config
-
 	checkpointer         checkpoint.Checkpointer
 	checkpointSyncCfg    *CheckpointSyncConfig
 	checkpointSyncForced bool
@@ -181,7 +178,6 @@ func New(
 	commonNode *committee.Node,
 	roleProvider registration.RoleProvider,
 	rpcRoleProvider registration.RoleProvider,
-	workerCommonCfg workerCommon.Config,
 	localStorage storageApi.LocalBackend,
 	checkpointSyncCfg *CheckpointSyncConfig,
 	pruneCfg PruneConfig,
@@ -196,8 +192,6 @@ func New(
 
 		logger: logging.GetLogger("worker/storage/committee").With("runtime_id", commonNode.Runtime.ID()),
 
-		workerCommonCfg: workerCommonCfg,
-
 		localStorage: localStorage,
 
 		checkpointSyncCfg: checkpointSyncCfg,

go/worker/storage/worker.go

@@ -103,7 +103,6 @@ func (w *Worker) registerRuntime(commonNode *committeeCommon.Node) error {
 		commonNode,
 		rp,
 		rpRPC,
-		w.commonWorker.GetConfig(),
 		localStorage,
 		&committee.CheckpointSyncConfig{
 			Disabled:          config.GlobalConfig.Storage.CheckpointSyncDisabled,