diff --git a/app/app.go b/app/app.go index 722d10a0611c..8ac3798ea8b6 100644 --- a/app/app.go +++ b/app/app.go @@ -18,6 +18,8 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/perms" "github.com/ava-labs/avalanchego/utils/ulimit" + + nodeconfig "github.com/ava-labs/avalanchego/config/node" ) const Header = ` _____ .__ .__ @@ -44,7 +46,7 @@ type App interface { ExitCode() (int, error) } -func New(config node.Config) (App, error) { +func New(config nodeconfig.Config) (App, error) { // Set the data directory permissions to be read write. if err := perms.ChmodR(config.DatabaseConfig.Path, true, perms.ReadWriteExecute); err != nil { return nil, fmt.Errorf("failed to restrict the permissions of the database directory with: %w", err) diff --git a/config/config.go b/config/config.go index 37e60da9fc1f..2fea0667e989 100644 --- a/config/config.go +++ b/config/config.go @@ -20,12 +20,12 @@ import ( "github.com/ava-labs/avalanchego/api/server" "github.com/ava-labs/avalanchego/chains" + "github.com/ava-labs/avalanchego/config/node" "github.com/ava-labs/avalanchego/genesis" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/network" "github.com/ava-labs/avalanchego/network/dialer" "github.com/ava-labs/avalanchego/network/throttling" - "github.com/ava-labs/avalanchego/node" "github.com/ava-labs/avalanchego/snow/consensus/snowball" "github.com/ava-labs/avalanchego/snow/networking/benchlist" "github.com/ava-labs/avalanchego/snow/networking/router" diff --git a/node/config.go b/config/node/config.go similarity index 100% rename from node/config.go rename to config/node/config.go diff --git a/node/process_context.go b/config/node/process_context.go similarity index 100% rename from node/process_context.go rename to config/node/process_context.go diff --git a/node/process_context_test.go b/config/node/process_context_test.go similarity index 100% rename from node/process_context_test.go rename to config/node/process_context_test.go diff --git a/node/node.go b/node/node.go index 19dfd899654d..13430c06049c 100644 --- a/node/node.go +++ b/node/node.go @@ -33,6 +33,7 @@ import ( "github.com/ava-labs/avalanchego/api/server" "github.com/ava-labs/avalanchego/chains" "github.com/ava-labs/avalanchego/chains/atomic" + "github.com/ava-labs/avalanchego/config/node" "github.com/ava-labs/avalanchego/database" "github.com/ava-labs/avalanchego/database/leveldb" "github.com/ava-labs/avalanchego/database/memdb" @@ -117,7 +118,7 @@ var ( // New returns an instance of Node func New( - config *Config, + config *node.Config, logFactory logging.Factory, logger logging.Logger, ) (*Node, error) { @@ -356,7 +357,7 @@ type Node struct { APIServer server.Server // This node's configuration - Config *Config + Config *node.Config tracer trace.Tracer @@ -649,7 +650,7 @@ func (n *Node) writeProcessContext() error { n.Log.Info("writing process context", zap.String("path", n.Config.ProcessContextFilePath)) // Write the process context to disk - processContext := &ProcessContext{ + processContext := &node.ProcessContext{ PID: os.Getpid(), URI: n.apiURI, StakingAddress: n.stakingAddress, // Set by network initialization diff --git a/tests/fixture/tmpnet/node_process.go b/tests/fixture/tmpnet/node_process.go index 68381ea00907..2f16ddd19a0d 100644 --- a/tests/fixture/tmpnet/node_process.go +++ b/tests/fixture/tmpnet/node_process.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" "github.com/ava-labs/avalanchego/config" - "github.com/ava-labs/avalanchego/node" + "github.com/ava-labs/avalanchego/config/node" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/perms" )