fix:optimize SnapTimeout

Qitmeer · Dec 12, 2024 · a9bcdf4 · a9bcdf4
1 parent 828454b
commit a9bcdf4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/config/config.go b/config/config.go
@@ -145,7 +145,7 @@ type Config struct {
 	// TODO: It will soon be discarded in the near future
 	DevSnapSync bool `long:"devsnapsync" description:"Enable snap sync for P2P that only exist in development mode"`
 
-	SnapTimeout int `long:"snaptimeout" description:"During the IBD phase, if no peer node with snap-sync service enabled is found after the timeout (seconds), the node will switch to using the normal sync method."`
+	NoSnapSyncPeerTimeout int `long:"nosnapsyncpeertimeout" description:"During the IBD phase, if no peer node with snap-sync service enabled is found after the timeout (seconds), the node will switch to using the normal sync method."`
 }
 
 func (c *Config) GetMinningAddrs() []types.Address {

diff --git a/p2p/synch/snapsync.go b/p2p/synch/snapsync.go
@@ -103,7 +103,7 @@ func (ps *PeerSync) startSnapSync() bool {
 		return false
 	}
 	if !isValidSnapPeer(bestPeer) {
-		snapPeer, change := ps.getSnapSyncPeer(ps.sy.p2p.Consensus().Config().SnapTimeout)
+		snapPeer, change := ps.getSnapSyncPeer(ps.sy.p2p.Consensus().Config().NoSnapSyncPeerTimeout)
 		if snapPeer == nil {
 			if change {
 				return false

diff --git a/services/common/flags.go b/services/common/flags.go
@@ -652,47 +652,47 @@ var (
 			Destination: &cfg.GenerateNoDevGap,
 		},
 		&cli.IntFlag{
-			Name:        "snaptimeout",
+			Name:        "nosnapsyncpeertimeout",
 			Usage:       "During the IBD phase, if no peer node with snap-sync service enabled is found after the timeout (seconds), the node will switch to using the normal sync method.",
-			Destination: &cfg.SnapTimeout,
+			Destination: &cfg.NoSnapSyncPeerTimeout,
 		},
 	}
 )
 
 func DefaultConfig(homeDir string) *config.Config {
 	cfg := &config.Config{
-		HomeDir:              defaultHomeDir,
-		ConfigFile:           defaultConfigFile,
-		DebugLevel:           defaultLogLevel,
-		DebugPrintOrigins:    defaultDebugPrintOrigins,
-		DataDir:              defaultDataDir,
-		LogDir:               defaultLogDir,
-		DbType:               defaultDbType,
-		RPCKey:               defaultRPCKeyFile,
-		RPCCert:              defaultRPCCertFile,
-		RPCMaxClients:        defaultMaxRPCClients,
-		RPCMaxWebsockets:     defaultMaxRPCWebsockets,
-		RPCMaxConcurrentReqs: defaultMaxRPCConcurrentReqs,
-		Generate:             defaultGenerate,
-		MaxPeers:             defaultMaxPeers,
-		MinTxFee:             defaultMinRelayTxFee,
-		BlockMinSize:         defaultBlockMinSize,
-		BlockMaxSize:         defaultBlockMaxSize,
-		SigCacheMaxSize:      defaultSigCacheMaxSize,
-		Banning:              true,
-		MaxInbound:           defaultMaxInboundPeersPerHost,
-		InvalidTxIndex:       defaultInvalidTxIndex,
-		TxHashIndex:          defaultTxhashIndex,
-		NTP:                  false,
-		MempoolExpiry:        defaultMempoolExpiry,
-		AcceptNonStd:         true,
-		RPCUser:              defaultRPCUser,
-		RPCPass:              defaultRPCPass,
-		ObsoleteHeight:       defaultObsoleteHeight,
-		SubmitNoSynced:       false,
-		DevNextGDB:           true,
-		GBTTimeOut:           defaultGBTTimeout,
-		SnapTimeout:          defaultSnapTimeout,
+		HomeDir:               defaultHomeDir,
+		ConfigFile:            defaultConfigFile,
+		DebugLevel:            defaultLogLevel,
+		DebugPrintOrigins:     defaultDebugPrintOrigins,
+		DataDir:               defaultDataDir,
+		LogDir:                defaultLogDir,
+		DbType:                defaultDbType,
+		RPCKey:                defaultRPCKeyFile,
+		RPCCert:               defaultRPCCertFile,
+		RPCMaxClients:         defaultMaxRPCClients,
+		RPCMaxWebsockets:      defaultMaxRPCWebsockets,
+		RPCMaxConcurrentReqs:  defaultMaxRPCConcurrentReqs,
+		Generate:              defaultGenerate,
+		MaxPeers:              defaultMaxPeers,
+		MinTxFee:              defaultMinRelayTxFee,
+		BlockMinSize:          defaultBlockMinSize,
+		BlockMaxSize:          defaultBlockMaxSize,
+		SigCacheMaxSize:       defaultSigCacheMaxSize,
+		Banning:               true,
+		MaxInbound:            defaultMaxInboundPeersPerHost,
+		InvalidTxIndex:        defaultInvalidTxIndex,
+		TxHashIndex:           defaultTxhashIndex,
+		NTP:                   false,
+		MempoolExpiry:         defaultMempoolExpiry,
+		AcceptNonStd:          true,
+		RPCUser:               defaultRPCUser,
+		RPCPass:               defaultRPCPass,
+		ObsoleteHeight:        defaultObsoleteHeight,
+		SubmitNoSynced:        false,
+		DevNextGDB:            true,
+		GBTTimeOut:            defaultGBTTimeout,
+		NoSnapSyncPeerTimeout: defaultSnapTimeout,
 	}
 	if len(homeDir) > 0 {
 		hd, err := filepath.Abs(homeDir)