From e73acfc6e3e6c0dcfbeacca7edc89d5fb3c73c16 Mon Sep 17 00:00:00 2001 From: holisticode Date: Fri, 11 Aug 2023 11:27:44 -0500 Subject: [PATCH 1/4] remove redundant DefaultDataDir call --- cmd/opera/launcher/config.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/opera/launcher/config.go b/cmd/opera/launcher/config.go index 6107efbbc..e4885044f 100644 --- a/cmd/opera/launcher/config.go +++ b/cmd/opera/launcher/config.go @@ -563,7 +563,6 @@ func defaultNodeConfig() node.Config { cfg.HTTPModules = append(cfg.HTTPModules, "eth", "ftm", "dag", "abft", "web3") cfg.WSModules = append(cfg.WSModules, "eth", "ftm", "dag", "abft", "web3") cfg.IPCPath = "opera.ipc" - cfg.DataDir = DefaultDataDir() return cfg } From cc26ff7535a3e9f8a7cd3ef8155d0918be70d11c Mon Sep 17 00:00:00 2001 From: holisticode Date: Mon, 14 Aug 2023 09:03:08 -0500 Subject: [PATCH 2/4] refactored DefaultNodeConfig --- cmd/opera/launcher/config.go | 13 +----------- cmd/opera/launcher/defaults.go | 38 ++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/cmd/opera/launcher/config.go b/cmd/opera/launcher/config.go index e4885044f..dbd96d76c 100644 --- a/cmd/opera/launcher/config.go +++ b/cmd/opera/launcher/config.go @@ -17,7 +17,6 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" "github.com/naoina/toml" "github.com/syndtr/goleveldb/leveldb/opt" "gopkg.in/urfave/cli.v1" @@ -486,7 +485,7 @@ func mayMakeAllConfigs(ctx *cli.Context) (*config, error) { // Defaults (low priority) cacheRatio := cacheScaler(ctx) cfg := config{ - Node: defaultNodeConfig(), + Node: DefaultNodeConfig(), Opera: gossip.DefaultConfig(cacheRatio), Emitter: emitter.DefaultConfig(), TxPool: evmcore.DefaultTxPoolConfig, @@ -556,16 +555,6 @@ func makeAllConfigs(ctx *cli.Context) *config { return cfg } -func defaultNodeConfig() node.Config { - cfg := NodeDefaultConfig - cfg.Name = clientIdentifier - cfg.Version = params.VersionWithCommit(gitCommit, gitDate) - cfg.HTTPModules = append(cfg.HTTPModules, "eth", "ftm", "dag", "abft", "web3") - cfg.WSModules = append(cfg.WSModules, "eth", "ftm", "dag", "abft", "web3") - cfg.IPCPath = "opera.ipc" - return cfg -} - // dumpConfig is the dumpconfig command. func dumpConfig(ctx *cli.Context) error { cfg := makeAllConfigs(ctx) diff --git a/cmd/opera/launcher/defaults.go b/cmd/opera/launcher/defaults.go index 670163d73..05afcbe06 100644 --- a/cmd/opera/launcher/defaults.go +++ b/cmd/opera/launcher/defaults.go @@ -11,6 +11,7 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc" ) @@ -28,22 +29,27 @@ func overrideFlags() { } // NodeDefaultConfig contains reasonable default settings. -var NodeDefaultConfig = node.Config{ - DataDir: DefaultDataDir(), - HTTPPort: DefaultHTTPPort, - HTTPModules: []string{}, - HTTPVirtualHosts: []string{"localhost"}, - HTTPTimeouts: rpc.DefaultHTTPTimeouts, - WSPort: DefaultWSPort, - WSModules: []string{}, - GraphQLVirtualHosts: []string{"localhost"}, - P2P: p2p.Config{ - NoDiscovery: false, // enable discovery v4 by default - DiscoveryV5: true, // enable discovery v5 by default - ListenAddr: fmt.Sprintf(":%d", DefaultP2PPort), - MaxPeers: 50, - NAT: nat.Any(), - }, +func DefaultNodeConfig() node.Config { + return node.Config{ + DataDir: DefaultDataDir(), + HTTPPort: DefaultHTTPPort, + HTTPTimeouts: rpc.DefaultHTTPTimeouts, + HTTPVirtualHosts: []string{"localhost"}, + HTTPModules: []string{"eth", "ftm", "dag", "abft", "web3"}, + WSModules: []string{"eth", "ftm", "dag", "abft", "web3"}, + WSPort: DefaultWSPort, + GraphQLVirtualHosts: []string{"localhost"}, + P2P: p2p.Config{ + NoDiscovery: false, // enable discovery v4 by default + DiscoveryV5: true, // enable discovery v5 by default + ListenAddr: fmt.Sprintf(":%d", DefaultP2PPort), + MaxPeers: 50, + NAT: nat.Any(), + }, + Name: clientIdentifier, + Version: params.VersionWithCommit(gitCommit, gitDate), + IPCPath: "opera.ipc", + } } // DefaultDataDir is the default data directory to use for the databases and other From a46f7819a2355289e92f2c384a6453b3414edede Mon Sep 17 00:00:00 2001 From: holisticode Date: Tue, 15 Aug 2023 09:34:59 -0500 Subject: [PATCH 3/4] godoc compliant comment --- cmd/opera/launcher/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/opera/launcher/defaults.go b/cmd/opera/launcher/defaults.go index 05afcbe06..033116fb7 100644 --- a/cmd/opera/launcher/defaults.go +++ b/cmd/opera/launcher/defaults.go @@ -28,7 +28,7 @@ func overrideFlags() { utils.WSPortFlag.Value = DefaultWSPort } -// NodeDefaultConfig contains reasonable default settings. +// DefaultNodeConfig creates reasonable default configuration settings func DefaultNodeConfig() node.Config { return node.Config{ DataDir: DefaultDataDir(), From 8f04b696003e537e4a6b05198335003c64f9525f Mon Sep 17 00:00:00 2001 From: holisticode Date: Tue, 15 Aug 2023 09:45:25 -0500 Subject: [PATCH 4/4] fix tests --- cmd/opera/launcher/config_custom_test.go | 2 +- cmd/opera/launcher/run_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/opera/launcher/config_custom_test.go b/cmd/opera/launcher/config_custom_test.go index 2db8bfc49..36324ccb5 100644 --- a/cmd/opera/launcher/config_custom_test.go +++ b/cmd/opera/launcher/config_custom_test.go @@ -22,7 +22,7 @@ func TestConfigFile(t *testing.T) { } src := config{ - Node: defaultNodeConfig(), + Node: DefaultNodeConfig(), Opera: gossip.DefaultConfig(cacheRatio), Emitter: emitter.DefaultConfig(), TxPool: evmcore.DefaultTxPoolConfig, diff --git a/cmd/opera/launcher/run_test.go b/cmd/opera/launcher/run_test.go index 0e524801b..35f095626 100644 --- a/cmd/opera/launcher/run_test.go +++ b/cmd/opera/launcher/run_test.go @@ -33,7 +33,7 @@ type testcli struct { } func (tt *testcli) readConfig() { - cfg := defaultNodeConfig() + cfg := DefaultNodeConfig() cfg.DataDir = tt.Datadir addr := common.Address{} // TODO: addr = emitter coinbase tt.Coinbase = strings.ToLower(addr.String())