Skip to content

Commit e9f6023

Browse files
authored
Merge pull request #144 from xiegeo/xiegeo/fix-go-check-path
fix go-check path to use "gopkg.in/check.v1"
2 parents e7a4989 + 5978e68 commit e9f6023

File tree

8 files changed

+10
-13
lines changed

8 files changed

+10
-13
lines changed

examples/fs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"testing"
66

7-
. "github.com/go-check/check"
7+
. "gopkg.in/check.v1"
88

99
ds "github.com/ipfs/go-datastore"
1010
query "github.com/ipfs/go-datastore/query"

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
module github.com/ipfs/go-datastore
22

33
require (
4-
github.com/go-check/check v0.0.0-20180628173108-788fd7840127
54
github.com/google/uuid v1.1.1
65
github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8
76
github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8
87
github.com/kr/pretty v0.1.0 // indirect
98
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
10-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
9+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
1110
)
1211

1312
go 1.12

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
github.com/go-check/check v0.0.0-20180628173108-788fd7840127 h1:0gkP6mzaMqkmpcJYCFOLkIBwI7xFExG03bbkOkCvUPI=
2-
github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
31
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
42
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
53
github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8 h1:NAviDvJ0WXgD+yiL2Rj35AmnfgI11+pHXbdciD917U0=
@@ -13,5 +11,5 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
1311
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
1412
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
1513
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
16-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
17-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
14+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
15+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

key_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strings"
77
"testing"
88

9-
. "github.com/go-check/check"
109
. "github.com/ipfs/go-datastore"
10+
. "gopkg.in/check.v1"
1111
)
1212

1313
// Hook up gocheck into the "go test" runner.

keytransform/keytransform_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"sort"
66
"testing"
77

8-
. "github.com/go-check/check"
8+
. "gopkg.in/check.v1"
99

1010
ds "github.com/ipfs/go-datastore"
1111
kt "github.com/ipfs/go-datastore/keytransform"

namespace/namespace_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"sort"
66
"testing"
77

8-
. "github.com/go-check/check"
8+
. "gopkg.in/check.v1"
99

1010
ds "github.com/ipfs/go-datastore"
1111
ns "github.com/ipfs/go-datastore/namespace"

query/query.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ type Query struct {
7171
// // is not set, Size should always be set.
7272
}
7373

74-
// String returns a string represenation of the Query for debugging/validation
74+
// String returns a string representation of the Query for debugging/validation
7575
// purposes. Do not use it for SQL queries.
7676
func (q Query) String() string {
7777
s := "SELECT keys"
@@ -157,7 +157,7 @@ type Result struct {
157157
type Results interface {
158158
Query() Query // the query these Results correspond to
159159
Next() <-chan Result // returns a channel to wait for the next result
160-
NextSync() (Result, bool) // blocks and waits to return the next result, second paramter returns false when results are exhausted
160+
NextSync() (Result, bool) // blocks and waits to return the next result, second parameter returns false when results are exhausted
161161
Rest() ([]Entry, error) // waits till processing finishes, returns all entries at once.
162162
Close() error // client may call Close to signal early exit
163163

test/test_util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func RunBatchTest(t *testing.T, ds dstore.Batching) {
3636
}
3737
}
3838

39-
// Ensure they are not in the datastore before comitting
39+
// Ensure they are not in the datastore before committing
4040
for _, k := range keys {
4141
_, err := ds.Get(k)
4242
if err == nil {

0 commit comments

Comments
 (0)