Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(mod): update ipfs & libp2p deps #985

Merged
merged 2 commits into from
Oct 25, 2019
Merged

chore(mod): update ipfs & libp2p deps #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85d3aec
chore(mod): update ipfs & libp2p deps
b5 Oct 25, 2019
d8f0c13
test(cmd): add one second to fetch test
b5 Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"testing"

crypto "github.com/libp2p/go-libp2p-crypto"
crypto "github.com/libp2p/go-libp2p-core/crypto"
"github.com/qri-io/dataset"
"github.com/qri-io/dataset/dstest"
"github.com/qri-io/ioes"
Expand Down
2 changes: 1 addition & 1 deletion base/dsfs/dataset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"sync"
"time"

crypto "github.com/libp2p/go-libp2p-crypto"
crypto "github.com/libp2p/go-libp2p-core/crypto"
"github.com/multiformats/go-multihash"
"github.com/qri-io/dataset"
"github.com/qri-io/dataset/dsdiff"
Expand Down
2 changes: 1 addition & 1 deletion base/dsfs/dataset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

crypto "github.com/libp2p/go-libp2p-crypto"
crypto "github.com/libp2p/go-libp2p-core/crypto"
"github.com/qri-io/dataset"
"github.com/qri-io/dataset/dstest"
"github.com/qri-io/qfs"
Expand Down
2 changes: 1 addition & 1 deletion base/dsfs/dstest/priv_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/base64"
"fmt"

crypto "github.com/libp2p/go-libp2p-crypto"
crypto "github.com/libp2p/go-libp2p-core/crypto"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion base/dsfs/transform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io/ioutil"
"testing"

crypto "github.com/libp2p/go-libp2p-crypto"
crypto "github.com/libp2p/go-libp2p-core/crypto"
"github.com/qri-io/dataset/dstest"
"github.com/qri-io/qfs/cafs"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/fetch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ func TestFetchCommand(t *testing.T) {
}
}()

time.Sleep(time.Second * 2)
// TODO (b5) - this is horrible. we should block on a channel receive for connectedness
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😢

time.Sleep(time.Second * 5)

b := NewTestRepoRoot(t, "qri_test_fetch_b")
defer b.Delete()
Expand Down
4 changes: 2 additions & 2 deletions config/p2p.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"reflect"

crypto "github.com/libp2p/go-libp2p-crypto"
peer "github.com/libp2p/go-libp2p-peer"
crypto "github.com/libp2p/go-libp2p-core/crypto"
peer "github.com/libp2p/go-libp2p-core/peer"
ma "github.com/multiformats/go-multiaddr"

"github.com/qri-io/jsonschema"
Expand Down
4 changes: 2 additions & 2 deletions config/test/test_peers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package test
import (
"encoding/base64"

crypto "github.com/libp2p/go-libp2p-crypto"
peer "github.com/libp2p/go-libp2p-peer"
crypto "github.com/libp2p/go-libp2p-core/crypto"
peer "github.com/libp2p/go-libp2p-core/peer"
)

// EncodedPeerInfo holds encoded private keys and peerIDs for test peers.
Expand Down
43 changes: 20 additions & 23 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,47 +21,44 @@ require (
github.com/gofrs/flock v0.7.1 // indirect
github.com/google/flatbuffers v1.11.0
github.com/google/go-cmp v0.3.0
github.com/ipfs/go-cid v0.0.2
github.com/ipfs/go-datastore v0.0.5
github.com/ipfs/go-ipfs v0.4.21
github.com/ipfs/go-ipfs-config v0.0.3
github.com/ipfs/go-cid v0.0.3
github.com/ipfs/go-datastore v0.1.1
github.com/ipfs/go-ds-badger v0.0.7 // indirect
github.com/ipfs/go-ipfs v0.4.22-0.20191023033800-4a102207a36c
github.com/ipfs/go-ipfs-config v0.0.11
github.com/ipfs/go-ipld-format v0.0.2
github.com/ipfs/go-log v0.0.1
github.com/ipfs/interface-go-ipfs-core v0.0.8
github.com/ipfs/interface-go-ipfs-core v0.2.3
github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3
github.com/libp2p/go-libp2p v0.0.28
github.com/libp2p/go-libp2p-circuit v0.0.8
github.com/libp2p/go-libp2p-connmgr v0.0.6
github.com/libp2p/go-libp2p-crypto v0.0.2
github.com/libp2p/go-libp2p-host v0.0.3
github.com/libp2p/go-libp2p-net v0.0.2
github.com/libp2p/go-libp2p-peer v0.1.1
github.com/libp2p/go-libp2p-peerstore v0.0.6
github.com/libp2p/go-libp2p-protocol v0.0.1
github.com/libp2p/go-libp2p-swarm v0.0.6
github.com/libp2p/go-libp2p v0.4.0
github.com/libp2p/go-libp2p-circuit v0.1.3
github.com/libp2p/go-libp2p-connmgr v0.1.1
github.com/libp2p/go-libp2p-core v0.2.3
github.com/libp2p/go-libp2p-peerstore v0.1.3
github.com/libp2p/go-libp2p-swarm v0.2.2
github.com/mitchellh/go-homedir v1.1.0
github.com/mr-tron/base58 v1.1.2
github.com/multiformats/go-multiaddr v0.0.4
github.com/multiformats/go-multiaddr v0.1.1
github.com/multiformats/go-multicodec v0.1.6
github.com/multiformats/go-multihash v0.0.5
github.com/multiformats/go-multihash v0.0.8
github.com/qri-io/apiutil v0.1.0
github.com/qri-io/dag v0.2.1-0.20190905192357-bbfe4c6d220e
github.com/qri-io/dataset v0.1.5-0.20191024210747-110c862634eb
github.com/qri-io/dag v0.2.1-0.20191025201336-254aa177fbd7
github.com/qri-io/dataset v0.1.5-0.20191025195651-c58fba11892c
github.com/qri-io/deepdiff v0.1.0
github.com/qri-io/doggos v0.1.0
github.com/qri-io/ioes v0.1.0
github.com/qri-io/iso8601 v0.1.0
github.com/qri-io/jsonschema v0.1.1
github.com/qri-io/qfs v0.1.1-0.20191017222245-b5d2cc022636
github.com/qri-io/starlib v0.4.1
github.com/qri-io/qfs v0.1.1-0.20191025195012-9971677b190d
github.com/qri-io/starlib v0.4.2-0.20191025202035-0f16a7d50967
github.com/qri-io/varName v0.1.0
github.com/sergi/go-diff v1.0.0
github.com/sirupsen/logrus v1.2.0
github.com/spf13/cobra v0.0.5
github.com/theckman/go-flock v0.7.1
github.com/ugorji/go/codec v1.1.7
go.starlark.net v0.0.0-20190528202925-30ae18b8564f
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb
golang.org/x/crypto v0.0.0-20190926180335-cea2066c6411
golang.org/x/sys v0.0.0-20190926180325-855e68c8590b
gopkg.in/yaml.v2 v2.2.2
)
Loading