fix: remove snapshot flag, rely on no-snapshot only

internal/cli/server/config.go

@@ -58,9 +58,6 @@ type Config struct {
 	// GcMode selects the garbage collection mode for the trie
 	GcMode string `hcl:"gc-mode,optional"`
 
-	// Snapshot enables the snapshot database mode
-	Snapshot bool `hcl:"snapshot,optional"`
-
 	// NoSnapshot disbales the snapshot database mode
 	NoSnapshot bool `hcl:"no-snapshot,optional"`
 
@@ -411,7 +408,6 @@ func DefaultConfig() *Config {
 		},
 		SyncMode:   "full",
 		GcMode:     "full",
-		Snapshot:   true,
 		NoSnapshot: false,
 		TxPool: &TxPoolConfig{
 			Locals:       []string{},
@@ -814,7 +810,7 @@ func (c *Config) buildEth(stack *node.Node) (*ethconfig.Config, error) {
 	}
 
 	// snapshot disable check
-	if !c.Snapshot {
+	if c.NoSnapshot {
 		if n.SyncMode == downloader.SnapSync {
 			log.Info("Snap sync requested, enabling --snapshot")
 		} else {
@@ -940,11 +936,6 @@ func (c *Config) Merge(cc ...*Config) error {
 		if elem.P2P.MaxPeers == 0 {
 			c.P2P.MaxPeers = 0
 		}
-
-		// update snapshot db mode
-		if elem.NoSnapshot {
-			c.Snapshot = false
-		}
 	}
 	return nil
 }

internal/cli/server/config_test.go

@@ -23,7 +23,7 @@ func TestConfigDefault(t *testing.T) {
 func TestConfigMerge(t *testing.T) {
 	c0 := &Config{
 		Chain:      "0",
-		Snapshot: true,
+		NoSnapshot: true,
 		Whitelist: map[string]string{
 			"a": "b",
 		},
@@ -54,7 +54,7 @@ func TestConfigMerge(t *testing.T) {
 	}
 	expected := &Config{
 		Chain:      "1",
-		Snapshot: true,
+		NoSnapshot: true,
 		Whitelist: map[string]string{
 			"a": "b",
 			"b": "c",

internal/cli/server/flags.go

@@ -49,14 +49,9 @@ func (c *Command) Flags() *flagset.Flagset {
 		Usage: "Comma separated block number-to-hash mappings to enforce (<number>=<hash>)",
 		Value: &c.cliConfig.Whitelist,
 	})
-	f.BoolFlag(&flagset.BoolFlag{
-		Name:  "snapshot",
-		Usage: `Enables snapshot-database mode (default = enable)`,
-		Value: &c.cliConfig.Snapshot,
-	})
 	f.BoolFlag(&flagset.BoolFlag{
 		Name:  "no-snapshot",
-		Usage: `Disables the snapshot-database mode`,
+		Usage: `Disables the snapshot-database mode (default = false)`,
 		Value: &c.cliConfig.NoSnapshot,
 	})