Lint

Signed-off-by: Matthias Geihs <[email protected]>

Author: matthiasgeihs

.golangci.yml

@@ -24,6 +24,8 @@ linters:
     - wsl # Formatting disabled for now.
     - gochecknoinits # We use init functions.
     - gci # We have our own import order.
+    - goerr113 # We do not strictly require static errors.
+    - promlinter # Disabled because unstable.
 
     # These could be enabled in the future:
     - ifshort # we often don't use `if err := …` for readability.

channel/persistence/test/channel.go

@@ -54,7 +54,8 @@ func NewRandomChannel(
 	user channel.Index,
 	peers []wire.Address,
 	parent *Channel,
-	rng *rand.Rand) (c *Channel) {
+	rng *rand.Rand,
+) (c *Channel) {
 	accs, parts := wtest.NewRandomAccounts(rng, len(peers))
 	params := ctest.NewRandomParams(rng, ctest.WithParts(parts...))
 	csm, err := channel.NewStateMachine(accs[0], *params)

channel/persistence/test/persistrestorer.go

@@ -57,7 +57,8 @@ func NewPersistRestorer(t *testing.T) *PersistRestorer {
 
 // ChannelCreated fully persists all of the source's data.
 func (pr *PersistRestorer) ChannelCreated(
-	_ context.Context, source channel.Source, peers []wire.Address, parent *channel.ID) error {
+	_ context.Context, source channel.Source, peers []wire.Address, parent *channel.ID,
+) error {
 	pr.mu.Lock()
 	defer pr.mu.Unlock()
 

channel/persistence/test/persistrestorertest.go

@@ -82,7 +82,8 @@ func GenericPersistRestorerTest(
 	rng *rand.Rand,
 	pr persistence.PersistRestorer,
 	numPeers int,
-	numChans int) {
+	numChans int,
+) {
 	t.Helper()
 	t.Run("RestoreChannel error", func(t *testing.T) {
 		var id channel.ID

client/restore.go

@@ -96,7 +96,8 @@ func (c *Client) restorePeerChannels(ctx context.Context, p wire.Address) (err e
 
 func (c *Client) restoreChannelCollection(
 	db map[channel.ID]*persistence.Channel,
-	channelFromSource channelFromSourceSig) {
+	channelFromSource channelFromSourceSig,
+) {
 	chs := make(map[channel.ID]*Channel)
 	for _, pch := range db {
 		ch := c.reconstructChannel(channelFromSource, pch, db, chs)

client/restore_internal_test.go

@@ -130,7 +130,8 @@ func mkRndChan(rng *rand.Rand) *persistence.Channel {
 func mkRndChanTree(
 	rng *rand.Rand,
 	depth, minChildren, maxChildren int,
-	db map[channel.ID]*persistence.Channel) (root *persistence.Channel) {
+	db map[channel.ID]*persistence.Channel,
+) (root *persistence.Channel) {
 	root = mkRndChan(rng)
 	db[root.ID()] = root
 

client/update.go

@@ -382,7 +382,6 @@ func (c *Channel) enableNotifyUpdate(ctx context.Context) error {
 	} else {
 		err = c.machine.EnableUpdate(ctx)
 	}
-
 	if err != nil {
 		return errors.WithMessage(err, "enabling update")
 	}
@@ -391,8 +390,8 @@ func (c *Channel) enableNotifyUpdate(ctx context.Context) error {
 		c.onUpdate(from, to)
 	}
 
-	if err = c.statesPub.Publish(ctx, c.machine.CurrentTX()); err != nil {
-		c.Log().WithField("Version", c.state().Version).Errorf("Error publishe state to watcher: %v", err)
+	if err := c.statesPub.Publish(ctx, c.machine.CurrentTX()); err != nil {
+		c.Log().WithField("Version", c.state().Version).Errorf("publishing state to watcher: %w", err)
 	}
 	return nil
 }

wire/net/endpoint_registry.go

@@ -220,7 +220,8 @@ func (r *EndpointRegistry) authenticatedDial(
 	ctx context.Context,
 	addr wire.Address,
 	de *dialingEndpoint,
-	created bool) (ret *Endpoint, _ error) {
+	created bool,
+) (ret *Endpoint, _ error) {
 	key := wallet.Key(addr)
 
 	// Short cut: another dial for that peer is already in progress.

wire/test/bustest.go

@@ -40,7 +40,8 @@ const testNoReceiveTimeout = 10 * time.Millisecond
 // the client to, and a bus the client should use for publishing messages.
 func GenericBusTest(t *testing.T,
 	busAssigner func(wire.Account) (pub wire.Bus, sub wire.Bus),
-	numClients, numMsgs int) {
+	numClients, numMsgs int,
+) {
 	t.Helper()
 	require.Greater(t, numClients, 1)
 	require.Greater(t, numMsgs, 0)