refactor: rename node/config pkg to node/node

renaynay · Sep 19, 2022 · bea5f08 · bea5f08
1 parent b0aa484
commit bea5f08
Show file tree

Hide file tree

Showing 34 changed files with 201 additions and 201 deletions.
diff --git a/cmd/cel-shed/header.go b/cmd/cel-shed/header.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/celestiaorg/celestia-node/header/store"
 	"github.com/celestiaorg/celestia-node/node"
-	"github.com/celestiaorg/celestia-node/node/config"
+	nodeconf "github.com/celestiaorg/celestia-node/node/node"
 )
 
 func init() {
@@ -31,7 +31,7 @@ Custom store path is not supported yet.`,
 			return fmt.Errorf("not enough arguments")
 		}
 
-		tp := config.ParseType(args[0])
+		tp := nodeconf.ParseType(args[0])
 		if !tp.IsValid() {
 			return fmt.Errorf("invalid node-type")
 		}

diff --git a/cmd/celestia/bridge.go b/cmd/celestia/bridge.go
@@ -4,7 +4,7 @@ import (
 	"github.com/spf13/cobra"
 
 	cmdnode "github.com/celestiaorg/celestia-node/cmd"
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 // NOTE: We should always ensure that the added Flags below are parsed somewhere, like in the PersistentPreRun func on
@@ -41,7 +41,7 @@ var bridgeCmd = &cobra.Command{
 			err error
 		)
 
-		ctx = cmdnode.WithNodeType(ctx, config.Bridge)
+		ctx = cmdnode.WithNodeType(ctx, node.Bridge)
 
 		ctx, err = cmdnode.ParseNodeFlags(ctx, cmd)
 		if err != nil {

diff --git a/cmd/celestia/full.go b/cmd/celestia/full.go
@@ -5,7 +5,7 @@ import (
 	"github.com/spf13/cobra"
 
 	cmdnode "github.com/celestiaorg/celestia-node/cmd"
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 // NOTE: We should always ensure that the added Flags below are parsed somewhere, like in the PersistentPreRun func on
@@ -48,7 +48,7 @@ var fullCmd = &cobra.Command{
 			err error
 		)
 
-		ctx = cmdnode.WithNodeType(ctx, config.Full)
+		ctx = cmdnode.WithNodeType(ctx, node.Full)
 
 		ctx, err = cmdnode.ParseNodeFlags(ctx, cmd)
 		if err != nil {

diff --git a/cmd/celestia/light.go b/cmd/celestia/light.go
@@ -5,7 +5,7 @@ import (
 	"github.com/spf13/cobra"
 
 	cmdnode "github.com/celestiaorg/celestia-node/cmd"
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 // NOTE: We should always ensure that the added Flags below are parsed somewhere, like in the PersistentPreRun func on
@@ -48,7 +48,7 @@ var lightCmd = &cobra.Command{
 			err error
 		)
 
-		ctx = cmdnode.WithNodeType(ctx, config.Light)
+		ctx = cmdnode.WithNodeType(ctx, node.Light)
 
 		ctx, err = cmdnode.ParseNodeFlags(ctx, cmd)
 		if err != nil {

diff --git a/cmd/env.go b/cmd/env.go
@@ -3,12 +3,12 @@ package cmd
 import (
 	"context"
 
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 // NodeType reads the node type from the context.
-func NodeType(ctx context.Context) config.NodeType {
-	return ctx.Value(nodeTypeKey{}).(config.NodeType)
+func NodeType(ctx context.Context) node.Type {
+	return ctx.Value(nodeTypeKey{}).(node.Type)
 }
 
 // StorePath reads the store path from the context.
@@ -17,7 +17,7 @@ func StorePath(ctx context.Context) string {
 }
 
 // WithNodeType sets the node type in the given context.
-func WithNodeType(ctx context.Context, tp config.NodeType) context.Context {
+func WithNodeType(ctx context.Context, tp node.Type) context.Context {
 	return context.WithValue(ctx, nodeTypeKey{}, tp)
 }
 
@@ -27,16 +27,16 @@ func WithStorePath(ctx context.Context, storePath string) context.Context {
 }
 
 // NodeOptions returns config options parsed from Environment(Flags, ENV vars, etc)
-func NodeOptions(ctx context.Context) []config.Option {
-	options, ok := ctx.Value(optionsKey{}).([]config.Option)
+func NodeOptions(ctx context.Context) []node.Option {
+	options, ok := ctx.Value(optionsKey{}).([]node.Option)
 	if !ok {
-		return []config.Option{}
+		return []node.Option{}
 	}
 	return options
 }
 
 // WithNodeOptions add new options to Env.
-func WithNodeOptions(ctx context.Context, opts ...config.Option) context.Context {
+func WithNodeOptions(ctx context.Context, opts ...node.Option) context.Context {
 	options := NodeOptions(ctx)
 	return context.WithValue(ctx, optionsKey{}, append(options, opts...))
 }

diff --git a/cmd/flags_core.go b/cmd/flags_core.go
@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 var (
@@ -63,15 +63,15 @@ func ParseCoreFlags(ctx context.Context, cmd *cobra.Command) (context.Context, e
 	if err != nil {
 		return ctx, err
 	}
-	ctx = WithNodeOptions(ctx, config.WithRemoteCoreIP(ip), config.WithRemoteCorePort(rpc))
+	ctx = WithNodeOptions(ctx, node.WithRemoteCoreIP(ip), node.WithRemoteCorePort(rpc))
 
 	grpc := cmd.Flag(coreGRPCFlag).Value.String()
 	// sanity check gRPC endpoint
 	_, err = strconv.Atoi(grpc)
 	if err != nil {
 		return ctx, err
 	}
-	ctx = WithNodeOptions(ctx, config.WithGRPCPort(grpc))
+	ctx = WithNodeOptions(ctx, node.WithGRPCPort(grpc))
 	return ctx, nil
 }
 

diff --git a/cmd/flags_header.go b/cmd/flags_header.go
@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 var (
@@ -65,7 +65,7 @@ func ParseTrustedPeerFlags(ctx context.Context, cmd *cobra.Command) (context.Con
 		}
 	}
 
-	ctx = WithNodeOptions(ctx, config.WithTrustedPeers(tpeers...))
+	ctx = WithNodeOptions(ctx, node.WithTrustedPeers(tpeers...))
 
 	return ctx, nil
 }
@@ -92,7 +92,7 @@ func ParseTrustedHashFlags(ctx context.Context, cmd *cobra.Command) (context.Con
 			return ctx, fmt.Errorf("cmd: while parsing '%s': %w", headersTrustedHashFlag, err)
 		}
 
-		ctx = WithNodeOptions(ctx, config.WithTrustedHash(hash))
+		ctx = WithNodeOptions(ctx, node.WithTrustedHash(hash))
 	}
 
 	return ctx, nil

diff --git a/cmd/flags_misc.go b/cmd/flags_misc.go
@@ -24,7 +24,7 @@ import (
 	semconv "go.opentelemetry.io/otel/semconv/v1.10.0"
 
 	"github.com/celestiaorg/celestia-node/logs"
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 var (
@@ -224,7 +224,7 @@ func ParseMiscFlags(ctx context.Context, cmd *cobra.Command) (context.Context, e
 		}
 		global.SetMeterProvider(pusher)
 
-		ctx = WithNodeOptions(ctx, config.WithMetrics(true))
+		ctx = WithNodeOptions(ctx, node.WithMetrics(true))
 	}
 
 	return ctx, err

diff --git a/cmd/flags_node.go b/cmd/flags_node.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 	"github.com/celestiaorg/celestia-node/params"
 )
 
@@ -62,12 +62,12 @@ func ParseNodeFlags(ctx context.Context, cmd *cobra.Command) (context.Context, e
 
 	nodeConfig := cmd.Flag(nodeConfigFlag).Value.String()
 	if nodeConfig != "" {
-		cfg, err := config.LoadConfig(nodeConfig)
+		cfg, err := node.LoadConfig(nodeConfig)
 		if err != nil {
 			return ctx, fmt.Errorf("cmd: while parsing '%s': %w", nodeConfigFlag, err)
 		}
 
-		ctx = WithNodeOptions(ctx, config.WithConfig(cfg))
+		ctx = WithNodeOptions(ctx, node.WithConfig(cfg))
 	}
 
 	return ctx, nil

diff --git a/cmd/flags_p2p.go b/cmd/flags_p2p.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 var (
@@ -46,7 +46,7 @@ func ParseP2PFlags(ctx context.Context, cmd *cobra.Command) (context.Context, er
 	}
 
 	if len(mutualPeers) != 0 {
-		ctx = WithNodeOptions(ctx, config.WithMutualPeers(mutualPeers))
+		ctx = WithNodeOptions(ctx, node.WithMutualPeers(mutualPeers))
 	}
 	return ctx, nil
 }
diff --git a/cmd/flags_rpc.go b/cmd/flags_rpc.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 var (
@@ -36,11 +36,11 @@ func RPCFlags() *flag.FlagSet {
 func ParseRPCFlags(ctx context.Context, cmd *cobra.Command) (context.Context, error) {
 	addr := cmd.Flag(addrFlag).Value.String()
 	if addr != "" {
-		ctx = WithNodeOptions(ctx, config.WithRPCAddress(addr))
+		ctx = WithNodeOptions(ctx, node.WithRPCAddress(addr))
 	}
 	port := cmd.Flag(portFlag).Value.String()
 	if port != "" {
-		ctx = WithNodeOptions(ctx, config.WithRPCPort(port))
+		ctx = WithNodeOptions(ctx, node.WithRPCPort(port))
 	}
 	return ctx, nil
 }
diff --git a/node/components.go b/node/components.go
@@ -12,8 +12,8 @@ import (
 	"github.com/celestiaorg/celestia-node/fraud"
 	"github.com/celestiaorg/celestia-node/header"
 	"github.com/celestiaorg/celestia-node/libs/fxutil"
-	"github.com/celestiaorg/celestia-node/node/config"
 	nodecore "github.com/celestiaorg/celestia-node/node/core"
+	"github.com/celestiaorg/celestia-node/node/node"
 	"github.com/celestiaorg/celestia-node/node/p2p"
 	"github.com/celestiaorg/celestia-node/node/rpc"
 	"github.com/celestiaorg/celestia-node/node/services"
@@ -26,9 +26,9 @@ import (
 )
 
 // lightComponents keeps all the components as DI options required to build a Light Node.
-func lightComponents(cfg *config.Config, store Store) fx.Option {
+func lightComponents(cfg *node.Config, store Store) fx.Option {
 	return fx.Options(
-		fx.Supply(config.Light),
+		fx.Supply(node.Light),
 		baseComponents(cfg, store),
 		fx.Provide(services.DASer),
 		fx.Provide(services.HeaderExchangeP2P(cfg.Services)),
@@ -40,9 +40,9 @@ func lightComponents(cfg *config.Config, store Store) fx.Option {
 }
 
 // bridgeComponents keeps all the components as DI options required to build a Bridge Node.
-func bridgeComponents(cfg *config.Config, store Store) fx.Option {
+func bridgeComponents(cfg *node.Config, store Store) fx.Option {
 	return fx.Options(
-		fx.Supply(config.Bridge),
+		fx.Supply(node.Bridge),
 		baseComponents(cfg, store),
 		nodecore.Components(cfg.Core),
 		fx.Supply(header.MakeExtendedHeader),
@@ -61,9 +61,9 @@ func bridgeComponents(cfg *config.Config, store Store) fx.Option {
 }
 
 // fullComponents keeps all the components as DI options required to build a Full Node.
-func fullComponents(cfg *config.Config, store Store) fx.Option {
+func fullComponents(cfg *node.Config, store Store) fx.Option {
 	return fx.Options(
-		fx.Supply(config.Full),
+		fx.Supply(node.Full),
 		baseComponents(cfg, store),
 		fx.Provide(services.DASer),
 		fx.Provide(services.HeaderExchangeP2P(cfg.Services)),
@@ -75,7 +75,7 @@ func fullComponents(cfg *config.Config, store Store) fx.Option {
 }
 
 // baseComponents keeps all the common components shared between different Node types.
-func baseComponents(cfg *config.Config, store Store) fx.Option {
+func baseComponents(cfg *node.Config, store Store) fx.Option {
 	return fx.Options(
 		fx.Provide(params.DefaultNetwork),
 		fx.Provide(params.BootstrappersFor),

diff --git a/node/config_test.go b/node/config_test.go
@@ -7,17 +7,17 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 func TestConfigWriteRead(t *testing.T) {
 	buf := bytes.NewBuffer(nil)
-	in := config.DefaultConfig(config.Bridge)
+	in := node.DefaultConfig(node.Bridge)
 
 	err := in.Encode(buf)
 	require.NoError(t, err)
 
-	var out config.Config
+	var out node.Config
 	err = out.Decode(buf)
 	require.NoError(t, err)
 	assert.EqualValues(t, in, &out)

diff --git a/node/init.go b/node/init.go
@@ -8,14 +8,14 @@ import (
 
 	"github.com/celestiaorg/celestia-node/libs/fslock"
 	"github.com/celestiaorg/celestia-node/libs/utils"
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 	"github.com/celestiaorg/celestia-node/params"
 )
 
 // Init initializes the Node FileSystem Store for the given Node Type 'tp' in the directory under 'path' with
 // default Config. Options are applied over default Config and persisted on disk.
-func Init(path string, tp config.NodeType, options ...config.Option) error {
-	sets := &config.Settings{Cfg: config.DefaultConfig(tp)}
+func Init(path string, tp node.Type, options ...node.Option) error {
+	sets := &node.Settings{Cfg: node.DefaultConfig(tp)}
 	for _, option := range options {
 		option(sets)
 	}
@@ -56,7 +56,7 @@ func Init(path string, tp config.NodeType, options ...config.Option) error {
 
 	cfgPath := configPath(path)
 	if !utils.Exists(cfgPath) {
-		err = config.SaveConfig(cfgPath, sets.Cfg)
+		err = node.SaveConfig(cfgPath, sets.Cfg)
 		if err != nil {
 			return err
 		}
@@ -78,7 +78,7 @@ func IsInit(path string) bool {
 		return false
 	}
 
-	_, err = config.LoadConfig(configPath(path)) // load the Config and implicitly check for its existence
+	_, err = node.LoadConfig(configPath(path)) // load the Config and implicitly check for its existence
 	if err != nil {
 		log.Errorw("loading config", "path", path, "err", err)
 		return false

diff --git a/node/init_test.go b/node/init_test.go
@@ -8,12 +8,12 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/celestiaorg/celestia-node/libs/fslock"
-	"github.com/celestiaorg/celestia-node/node/config"
+	"github.com/celestiaorg/celestia-node/node/node"
 )
 
 func TestInit(t *testing.T) {
 	dir := t.TempDir()
-	nodes := []config.NodeType{config.Light, config.Bridge}
+	nodes := []node.Type{node.Light, node.Bridge}
 
 	for _, node := range nodes {
 		require.NoError(t, Init(dir, node))
@@ -23,7 +23,7 @@ func TestInit(t *testing.T) {
 
 func TestInitErrForInvalidPath(t *testing.T) {
 	path := "/invalid_path"
-	nodes := []config.NodeType{config.Light, config.Bridge}
+	nodes := []node.Type{node.Light, node.Bridge}
 
 	for _, node := range nodes {
 		require.Error(t, Init(path, node))
@@ -53,7 +53,7 @@ func TestInitErrForLockedDir(t *testing.T) {
 	flock, err := fslock.Lock(lockPath(dir))
 	require.NoError(t, err)
 	defer flock.Unlock() //nolint:errcheck
-	nodes := []config.NodeType{config.Light, config.Bridge}
+	nodes := []node.Type{node.Light, node.Bridge}
 
 	for _, node := range nodes {
 		require.Error(t, Init(dir, node))