fix: more lint issues

ironman0x7b2 · ironman0x7b2 · commit 7e3d5dbd0074 · 2025-09-07T21:44:22.000+05:30
diff --git a/.golangci.json b/.golangci.json
@@ -1,41 +1,37 @@
 {
   "version": "2",
   "linters": {
-    "default": "none",
-    "enable": [
-      "canonicalheader",
-      "copyloopvar",
-      "dupword",
-      "errorlint",
-      "exptostd",
-      "fatcontext",
-      "ginkgolinter",
-      "gocritic",
-      "godot",
-      "goheader",
-      "govet",
-      "iface",
-      "importas",
-      "intrange",
-      "mirror",
-      "misspell",
-      "nakedret",
-      "nlreturn",
-      "nolintlint",
-      "perfsprint",
-      "protogetter",
-      "sloglint",
-      "staticcheck",
-      "tagalign",
-      "testifylint",
-      "usestdlibvars",
-      "usetesting",
-      "whitespace",
-      "wsl_v5"
-    ],
+    "default": "all",
     "disable": [
-      "revive"
-    ]
+      "cyclop",
+      "depguard",
+      "err113",
+      "exhaustruct",
+      "forcetypeassert",
+      "funlen",
+      "gocognit",
+      "interfacebloat",
+      "ireturn",
+      "lll",
+      "mnd",
+      "nestif",
+      "nilnil",
+      "noinlineerr",
+      "nonamedreturns",
+      "revive",
+      "tagliatelle",
+      "varnamelen",
+      "wsl"
+    ],
+    "settings": {
+      "gosec": {
+        "excludes": [
+          "G115",
+          "G204",
+          "G404"
+        ]
+      }
+    }
   },
   "run": {
     "timeout": "1m"
diff --git a/api/handshake/requests.go b/api/handshake/requests.go
@@ -13,21 +13,6 @@ type InitHandshakeRequest struct {
 	Body node.InitHandshakeRequestBody
 }
 
-// AccAddr returns the account address from the request body.
-func (r *InitHandshakeRequest) AccAddr() types.AccAddress {
-	addr, err := r.Body.AccAddr()
-	if err != nil {
-		panic(fmt.Errorf("getting account addr from request body: %w", err))
-	}
-
-	return addr
-}
-
-// PeerRequest returns the peer request from request body.
-func (r *InitHandshakeRequest) PeerRequest() []byte {
-	return r.Body.Data
-}
-
 // NewInitHandshakeRequest parses, binds, and verifies the handshake request.
 func NewInitHandshakeRequest(c *gin.Context) (req *InitHandshakeRequest, err error) {
 	req = &InitHandshakeRequest{}
@@ -44,3 +29,18 @@ func NewInitHandshakeRequest(c *gin.Context) (req *InitHandshakeRequest, err err
 
 	return req, nil
 }
+
+// AccAddr returns the account address from the request body.
+func (r *InitHandshakeRequest) AccAddr() types.AccAddress {
+	addr, err := r.Body.AccAddr()
+	if err != nil {
+		panic(fmt.Errorf("getting account addr from request body: %w", err))
+	}
+
+	return addr
+}
+
+// PeerRequest returns the peer request from request body.
+func (r *InitHandshakeRequest) PeerRequest() []byte {
+	return r.Body.Data
+}
diff --git a/cmd/init.go b/cmd/init.go
@@ -43,7 +43,7 @@ is set to overwrite the existing configuration.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// Create the home directory if it doesn't exist
 			homeDir := viper.GetString("home")
-			if err := os.MkdirAll(homeDir, 0755); err != nil {
+			if err := os.MkdirAll(homeDir, 0700); err != nil {
 				return fmt.Errorf("creating application directory %q: %w", homeDir, err)
 			}
 
@@ -100,6 +100,8 @@ is set to overwrite the existing configuration.`,
 					service = wireguard.NewServer("wireguard", homeDir, cfg.Services[types.ServiceTypeWireGuard].(*wireguard.ServerConfig))
 				case types.ServiceTypeOpenVPN:
 					service = openvpn.NewServer("openvpn", homeDir, cfg.Services[types.ServiceTypeOpenVPN].(*openvpn.ServerConfig))
+				case types.ServiceTypeUnspecified:
+					return fmt.Errorf("unsupported service type %q", serviceType)
 				default:
 					return fmt.Errorf("unsupported service type %q", serviceType)
 				}
diff --git a/cmd/start.go b/cmd/start.go
@@ -82,7 +82,7 @@ explicitly starts the node, and handles SIGINT/SIGTERM for graceful shutdown.`,
 
 			// Wait for all goroutines to finish
 			if err := eg.Wait(); err != nil {
-				return err
+				return fmt.Errorf("waiting group: %w", err)
 			}
 
 			return nil
diff --git a/config/config.go b/config/config.go
@@ -19,17 +19,18 @@ var fs embed.FS
 // Config represents the overall configuration structure.
 type Config struct {
 	*config.Config `mapstructure:",squash"`
-	HandshakeDNS   *HandshakeDNSConfig `mapstructure:"handshake_dns"` // HandshakeDNS contains Handshake DNS configuration.
-	Node           *NodeConfig         `mapstructure:"node"`          // Node contains node-specific configuration.
-	QoS            *QoSConfig          `mapstructure:"qos"`           // QoS contains Quality of Service configuration.
+
+	HandshakeDNS *HandshakeDNSConfig `mapstructure:"handshake_dns"` // HandshakeDNS contains Handshake DNS configuration.
+	Node         *NodeConfig         `mapstructure:"node"`          // Node contains node-specific configuration.
+	QoS          *QoSConfig          `mapstructure:"qos"`           // QoS contains Quality of Service configuration.
 
 	Services map[types.ServiceType]types.ServiceConfig `mapstructure:"-"`
 }
 
 // Validate validates the entire configuration.
 func (c *Config) Validate() error {
 	if err := c.Config.Validate(); err != nil {
-		return err
+		return fmt.Errorf("validating base config: %w", err)
 	}
 
 	if err := c.HandshakeDNS.Validate(); err != nil {
diff --git a/core/context.go b/core/context.go
@@ -51,13 +51,6 @@ func NewContext() *Context {
 	}
 }
 
-// checkSealed verifies if the context is sealed to prevent modification.
-func (c *Context) checkSealed() {
-	if c.sealed {
-		panic(errors.New("context is sealed"))
-	}
-}
-
 // Seal marks the context as sealed, preventing further modifications.
 func (c *Context) Seal() *Context {
 	c.sealed = true
@@ -391,3 +384,10 @@ func (c *Context) WithService(service sentinelsdk.ServerService) *Context {
 
 	return c
 }
+
+// checkSealed verifies if the context is sealed to prevent modification.
+func (c *Context) checkSealed() {
+	if c.sealed {
+		panic(errors.New("context is sealed"))
+	}
+}
diff --git a/core/setup.go b/core/setup.go
@@ -68,7 +68,7 @@ func (c *Context) SetupGeoIPClient(_ *config.Config) error {
 }
 
 // SetupAccAddr retrieves the account address for transactions and assigns it to the context.
-func (c *Context) SetupAccAddr(cfg *config.Config) error {
+func (c *Context) SetupAccAddr(ctx context.Context, cfg *config.Config) error {
 	log.Info("Retrieving addr for key", "name", cfg.Tx.GetFromName())
 
 	addr, err := c.Client().KeyAddr(cfg.Tx.GetFromName())
@@ -78,7 +78,7 @@ func (c *Context) SetupAccAddr(cfg *config.Config) error {
 
 	log.Info("Querying account information", "addr", addr)
 
-	acc, err := c.Client().Account(context.TODO(), addr)
+	acc, err := c.Client().Account(ctx, addr)
 	if err != nil {
 		return fmt.Errorf("querying account %q: %w", addr, err)
 	}
@@ -110,6 +110,8 @@ func (c *Context) SetupService(ctx context.Context, cfg *config.Config) error {
 		s = wireguard.NewServer("wireguard", c.HomeDir(), cfg.Services[types.ServiceTypeWireGuard].(*wireguard.ServerConfig))
 	case types.ServiceTypeOpenVPN:
 		s = openvpn.NewServer("openvpn", c.HomeDir(), cfg.Services[types.ServiceTypeOpenVPN].(*openvpn.ServerConfig))
+	case types.ServiceTypeUnspecified:
+		return fmt.Errorf("unsupported service type %q", st)
 	default:
 		return fmt.Errorf("unsupported service type %q", st)
 	}
@@ -126,7 +128,7 @@ func (c *Context) SetupService(ctx context.Context, cfg *config.Config) error {
 	}
 
 	if err := s.Setup(ctx); err != nil {
-		return err
+		return err //nolint:wrapcheck
 	}
 
 	// Assign the service to the context
@@ -173,7 +175,7 @@ func (c *Context) Setup(ctx context.Context, cfg *config.Config) error {
 
 	log.Info("Setting up account addr")
 
-	if err := c.SetupAccAddr(cfg); err != nil {
+	if err := c.SetupAccAddr(ctx, cfg); err != nil {
 		return fmt.Errorf("setting up account addr: %w", err)
 	}
 
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/cosmos/cosmos-sdk v0.47.17
 	github.com/gin-contrib/cors v1.7.6
 	github.com/gin-gonic/gin v1.10.1
-	github.com/sentinel-official/sentinel-go-sdk v1.0.0-rc.6.0.20250907043146-0b770c8bbbff
+	github.com/sentinel-official/sentinel-go-sdk v1.0.0-rc.6.0.20250907161203-2047e5767938
 	github.com/sentinel-official/sentinelhub/v12 v12.0.0-rc.11
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/pflag v1.0.10
diff --git a/go.sum b/go.sum
@@ -512,8 +512,8 @@ github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4 h1:zOjq+1/uLzn/Xo
 github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4/go.mod h1:aI+8yClBW+1uovkHw6HM01YXnYB8vohtB9C83wzx34E=
 github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U=
 github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
-github.com/sentinel-official/sentinel-go-sdk v1.0.0-rc.6.0.20250907043146-0b770c8bbbff h1:pbaC4XanYAOA5zclDa2SfLDX0/jhnt4VwATC2yGT0ns=
-github.com/sentinel-official/sentinel-go-sdk v1.0.0-rc.6.0.20250907043146-0b770c8bbbff/go.mod h1:Gq0+WlluP3Kg495B4mqgrUVn30m0YBGV8Nyu01A5V34=
+github.com/sentinel-official/sentinel-go-sdk v1.0.0-rc.6.0.20250907161203-2047e5767938 h1:mhnValOZZyz1JHvV+PZP+1Un6TEKg/cIbfJXltOqEFM=
+github.com/sentinel-official/sentinel-go-sdk v1.0.0-rc.6.0.20250907161203-2047e5767938/go.mod h1:Gq0+WlluP3Kg495B4mqgrUVn30m0YBGV8Nyu01A5V34=
 github.com/sentinel-official/sentinelhub/v12 v12.0.0-rc.11 h1:B3ylnKZSLP9aDYnS2f98Gx/QTohPuD36tjl75kYJSMs=
 github.com/sentinel-official/sentinelhub/v12 v12.0.0-rc.11/go.mod h1:LXcOAEffAn4Pw58xhoYN9j8ZVuM02OCgPNTI6lkGG2E=
 github.com/shirou/gopsutil/v4 v4.25.8 h1:NnAsw9lN7587WHxjJA9ryDnqhJpFH6A+wagYWTOH970=
diff --git a/main.go b/main.go
@@ -1,11 +1,15 @@
 package main
 
 import (
+	"context"
+	"os"
+
 	"github.com/sentinel-official/sentinel-go-sdk/app"
 
 	"github.com/sentinel-official/sentinel-dvpnx/cmd"
 )
 
 func main() {
-	app.Run(cmd.NewRootCmd)
+	exitCode := app.Run(context.Background(), cmd.NewRootCmd)
+	os.Exit(exitCode)
 }
diff --git a/node/node.go b/node/node.go
@@ -132,7 +132,7 @@ func (n *Node) UpdateDetails(ctx context.Context) error {
 
 // Start initializes the Node's services, scheduler, and API server.
 func (n *Node) Start(parent context.Context) (context.Context, error) {
-	return n.Manager.Start(parent, func(ctx context.Context) error {
+	return n.Manager.Start(parent, func(ctx context.Context) error { //nolint:contextcheck,wrapcheck
 		if err := n.Register(ctx); err != nil {
 			return fmt.Errorf("registering node: %w", err)
 		}
@@ -180,7 +180,7 @@ func (n *Node) Start(parent context.Context) (context.Context, error) {
 		})
 
 		if err := sg.Wait(); err != nil {
-			return err
+			return fmt.Errorf("starting group: %w", err)
 		}
 
 		n.Go(ctx, func() error {
@@ -213,12 +213,12 @@ func (n *Node) Start(parent context.Context) (context.Context, error) {
 
 // Wait blocks until all background goroutines launched exit.
 func (n *Node) Wait(ctx context.Context) error {
-	return n.Manager.Wait(ctx, nil)
+	return n.Manager.Wait(ctx, nil) //nolint:wrapcheck
 }
 
 // Stop gracefully stops the Node's operations.
 func (n *Node) Stop() error {
-	return n.Manager.Stop(func() error {
+	return n.Manager.Stop(func() error { //nolint:wrapcheck
 		sg := &errgroup.Group{}
 
 		sg.Go(func() error {
@@ -252,7 +252,7 @@ func (n *Node) Stop() error {
 		})
 
 		if err := sg.Wait(); err != nil {
-			return err
+			return fmt.Errorf("stopping group: %w", err)
 		}
 
 		return nil
@@ -261,5 +261,5 @@ func (n *Node) Stop() error {
 
 // Cleanup cleans up resources used by the node.
 func (n *Node) Cleanup() error {
-	return n.Manager.Cleanup(nil)
+	return n.Manager.Cleanup(nil) //nolint:wrapcheck
 }
diff --git a/node/setup.go b/node/setup.go
@@ -19,11 +19,6 @@ import (
 	"github.com/sentinel-official/sentinel-dvpnx/workers"
 )
 
-// init sets the Gin mode to ReleaseMode.
-func init() {
-	gin.SetMode(gin.ReleaseMode)
-}
-
 // SetupScheduler sets up the cron scheduler with various workers.
 func (n *Node) SetupScheduler(ctx context.Context, cfg *config.Config) error {
 	// Define the list of cron workers with their respective handlers and intervals.
@@ -42,7 +37,7 @@ func (n *Node) SetupScheduler(ctx context.Context, cfg *config.Config) error {
 
 	s := cron.NewScheduler("scheduler")
 	if err := s.Setup(ctx); err != nil {
-		return err
+		return err //nolint:wrapcheck
 	}
 
 	for _, item := range items {
@@ -63,6 +58,9 @@ func (n *Node) SetupScheduler(ctx context.Context, cfg *config.Config) error {
 
 // SetupServer sets up the API server with necessary middlewares and API routes.
 func (n *Node) SetupServer(ctx context.Context, _ *config.Config) error {
+	// Sets the Gin mode to ReleaseMode.
+	gin.SetMode(gin.ReleaseMode)
+
 	// Define middlewares to be used by the router.
 	items := []gin.HandlerFunc{
 		cors.New(
@@ -91,7 +89,7 @@ func (n *Node) SetupServer(ctx context.Context, _ *config.Config) error {
 		router,
 	)
 	if err := s.Setup(ctx); err != nil {
-		return err
+		return err //nolint:wrapcheck
 	}
 
 	// Attach the API server to the Node instance.
@@ -108,7 +106,7 @@ func (n *Node) SetupContext(ctx context.Context, homeDir string, input io.Reader
 		WithHomeDir(homeDir).
 		WithInput(input)
 	if err := c.Setup(ctx, cfg); err != nil {
-		return err
+		return err //nolint:wrapcheck
 	}
 
 	// Seal the context.
@@ -122,7 +120,7 @@ func (n *Node) SetupContext(ctx context.Context, homeDir string, input io.Reader
 
 // Setup sets up the context, scheduler and API server for the Node.
 func (n *Node) Setup(ctx context.Context, homeDir string, input io.Reader, cfg *config.Config) error {
-	return n.Manager.Setup(ctx, func() error {
+	return n.Manager.Setup(ctx, func() error { //nolint:wrapcheck
 		log.Info("Setting up context")
 
 		if err := n.SetupContext(ctx, homeDir, input, cfg); err != nil {
diff --git a/workers/rpc.go b/workers/rpc.go
@@ -42,10 +42,16 @@ func NewBestRPCAddrWorker(c *core.Context, interval time.Duration) cron.Worker {
 					return
 				}
 
+				// Create the HTTP GET request to the endpoint.
+				req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
+				if err != nil {
+					return
+				}
+
 				// Record start time and perform HTTP GET request.
 				start := time.Now()
 
-				resp, err := client.Get(endpoint)
+				resp, err := client.Do(req)
 				if err != nil {
 					return
 				}

Original file line number	Diff line number	Diff line change
@@ -82,7 +82,7 @@ explicitly starts the node, and handles SIGINT/SIGTERM for graceful shutdown.`,
`82`	`82`
`83`	`83`	`// Wait for all goroutines to finish`
`84`	`84`	`if err := eg.Wait(); err != nil {`
`85`		`- return err`
	`85`	`+ return fmt.Errorf("waiting group: %w", err)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func (c Context) SetupGeoIPClient(_ config.Config) error {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// SetupAccAddr retrieves the account address for transactions and assigns it to the context.`
`71`		`-func (c Context) SetupAccAddr(cfg config.Config) error {`
	`71`	`+func (c Context) SetupAccAddr(ctx context.Context, cfg config.Config) error {`
`72`	`72`	`log.Info("Retrieving addr for key", "name", cfg.Tx.GetFromName())`
`73`	`73`
`74`	`74`	`addr, err := c.Client().KeyAddr(cfg.Tx.GetFromName())`
`@@ -78,7 +78,7 @@ func (c Context) SetupAccAddr(cfg config.Config) error {`
`78`	`78`
`79`	`79`	`log.Info("Querying account information", "addr", addr)`
`80`	`80`
`81`		`- acc, err := c.Client().Account(context.TODO(), addr)`
	`81`	`+ acc, err := c.Client().Account(ctx, addr)`
`82`	`82`	`if err != nil {`
`83`	`83`	`return fmt.Errorf("querying account %q: %w", addr, err)`
`84`	`84`	`}`
`@@ -110,6 +110,8 @@ func (c Context) SetupService(ctx context.Context, cfg config.Config) error {`
`110`	`110`	`s = wireguard.NewServer("wireguard", c.HomeDir(), cfg.Services[types.ServiceTypeWireGuard].(*wireguard.ServerConfig))`
`111`	`111`	`case types.ServiceTypeOpenVPN:`
`112`	`112`	`s = openvpn.NewServer("openvpn", c.HomeDir(), cfg.Services[types.ServiceTypeOpenVPN].(*openvpn.ServerConfig))`
	`113`	`+ case types.ServiceTypeUnspecified:`
	`114`	`+ return fmt.Errorf("unsupported service type %q", st)`
`113`	`115`	`default:`
`114`	`116`	`return fmt.Errorf("unsupported service type %q", st)`
`115`	`117`	`}`
`@@ -126,7 +128,7 @@ func (c Context) SetupService(ctx context.Context, cfg config.Config) error {`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`if err := s.Setup(ctx); err != nil {`
`129`		`- return err`
	`131`	`+ return err //nolint:wrapcheck`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`// Assign the service to the context`
`@@ -173,7 +175,7 @@ func (c Context) Setup(ctx context.Context, cfg config.Config) error {`
`173`	`175`
`174`	`176`	`log.Info("Setting up account addr")`
`175`	`177`
`176`		`- if err := c.SetupAccAddr(cfg); err != nil {`
	`178`	`+ if err := c.SetupAccAddr(ctx, cfg); err != nil {`
`177`	`179`	`return fmt.Errorf("setting up account addr: %w", err)`
`178`	`180`	`}`
`179`	`181`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,15 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "context"`
	`5`	`+ "os"`
	`6`	`+`
`4`	`7`	`"github.com/sentinel-official/sentinel-go-sdk/app"`
`5`	`8`
`6`	`9`	`"github.com/sentinel-official/sentinel-dvpnx/cmd"`
`7`	`10`	`)`
`8`	`11`
`9`	`12`	`func main() {`
`10`		`- app.Run(cmd.NewRootCmd)`
	`13`	`+ exitCode := app.Run(context.Background(), cmd.NewRootCmd)`
	`14`	`+ os.Exit(exitCode)`
`11`	`15`	`}`