seedhammer/dcrd
seedhammer/dcrd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dcrutil: use errors api; require go 1.13+

Browse Source
This commit is contained in:
David Hill 2020-02-19 10:22:07 -05:00 committed by Dave Collins
parent bcc1a227a6
commit e1e11efd0e
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dcrutil/address.go
View File

@ -167,7 +167,7 @@ func DecodeAddress(addr string, net AddressParams) (Address, error) {
// Switch on decoded length to determine the type.
decoded, netID, err := base58.CheckDecode(addr)
if err != nil {
if err == base58.ErrChecksum {
if errors.Is(err, base58.ErrChecksum) {
return nil, ErrChecksumMismatch
}
return nil, fmt.Errorf("decoded address is of unknown format: %v", err)

16
dcrutil/block_test.go
View File

@ -1,5 +1,5 @@
// Copyright (c) 2013-2016 The btcsuite developers
// Copyright (c) 2015-2019 The Decred developers
// Copyright (c) 2015-2020 The Decred developers
// Use of this source code is governed by an ISC
// license that can be found in the LICENSE file.
@ -7,6 +7,7 @@ package dcrutil
import (
"bytes"
"errors"
"io"
"reflect"
"testing"
@ -284,31 +285,32 @@ func TestBlockErrors(t *testing.T) {
// Truncate the block byte buffer to force errors.
shortBytes := block100000Bytes[:100]
_, err = NewBlockFromBytes(shortBytes)
if err != io.EOF {
if !errors.Is(err, io.EOF) {
t.Errorf("NewBlockFromBytes: did not get expected error - "+
"got %v, want %v", err, io.EOF)
}
// Ensure TxHash returns expected error on invalid indices.
var oErr OutOfRangeError
_, err = b.TxHash(-1)
if _, ok := err.(OutOfRangeError); !ok {
if !errors.As(err, &oErr) {
t.Errorf("TxHash: wrong error - got: %v <%T>, "+
"want: <%T>", err, err, OutOfRangeError(""))
}
_, err = b.TxHash(len(Block100000.Transactions) + 1)
if _, ok := err.(OutOfRangeError); !ok {
if !errors.As(err, &oErr) {
t.Errorf("TxHash: wrong error - got: %v <%T>, "+
"want: <%T>", err, err, OutOfRangeError(""))
}
// Ensure Tx returns expected error on invalid indices.
_, err = b.Tx(-1)
if _, ok := err.(OutOfRangeError); !ok {
if !errors.As(err, &oErr) {
t.Errorf("Tx: wrong error - got: %v <%T>, "+
"want: <%T>", err, err, OutOfRangeError(""))
}
_, err = b.Tx(len(Block100000.Transactions) + 1)
if _, ok := err.(OutOfRangeError); !ok {
if !errors.As(err, &oErr) {
t.Errorf("Tx: wrong error - got: %v <%T>, "+
"want: <%T>", err, err, OutOfRangeError(""))
}
@ -316,7 +318,7 @@ func TestBlockErrors(t *testing.T) {
// Ensure TxLoc returns expected error with short byte buffer.
b.serializedBlock = shortBytes
_, _, err = b.TxLoc()
if err != io.EOF {
if !errors.Is(err, io.EOF) {
t.Errorf("TxLoc: did not get expected error - "+
"got %v, want %v", err, io.EOF)
}

2
dcrutil/go.mod
View File

@ -1,6 +1,6 @@
module github.com/decred/dcrd/dcrutil/v3
go 1.11
go 1.13
require (
github.com/davecgh/go-spew v1.1.1

5
dcrutil/tx_test.go
View File

@ -1,5 +1,5 @@
// Copyright (c) 2013-2016 The btcsuite developers
// Copyright (c) 2015-2019 The Decred developers
// Copyright (c) 2015-2020 The Decred developers
// Use of this source code is governed by an ISC
// license that can be found in the LICENSE file.
@ -7,6 +7,7 @@ package dcrutil
import (
"bytes"
"errors"
"io"
"reflect"
"testing"
@ -116,7 +117,7 @@ func TestTxErrors(t *testing.T) {
// Truncate the transaction byte buffer to force errors.
shortBytes := testTxBytes[:4]
_, err = NewTxFromBytes(shortBytes)
if err != io.EOF {
if !errors.Is(err, io.EOF) {
t.Errorf("NewTxFromBytes: did not get expected error - "+
"got %v, want %v", err, io.EOF)
}