remove unused arguments and options from node.NewBee (#981)

cmd/bee/cmd/start.go

@@ -99,10 +99,9 @@ Welcome to the Swarm.... Bzzz Bzzzz Bzzzz
 				return err
 			}
 
-			b, err := node.NewBee(c.config.GetString(optionNameP2PAddr), signerConfig.address, *signerConfig.publicKey, signerConfig.keystore, signerConfig.signer, c.config.GetUint64(optionNameNetworkID), logger, signerConfig.libp2pPrivateKey, signerConfig.pssPrivateKey, node.Options{
+			b, err := node.NewBee(c.config.GetString(optionNameP2PAddr), signerConfig.address, *signerConfig.publicKey, signerConfig.signer, c.config.GetUint64(optionNameNetworkID), logger, signerConfig.libp2pPrivateKey, signerConfig.pssPrivateKey, node.Options{
 				DataDir:                c.config.GetString(optionNameDataDir),
 				DBCapacity:             c.config.GetUint64(optionNameDBCapacity),
-				Password:               signerConfig.password,
 				APIAddr:                c.config.GetString(optionNameAPIAddr),
 				DebugAPIAddr:           debugAPIAddr,
 				Addr:                   c.config.GetString(optionNameP2PAddr),
@@ -177,13 +176,11 @@ Welcome to the Swarm.... Bzzz Bzzzz Bzzzz
 }
 
 type signerConfig struct {
-	keystore         keystore.Service
 	signer           crypto.Signer
 	address          swarm.Address
 	publicKey        *ecdsa.PublicKey
 	libp2pPrivateKey *ecdsa.PrivateKey
 	pssPrivateKey    *ecdsa.PrivateKey
-	password         string
 }
 
 func (c *command) configureSigner(cmd *cobra.Command, logger logging.Logger) (config *signerConfig, err error) {
@@ -314,12 +311,10 @@ func (c *command) configureSigner(cmd *cobra.Command, logger logging.Logger) (co
 	logger.Infof("using ethereum address %x", overlayEthAddress)
 
 	return &signerConfig{
-		keystore:         keystore,
 		signer:           signer,
 		address:          address,
 		publicKey:        publicKey,
 		libp2pPrivateKey: libp2pPrivateKey,
 		pssPrivateKey:    pssPrivateKey,
-		password:         password,
 	}, nil
 }

pkg/node/node.go

@@ -26,7 +26,6 @@ import (
 	"github.com/ethersphere/bee/pkg/debugapi"
 	"github.com/ethersphere/bee/pkg/hive"
 	"github.com/ethersphere/bee/pkg/kademlia"
-	"github.com/ethersphere/bee/pkg/keystore"
 	"github.com/ethersphere/bee/pkg/localstore"
 	"github.com/ethersphere/bee/pkg/logging"
 	"github.com/ethersphere/bee/pkg/metrics"
@@ -85,7 +84,6 @@ type Bee struct {
 type Options struct {
 	DataDir                string
 	DBCapacity             uint64
-	Password               string
 	APIAddr                string
 	DebugAPIAddr           string
 	Addr                   string
@@ -112,7 +110,7 @@ type Options struct {
 	SwapEnable             bool
 }
 
-func NewBee(addr string, swarmAddress swarm.Address, publicKey ecdsa.PublicKey, keystore keystore.Service, signer crypto.Signer, networkID uint64, logger logging.Logger, libp2pPrivateKey, pssPrivateKey *ecdsa.PrivateKey, o Options) (*Bee, error) {
+func NewBee(addr string, swarmAddress swarm.Address, publicKey ecdsa.PublicKey, signer crypto.Signer, networkID uint64, logger logging.Logger, libp2pPrivateKey, pssPrivateKey *ecdsa.PrivateKey, o Options) (*Bee, error) {
 	tracer, tracerCloser, err := tracing.NewTracer(&tracing.Options{
 		Enabled:     o.TracingEnabled,
 		Endpoint:    o.TracingEndpoint,