Update to golangci-lint 1.40.1.

Linter `golint` has been deprecated and replaced with `revive`.
This commit is contained in:
Jamie Holdstock 2021-05-21 12:47:31 +08:00 committed by Jamie Holdstock
parent 2d0db6f6b3
commit 136e389f95
4 changed files with 11 additions and 15 deletions

View File

@ -15,7 +15,7 @@ jobs:
- name: Check out source - name: Check out source
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install Linters - name: Install Linters
run: "curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.38.0" run: "curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.40.1"
- name: Build - name: Build
env: env:
GO111MODULE: "on" GO111MODULE: "on"

View File

@ -6,7 +6,6 @@ package database
import ( import (
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"time" "time"
@ -17,15 +16,15 @@ import (
type FeeStatus string type FeeStatus string
const ( const (
// No fee transaction has been received yet. // NoFee indicates no fee tx has been received yet.
NoFee FeeStatus = "none" NoFee FeeStatus = "none"
// Fee transaction has been received but not broadcast. // FeeReceieved indicates fee tx has been received but not broadcast.
FeeReceieved FeeStatus = "received" FeeReceieved FeeStatus = "received"
// Fee transaction has been broadcast but not confirmed. // FeeBroadcast indicates fee tx has been broadcast but not confirmed.
FeeBroadcast FeeStatus = "broadcast" FeeBroadcast FeeStatus = "broadcast"
// Fee transaction has been broadcast and confirmed. // FeeConfirmed indicates fee tx has been broadcast and confirmed.
FeeConfirmed FeeStatus = "confirmed" FeeConfirmed FeeStatus = "confirmed"
// Fee transaction could not be broadcast due to an error. // FeeError indicates fee tx could not be broadcast due to an error.
FeeError FeeStatus = "error" FeeError FeeStatus = "error"
) )
@ -33,9 +32,10 @@ const (
type TicketOutcome string type TicketOutcome string
const ( const (
// Ticket has been revoked, either because it was missed or it expired. // Revoked indicates the ticket has been revoked, either because it was
// missed or it expired.
Revoked TicketOutcome = "revoked" Revoked TicketOutcome = "revoked"
// Ticket has already voted. // Voted indicates the ticket has already voted.
Voted TicketOutcome = "voted" Voted TicketOutcome = "voted"
) )
@ -77,10 +77,6 @@ func (t *Ticket) FeeExpired() bool {
return now.After(time.Unix(t.FeeExpiration, 0)) return now.After(time.Unix(t.FeeExpiration, 0))
} }
var (
ErrNoTicketFound = errors.New("no ticket found")
)
// InsertNewTicket will insert the provided ticket into the database. Returns an // InsertNewTicket will insert the provided ticket into the database. Returns an
// error if either the ticket hash or fee address already exist. // error if either the ticket hash or fee address already exist.
func (vdb *VspDatabase) InsertNewTicket(ticket Ticket) error { func (vdb *VspDatabase) InsertNewTicket(ticket Ticket) error {

View File

@ -11,7 +11,7 @@ import (
"time" "time"
) )
var seededRand *rand.Rand = rand.New(rand.NewSource(time.Now().UnixNano())) var seededRand = rand.New(rand.NewSource(time.Now().UnixNano()))
// randString randomly generates a string of the requested length, using only // randString randomly generates a string of the requested length, using only
// characters from the provided charset. // characters from the provided charset.

View File

@ -36,7 +36,7 @@ fi
golangci-lint run --disable-all --deadline=10m \ golangci-lint run --disable-all --deadline=10m \
--out-format=$OUT_FORMAT \ --out-format=$OUT_FORMAT \
--enable=gofmt \ --enable=gofmt \
--enable=golint \ --enable=revive \
--enable=govet \ --enable=govet \
--enable=gosimple \ --enable=gosimple \
--enable=unconvert \ --enable=unconvert \