Skip to content

Commit d89d5d2

Browse files
authored
refactor: unify the error handling methods in the crypto package that are different from the project style (#1016)
Signed-off-by: ChengenH <[email protected]>
1 parent 73b21dd commit d89d5d2

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

benchmarks/cosmos-exim/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"errors"
45
"fmt"
56
"os"
67
"time"
@@ -128,7 +129,7 @@ func runExport(dbPath string) (int64, map[string][]*iavl.ExportNode, error) {
128129
defer exporter.Close()
129130
for {
130131
node, err := exporter.Next()
131-
if err == iavl.ErrorExportDone {
132+
if errors.Is(err, iavl.ErrorExportDone) {
132133
break
133134
} else if err != nil {
134135
return 0, nil, err

export_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package iavl
22

33
import (
4+
"errors"
45
"math"
56
"math/rand"
67
"testing"
@@ -180,7 +181,7 @@ func TestExporter(t *testing.T) {
180181
defer exporter.Close()
181182
for {
182183
node, err := exporter.Next()
183-
if err == ErrorExportDone {
184+
if errors.Is(err, ErrorExportDone) {
184185
break
185186
}
186187
require.NoError(t, err)
@@ -215,7 +216,7 @@ func TestExporterCompress(t *testing.T) {
215216
exporter := NewCompressExporter(innerExporter)
216217
for {
217218
node, err := exporter.Next()
218-
if err == ErrorExportDone {
219+
if errors.Is(err, ErrorExportDone) {
219220
break
220221
}
221222
require.NoError(t, err)
@@ -266,7 +267,7 @@ func TestExporter_Import(t *testing.T) {
266267

267268
for {
268269
item, err := exporter.Next()
269-
if err == ErrorExportDone {
270+
if errors.Is(err, ErrorExportDone) {
270271
err = innerImporter.Commit()
271272
require.NoError(t, err)
272273
break
@@ -365,7 +366,7 @@ func BenchmarkExport(b *testing.B) {
365366
require.NoError(b, err)
366367
for {
367368
_, err := exporter.Next()
368-
if err == ErrorExportDone {
369+
if errors.Is(err, ErrorExportDone) {
369370
break
370371
} else if err != nil {
371372
b.Error(err)

import_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package iavl
22

33
import (
4+
"errors"
45
"testing"
56

67
"github.com/stretchr/testify/assert"
@@ -43,7 +44,7 @@ func ExampleImporter() {
4344
for {
4445
var node *ExportNode
4546
node, err = exporter.Next()
46-
if err == ErrorExportDone {
47+
if errors.Is(err, ErrorExportDone) {
4748
break
4849
} else if err != nil {
4950
panic(err)
@@ -247,7 +248,7 @@ func benchmarkImport(b *testing.B, nodes int) {
247248
require.NoError(b, err)
248249
for {
249250
item, err := exporter.Next()
250-
if err == ErrorExportDone {
251+
if errors.Is(err, ErrorExportDone) {
251252
break
252253
} else if err != nil {
253254
b.Error(err)

0 commit comments

Comments
 (0)