batch 2 of fixes

.golangci.yml

@@ -74,6 +74,7 @@ issues:
         - errcheck
         - dupl
         - gosec
+        - gocritic
     - path-except: _test\.go
       linters:
         - forbidigo

cmd/stakercli/daemon/daemoncommands.go

@@ -240,7 +240,7 @@ var withdrawableTransactionsCmd = cli.Command{
 
 func checkHealth(ctx *cli.Context) error {
 	daemonAddress := ctx.String(stakingDaemonAddressFlag)
-	client, err := dc.NewStakerServiceJsonRPCClient(daemonAddress)
+	client, err := dc.NewStakerServiceJSONRPCClient(daemonAddress)
 	if err != nil {
 		return err
 	}
@@ -260,7 +260,7 @@ func checkHealth(ctx *cli.Context) error {
 
 func listOutputs(ctx *cli.Context) error {
 	daemonAddress := ctx.String(stakingDaemonAddressFlag)
-	client, err := dc.NewStakerServiceJsonRPCClient(daemonAddress)
+	client, err := dc.NewStakerServiceJSONRPCClient(daemonAddress)
 	if err != nil {
 		return err
 	}
@@ -280,7 +280,7 @@ func listOutputs(ctx *cli.Context) error {
 
 func babylonFinalityProviders(ctx *cli.Context) error {
 	daemonAddress := ctx.String(stakingDaemonAddressFlag)
-	client, err := dc.NewStakerServiceJsonRPCClient(daemonAddress)
+	client, err := dc.NewStakerServiceJSONRPCClient(daemonAddress)
 	if err != nil {
 		return err
 	}
@@ -312,7 +312,7 @@ func babylonFinalityProviders(ctx *cli.Context) error {
 
 func stake(ctx *cli.Context) error {
 	daemonAddress := ctx.String(stakingDaemonAddressFlag)
-	client, err := dc.NewStakerServiceJsonRPCClient(daemonAddress)
+	client, err := dc.NewStakerServiceJSONRPCClient(daemonAddress)
 	if err != nil {
 		return err
 	}
@@ -337,7 +337,7 @@ func stake(ctx *cli.Context) error {
 
 func unstake(ctx *cli.Context) error {
 	daemonAddress := ctx.String(stakingDaemonAddressFlag)
-	client, err := dc.NewStakerServiceJsonRPCClient(daemonAddress)
+	client, err := dc.NewStakerServiceJSONRPCClient(daemonAddress)
 	if err != nil {
 		return err
 	}
@@ -358,7 +358,7 @@ func unstake(ctx *cli.Context) error {
 
 func unbond(ctx *cli.Context) error {
 	daemonAddress := ctx.String(stakingDaemonAddressFlag)
-	client, err := dc.NewStakerServiceJsonRPCClient(daemonAddress)
+	client, err := dc.NewStakerServiceJSONRPCClient(daemonAddress)
 	if err != nil {
 		return err
 	}
@@ -379,7 +379,7 @@ func unbond(ctx *cli.Context) error {
 
 func stakingDetails(ctx *cli.Context) error {
 	daemonAddress := ctx.String(stakingDaemonAddressFlag)
-	client, err := dc.NewStakerServiceJsonRPCClient(daemonAddress)
+	client, err := dc.NewStakerServiceJSONRPCClient(daemonAddress)
 	if err != nil {
 		return err
 	}
@@ -400,7 +400,7 @@ func stakingDetails(ctx *cli.Context) error {
 
 func listStakingTransactions(ctx *cli.Context) error {
 	daemonAddress := ctx.String(stakingDaemonAddressFlag)
-	client, err := dc.NewStakerServiceJsonRPCClient(daemonAddress)
+	client, err := dc.NewStakerServiceJSONRPCClient(daemonAddress)
 	if err != nil {
 		return err
 	}
@@ -432,7 +432,7 @@ func listStakingTransactions(ctx *cli.Context) error {
 
 func withdrawableTransactions(ctx *cli.Context) error {
 	daemonAddress := ctx.String(stakingDaemonAddressFlag)
-	client, err := dc.NewStakerServiceJsonRPCClient(daemonAddress)
+	client, err := dc.NewStakerServiceJSONRPCClient(daemonAddress)
 	if err != nil {
 		return err
 	}

cmd/stakercli/transaction/transactions_test.go

@@ -164,7 +164,7 @@ func genSchnorPubKeyHex(t *testing.T) string {
 	return hex.EncodeToString(schnorr.SerializePubKey(btcPub))
 }
 
-func appRunWithOutput(r *rand.Rand, t *testing.T, app *cli.App, arguments []string) (output string) {
+func appRunWithOutput(r *rand.Rand, t *testing.T, app *cli.App, arguments []string) string {
 	outPut := filepath.Join(t.TempDir(), fmt.Sprintf("%s-out.txt", datagen.GenRandomHexStr(r, 10)))
 	outPutFile, err := os.Create(outPut)
 	require.NoError(t, err)

cmd/stakerd/main.go

@@ -60,7 +60,7 @@ func main() {
 		defer pprof.StopCPUProfile()
 	}
 
-	dbBackend, err := scfg.GetDbBackend(cfg.DBConfig)
+	dbBackend, err := scfg.GetDBBackend(cfg.DBConfig)
 
 	if err != nil {
 		err = fmt.Errorf("failed to load db backend: %w", err)

itest/e2e_test.go

@@ -147,7 +147,7 @@ type TestManager struct {
 	MinerAddr        btcutil.Address
 	wg               *sync.WaitGroup
 	serviceAddress   string
-	StakerClient     *dc.StakerServiceJsonRPCClient
+	StakerClient     *dc.StakerServiceJSONRPCClient
 	CovenantPrivKeys []*btcec.PrivateKey
 	BitcoindHandler  *BitcoindTestHandler
 	TestRpcClient    *rpcclient.Client
@@ -298,7 +298,7 @@ func StartManager(
 	require.NoError(t, err)
 	cfg.DBConfig.DBPath = dbTempDir
 
-	dbbackend, err := stakercfg.GetDbBackend(cfg.DBConfig)
+	dbbackend, err := stakercfg.GetDBBackend(cfg.DBConfig)
 	require.NoError(t, err)
 
 	m := metrics.NewStakerMetrics()
@@ -346,7 +346,7 @@ func StartManager(
 	// Wait for the server to start
 	time.Sleep(3 * time.Second)
 
-	stakerClient, err := dc.NewStakerServiceJsonRPCClient("tcp://" + addressString)
+	stakerClient, err := dc.NewStakerServiceJSONRPCClient("tcp://" + addressString)
 	require.NoError(t, err)
 
 	return &TestManager{
@@ -398,7 +398,7 @@ func (tm *TestManager) RestartAppWithAction(t *testing.T, ctx context.Context, c
 	logger.SetLevel(logrus.DebugLevel)
 	logger.Out = os.Stdout
 
-	dbbackend, err := stakercfg.GetDbBackend(tm.Config.DBConfig)
+	dbbackend, err := stakercfg.GetDBBackend(tm.Config.DBConfig)
 	require.NoError(t, err)
 	m := metrics.NewStakerMetrics()
 	stakerApp, err := staker.NewStakerAppFromConfig(tm.Config, logger, zapLogger, dbbackend, m)
@@ -426,7 +426,7 @@ func (tm *TestManager) RestartAppWithAction(t *testing.T, ctx context.Context, c
 	tm.wg = &wg
 	tm.Db = dbbackend
 	tm.Sa = stakerApp
-	stakerClient, err := dc.NewStakerServiceJsonRPCClient("tcp://" + tm.serviceAddress)
+	stakerClient, err := dc.NewStakerServiceJSONRPCClient("tcp://" + tm.serviceAddress)
 	require.NoError(t, err)
 	tm.StakerClient = stakerClient
 }
@@ -1757,7 +1757,7 @@ func TestBitcoindWalletRpcApi(t *testing.T) {
 	scfg.ActiveNetParams = chaincfg.RegressionNetParams
 
 	// Create wallet controller the same way as in staker program
-	wc, err := walletcontroller.NewRpcWalletController(&scfg)
+	wc, err := walletcontroller.NewRPCWalletController(&scfg)
 	require.NoError(t, err)
 
 	outputs, err := wc.ListOutputs(true)
@@ -1825,7 +1825,7 @@ func TestBitcoindWalletBip322Signing(t *testing.T) {
 	segwitAddress, err := c.GetNewAddress("")
 	require.NoError(t, err)
 
-	controller, err := walletcontroller.NewRpcWalletController(cfg)
+	controller, err := walletcontroller.NewRPCWalletController(cfg)
 	require.NoError(t, err)
 
 	err = controller.UnlockWallet(30)

staker/stakerapp.go

@@ -144,7 +144,7 @@ func NewStakerAppFromConfig(
 ) (*StakerApp, error) {
 	// TODO: If we want to support multiple wallet types, this is most probably the place to decide
 	// on concrete implementation
-	walletClient, err := walletcontroller.NewRpcWalletController(config)
+	walletClient, err := walletcontroller.NewRPCWalletController(config)
 	if err != nil {
 		return nil, err
 	}

stakercfg/config.go

@@ -91,7 +91,7 @@ func DefaultWalletRPCConfig() WalletRPCConfig {
 	}
 }
 
-type JsonRpcServerConfig struct {
+type JSONRPCServerConfig struct {
 	RawRPCListeners []string `long:"rpclisten" description:"Add an interface/port/socket to listen for RPC connections"`
 }
 
@@ -166,7 +166,7 @@ type Config struct {
 
 	MetricsConfig *MetricsConfig `group:"metricsconfig" namespace:"metricsconfig"`
 
-	JsonRPCServerConfig *JsonRpcServerConfig
+	JSONRPCServerConfig *JSONRPCServerConfig
 
 	ActiveNetParams chaincfg.Params
 
@@ -337,6 +337,8 @@ func LoadConfig() (*Config, *logrus.Logger, *zap.Logger, error) {
 // ValidateConfig check the given configuration to be sane. This makes sure no
 // illegal values or combination of values are set. All file system paths are
 // normalized. The cleaned up config is returned on success.
+//
+//nolint:gocyclo
 func ValidateConfig(cfg Config) (*Config, error) {
 	// If the provided stakerd directory is not the default, we'll modify the
 	// path to all of the files and directories that will live within it.
@@ -491,10 +493,10 @@ func ValidateConfig(cfg Config) (*Config, error) {
 
 	// At least one RPCListener is required. So listen on localhost per
 	// default.
-	if len(cfg.JsonRPCServerConfig.RawRPCListeners) == 0 {
+	if len(cfg.JSONRPCServerConfig.RawRPCListeners) == 0 {
 		addr := fmt.Sprintf("localhost:%d", DefaultRPCPort)
-		cfg.JsonRPCServerConfig.RawRPCListeners = append(
-			cfg.JsonRPCServerConfig.RawRPCListeners, addr,
+		cfg.JSONRPCServerConfig.RawRPCListeners = append(
+			cfg.JSONRPCServerConfig.RawRPCListeners, addr,
 		)
 	}
 
@@ -507,7 +509,7 @@ func ValidateConfig(cfg Config) (*Config, error) {
 	// Add default port to all RPC listener addresses if needed and remove
 	// duplicate addresses.
 	cfg.RPCListeners, err = lncfg.NormalizeAddresses(
-		cfg.JsonRPCServerConfig.RawRPCListeners, strconv.Itoa(DefaultRPCPort),
+		cfg.JSONRPCServerConfig.RawRPCListeners, strconv.Itoa(DefaultRPCPort),
 		net.ResolveTCPAddr,
 	)
 

stakercfg/dbcfg.go

@@ -62,7 +62,7 @@ func DBConfigToBoltBackenCondfig(db *DBConfig) kvdb.BoltBackendConfig {
 	}
 }
 
-func GetDbBackend(cfg *DBConfig) (kvdb.Backend, error) {
+func GetDBBackend(cfg *DBConfig) (kvdb.Backend, error) {
 	boltConfig := DBConfigToBoltBackenCondfig(cfg)
 	return kvdb.GetBoltBackend(&boltConfig)
 }

stakercfg/utils.go

@@ -13,7 +13,6 @@ func ReadCertFile(rawCert string, certFilePath string) ([]byte, error) {
 			return nil, err
 		}
 		return rpcCert, nil
-
 	}
 	certFile, err := os.Open(certFilePath)
 	if err != nil {

stakerdb/errors.go

@@ -3,8 +3,8 @@ package stakerdb
 import "errors"
 
 var (
-	// ErrCorruptedTransactionsDb For some reason, db on disk representation have changed
-	ErrCorruptedTransactionsDb = errors.New("transactions db is corrupted")
+	// ErrCorruptedTransactionsDB For some reason, db on disk representation have changed
+	ErrCorruptedTransactionsDB = errors.New("transactions db is corrupted")
 
 	// ErrTransactionNotFound The transaction we try update is not found in db
 	ErrTransactionNotFound = errors.New("transaction not found")

stakerdb/paginator.go

@@ -25,7 +25,6 @@ type paginator struct {
 // in pages.
 func newPaginator(c kvdb.RCursor, reversed bool,
 	indexOffset, totalItems uint64) paginator {
-
 	return paginator{
 		cursor:      c,
 		reversed:    reversed,