Skip to content

Commit bb681e5

Browse files
committed
chore(golangci-lint): enable format, import, and unused presets; disable depguard
Signed-off-by: Chris Gianelloni <[email protected]>
1 parent c4d2b5e commit bb681e5

File tree

19 files changed

+46
-63
lines changed

19 files changed

+46
-63
lines changed

.golangci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ issues:
44
max-issues-per-linter: 0
55
max-same-issues: 0
66
linters:
7+
disable:
8+
- depguard
79
enable:
810
- errcheck
911
- gosimple
@@ -12,9 +14,15 @@ linters:
1214
- staticcheck
1315
- unused
1416
# Defaults above ours below
17+
- copyloopvar
18+
- usestdlibvars
19+
- whitespace
1520
presets:
1621
- bugs
22+
- format
23+
- import
1724
- performance
25+
- unused
1826
#linters-settings:
1927
# errcheck:
2028
# check-type-assertions: true

cmd/cardano-node-api/main.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,18 @@ import (
1919
"fmt"
2020
"log/slog"
2121
"net/http"
22-
"os"
23-
"time"
24-
2522
// #nosec G108
2623
_ "net/http/pprof"
27-
28-
"go.uber.org/automaxprocs/maxprocs"
24+
"os"
25+
"time"
2926

3027
"github.com/blinklabs-io/cardano-node-api/internal/api"
3128
"github.com/blinklabs-io/cardano-node-api/internal/config"
3229
"github.com/blinklabs-io/cardano-node-api/internal/logging"
3330
"github.com/blinklabs-io/cardano-node-api/internal/node"
3431
"github.com/blinklabs-io/cardano-node-api/internal/utxorpc"
3532
"github.com/blinklabs-io/cardano-node-api/internal/version"
33+
"go.uber.org/automaxprocs/maxprocs"
3634
)
3735

3836
var cmdlineFlags struct {

internal/api/api.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ import (
1818
"fmt"
1919
"os"
2020

21+
_ "github.com/blinklabs-io/cardano-node-api/docs" // docs is generated by Swag CLI
2122
"github.com/blinklabs-io/cardano-node-api/internal/config"
2223
"github.com/blinklabs-io/cardano-node-api/internal/logging"
23-
2424
"github.com/gin-gonic/gin"
2525
"github.com/penglongli/gin-metrics/ginmetrics"
26-
27-
_ "github.com/blinklabs-io/cardano-node-api/docs" // docs is generated by Swag CLI
28-
swaggerFiles "github.com/swaggo/files" // swagger embed files
29-
ginSwagger "github.com/swaggo/gin-swagger" // gin-swagger middleware
26+
swaggerFiles "github.com/swaggo/files" // swagger embed files
27+
ginSwagger "github.com/swaggo/gin-swagger" // gin-swagger middleware
3028
)
3129

3230
// @title cardano-node-api

internal/api/chainsync.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ import (
1818
"encoding/hex"
1919
"net/http"
2020

21-
"github.com/blinklabs-io/cardano-node-api/internal/node"
22-
2321
"github.com/blinklabs-io/adder/event"
22+
"github.com/blinklabs-io/cardano-node-api/internal/node"
2423
ocommon "github.com/blinklabs-io/gouroboros/protocol/common"
2524
"github.com/gin-gonic/gin"
2625
"github.com/gorilla/websocket"

internal/api/localstatequery.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ import (
1818
"encoding/hex"
1919
"math"
2020

21+
"github.com/blinklabs-io/cardano-node-api/internal/node"
2122
"github.com/blinklabs-io/gouroboros/ledger"
2223
"github.com/gin-gonic/gin"
23-
24-
"github.com/blinklabs-io/cardano-node-api/internal/node"
2524
)
2625

2726
func configureLocalStateQueryRoutes(apiGroup *gin.RouterGroup) {
@@ -229,8 +228,7 @@ func handleLocalStateQueryTip(c *gin.Context) {
229228
// TODO: fill this in
230229
//
231230
//nolint:unused
232-
type responseLocalStateQueryEraHistory struct {
233-
}
231+
type responseLocalStateQueryEraHistory struct{}
234232

235233
// handleLocalStateQueryEraHistory godoc
236234
//
@@ -278,8 +276,7 @@ func handleLocalStateQueryEraHistory(c *gin.Context) {
278276
// TODO: fill this in
279277
//
280278
//nolint:unused
281-
type responseLocalStateQueryProtocolParams struct {
282-
}
279+
type responseLocalStateQueryProtocolParams struct{}
283280

284281
// handleLocalStateQueryProtocolParams godoc
285282
//
@@ -327,8 +324,7 @@ func handleLocalStateQueryProtocolParams(c *gin.Context) {
327324
// TODO: fill this in
328325
//
329326
//nolint:unused
330-
type responseLocalStateQueryGenesisConfig struct {
331-
}
327+
type responseLocalStateQueryGenesisConfig struct{}
332328

333329
// handleLocalStateQueryGenesisConfig godoc
334330
//

internal/api/localtxmonitor.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ import (
1818
"encoding/hex"
1919
"net/http"
2020

21+
"github.com/blinklabs-io/cardano-node-api/internal/node"
2122
"github.com/blinklabs-io/gouroboros/ledger"
2223
"github.com/gin-gonic/gin"
23-
24-
"github.com/blinklabs-io/cardano-node-api/internal/node"
2524
)
2625

2726
func configureLocalTxMonitorRoutes(apiGroup *gin.RouterGroup) {

internal/api/localtxsubmission.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ import (
1919
"fmt"
2020
"io"
2121

22+
"github.com/blinklabs-io/cardano-node-api/internal/config"
23+
"github.com/blinklabs-io/cardano-node-api/internal/logging"
2224
"github.com/blinklabs-io/gouroboros/protocol/localtxsubmission"
2325
"github.com/blinklabs-io/tx-submit-api/submit"
2426
"github.com/gin-gonic/gin"
25-
26-
"github.com/blinklabs-io/cardano-node-api/internal/config"
27-
"github.com/blinklabs-io/cardano-node-api/internal/logging"
2827
)
2928

3029
func configureLocalTxSubmissionRoutes(apiGroup *gin.RouterGroup) {

internal/logging/logging.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ import (
2222
"github.com/blinklabs-io/cardano-node-api/internal/config"
2323
)
2424

25-
var globalLogger *slog.Logger
26-
var accessLogger *slog.Logger
25+
var (
26+
globalLogger *slog.Logger
27+
accessLogger *slog.Logger
28+
)
2729

2830
// Configure initializes the global logger.
2931
func Configure() {

internal/node/chainsync.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ import (
1818
"errors"
1919
"time"
2020

21-
"github.com/blinklabs-io/cardano-node-api/internal/config"
22-
2321
"github.com/blinklabs-io/adder/event"
2422
input_chainsync "github.com/blinklabs-io/adder/input/chainsync"
23+
"github.com/blinklabs-io/cardano-node-api/internal/config"
2524
"github.com/blinklabs-io/gouroboros/ledger"
2625
"github.com/blinklabs-io/gouroboros/protocol/chainsync"
2726
"github.com/blinklabs-io/gouroboros/protocol/common"
@@ -57,10 +56,10 @@ func buildChainSyncConfig(connCfg ConnectionConfig) chainsync.Config {
5756
}
5857

5958
func chainSyncRollBackwardHandler(
60-
ctx chainsync.CallbackContext,
59+
_ctx chainsync.CallbackContext,
6160
connCfg ConnectionConfig,
6261
point common.Point,
63-
tip chainsync.Tip,
62+
_tip chainsync.Tip,
6463
) error {
6564
if connCfg.ChainSyncEventChan != nil {
6665
evt := event.New(
@@ -75,11 +74,11 @@ func chainSyncRollBackwardHandler(
7574
}
7675

7776
func chainSyncRollForwardHandler(
78-
ctx chainsync.CallbackContext,
77+
_ctx chainsync.CallbackContext,
7978
connCfg ConnectionConfig,
80-
blockType uint,
79+
_blockType uint,
8180
blockData interface{},
82-
tip chainsync.Tip,
81+
_tip chainsync.Tip,
8382
) error {
8483
cfg := config.GetConfig()
8584
if connCfg.ChainSyncEventChan != nil {

internal/node/localstatequery.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ package node
1717
import (
1818
"time"
1919

20-
"github.com/blinklabs-io/gouroboros/protocol/localstatequery"
21-
2220
"github.com/blinklabs-io/cardano-node-api/internal/config"
21+
"github.com/blinklabs-io/gouroboros/protocol/localstatequery"
2322
)
2423

2524
func buildLocalStateQueryConfig() localstatequery.Config {

0 commit comments

Comments
 (0)