Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: move node configs to config/node #3600

Merged
merged 6 commits into from
Dec 27, 2024
Merged

refactor: move node configs to config/node #3600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2dbe866
move node configs to config/node
darioush Dec 16, 2024
ce9389d
clean up type aliases
darioush Dec 16, 2024
34f7498
fix app.go
darioush Dec 16, 2024
fbcf4c6
move ProcessContext
darioush Dec 16, 2024
f59baf2
Merge branch 'master' into refactor-node-config
darioush Dec 26, 2024
8a644f4
Merge branch 'master' into refactor-node-config
darioush Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ` _____ .__ .__
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 node/config.go → config/node/config.go
View file
Open in desktop
File renamed without changes.
0 node/process_context.go → config/node/process_context.go
View file
Open in desktop
File renamed without changes.
0 node/process_context_test.go → config/node/process_context_test.go
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -356,7 +357,7 @@ type Node struct {
APIServer server.Server

// This node's configuration
Config *Config
Config *node.Config

tracer trace.Tracer

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/fixture/tmpnet/node_process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading