From 3b3e9e04b3c27123f8cb5bc3204924bbd0021e6c Mon Sep 17 00:00:00 2001 From: David Hill Date: Mon, 8 Aug 2022 14:07:44 -0500 Subject: [PATCH] build: Test against Go 1.19 Fix linter warnings --- .github/workflows/go.yml | 13 ++++++------- dcrwallet.go | 2 +- internal/rpc/rpcserver/server.go | 2 +- wallet/createtx.go | 4 ++-- wallet/internal/bdb/interface_test.go | 5 +---- wallet/udb/txdb.go | 7 ++----- wallet/udb/vsp.go | 2 +- wallet/wallet.go | 3 +-- wallet/walletdb/interface_test.go | 7 ++----- 9 files changed, 17 insertions(+), 28 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 0c254b86b..61ef31e0d 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,25 +1,24 @@ name: Build and Test on: [push, pull_request] +permissions: + contents: read + jobs: build: name: Go CI runs-on: ubuntu-latest strategy: matrix: - go: [1.17, 1.18] + go: [1.18, 1.19] steps: - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a #v3.2.1 with: go-version: ${{ matrix.go }} - name: Check out source - uses: actions/checkout@v2 + uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #v3.0.2 - name: Build - env: - GO111MODULE: "on" run: go build ./... - name: Test - env: - GO111MODULE: "on" run: | sh ./run_tests.sh diff --git a/dcrwallet.go b/dcrwallet.go index bd4248602..16156b291 100644 --- a/dcrwallet.go +++ b/dcrwallet.go @@ -172,7 +172,7 @@ func run(ctx context.Context) error { // initialized and this function returns. defer func() { // When panicing, do not cleanly unload the wallet (by closing - // the db). If a panic occured inside a bolt transaction, the + // the db). If a panic occurred inside a bolt transaction, the // db mutex is still held and this causes a deadlock. if r := recover(); r != nil { panic(r) diff --git a/internal/rpc/rpcserver/server.go b/internal/rpc/rpcserver/server.go index 712074baf..5512190f4 100644 --- a/internal/rpc/rpcserver/server.go +++ b/internal/rpc/rpcserver/server.go @@ -3842,7 +3842,7 @@ func (s *walletServer) UnlockAccount(ctx context.Context, req *pb.UnlockAccountR } return nil, err } - err = s.wallet.UnlockAccount(ctx, req.AccountNumber, []byte(req.Passphrase)) + err = s.wallet.UnlockAccount(ctx, req.AccountNumber, req.Passphrase) if err != nil { return nil, translateError(err) } diff --git a/wallet/createtx.go b/wallet/createtx.go index 089f02653..c98b6e45a 100644 --- a/wallet/createtx.go +++ b/wallet/createtx.go @@ -1419,13 +1419,13 @@ func (w *Wallet) purchaseTickets(ctx context.Context, op errors.Op, switch n := n.(type) { case *dcrd.RPC: dcp0010Active, err = deployments.DCP0010Active(ctx, - int32(tipHeight), w.chainParams, n) + tipHeight, w.chainParams, n) if err != nil { return nil, err } } fee := txrules.StakePoolTicketFee(ticketPrice, ticketFee, - int32(tipHeight), feePrice, w.chainParams, + tipHeight, feePrice, w.chainParams, dcp0010Active) // Reserve outputs for number of buys. diff --git a/wallet/internal/bdb/interface_test.go b/wallet/internal/bdb/interface_test.go index 74520ce4e..109f5c84a 100644 --- a/wallet/internal/bdb/interface_test.go +++ b/wallet/internal/bdb/interface_test.go @@ -111,11 +111,8 @@ func testNestedReadWriteBucket(tc *testContext, testBucket walletdb.ReadWriteBuc defer func() { tc.bucketDepth-- }() - if !testReadWriteBucketInterface(tc, testBucket) { - return false - } - return true + return testReadWriteBucketInterface(tc, testBucket) } // testReadWriteBucketInterface ensures the bucket interface is working diff --git a/wallet/udb/txdb.go b/wallet/udb/txdb.go index 8359d8a5d..76d575be0 100644 --- a/wallet/udb/txdb.go +++ b/wallet/udb/txdb.go @@ -760,7 +760,7 @@ func expandOpCode(opCodeFlag byte) uint8 { default: // Original behavior. This cashes out to one of the OP_SS*** // opcode constants. - return uint8(((opCodeFlag >> 2) & 0x07) + 0xb9) + return ((opCodeFlag >> 2) & 0x07) + 0xb9 } } @@ -2156,11 +2156,8 @@ func (it *unspentTicketCommitsIterator) next() bool { return false } it.amount, it.err = fetchRawTicketCommitmentAmount(v) - if it.err != nil { - return false - } - return true + return it.err == nil } func (it *unspentTicketCommitsIterator) close() { diff --git a/wallet/udb/vsp.go b/wallet/udb/vsp.go index a997d2be3..85dc17f25 100644 --- a/wallet/udb/vsp.go +++ b/wallet/udb/vsp.go @@ -83,7 +83,7 @@ func SetVSPTicket(dbtx walletdb.ReadWriteTx, ticketHash *chainhash.Hash, record // If the pubkey from the record in the request differs from the pubkey // in the database that is saved for the host, update the pubkey in the // db but keep the vsphost id intact. - if bytes.Compare(pubkey.PubKey, record.PubKey) != 0 { + if !bytes.Equal(pubkey.PubKey, record.PubKey) { err = SetVSPPubKey(dbtx, []byte(record.Host), &VSPPubKey{ ID: pubkey.ID, PubKey: record.PubKey, diff --git a/wallet/wallet.go b/wallet/wallet.go index 361803caa..2beb5ef29 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -5604,8 +5604,7 @@ func (w *Wallet) GetVSPTicketsByFeeStatus(ctx context.Context, feeStatus int) ([ // SetPublished sets the informed hash as true or false. func (w *Wallet) SetPublished(ctx context.Context, hash *chainhash.Hash, published bool) error { - var err error - err = walletdb.Update(ctx, w.db, func(dbtx walletdb.ReadWriteTx) error { + err := walletdb.Update(ctx, w.db, func(dbtx walletdb.ReadWriteTx) error { hash := hash err := w.txStore.SetPublished(dbtx, hash, published) if err != nil { diff --git a/wallet/walletdb/interface_test.go b/wallet/walletdb/interface_test.go index 8e76d3e27..92dadbcef 100644 --- a/wallet/walletdb/interface_test.go +++ b/wallet/walletdb/interface_test.go @@ -131,11 +131,8 @@ func testNestedReadWriteBucket(tc *testContext, bucket walletdb.ReadWriteBucket) defer func() { tc.bucketDepth-- }() - if !testReadWriteBucketInterface(tc, bucket) { - return false - } - return true + return testReadWriteBucketInterface(tc, bucket) } // testReadWriteBucketInterface ensures the read write bucket interface is @@ -333,7 +330,7 @@ func testManualTxInterface(tc *testContext, bucketKey []byte) bool { } } else { // The commit should succeed. - if err := tx.(walletdb.ReadWriteTx).Commit(); err != nil { + if err := tx.Commit(); err != nil { tc.t.Errorf("Commit: unexpected error %v", err) return false }