Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit 53761df

Browse files
committed
migrate to go-libp2p-core.
1 parent a1ca6a6 commit 53761df

31 files changed

+128
-180
lines changed

bitswap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
metrics "github.com/ipfs/go-metrics-interface"
3030
process "github.com/jbenet/goprocess"
3131
procctx "github.com/jbenet/goprocess/context"
32-
peer "github.com/libp2p/go-libp2p-peer"
32+
peer "github.com/libp2p/go-libp2p-core/peer"
3333
)
3434

3535
var log = logging.Logger("bitswap")

decision/engine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
logging "github.com/ipfs/go-log"
1717
"github.com/ipfs/go-peertaskqueue"
1818
"github.com/ipfs/go-peertaskqueue/peertask"
19-
peer "github.com/libp2p/go-libp2p-peer"
19+
peer "github.com/libp2p/go-libp2p-core/peer"
2020
)
2121

2222
// TODO consider taking responsibility for other types of requests. For

decision/engine_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
ds "github.com/ipfs/go-datastore"
1616
dssync "github.com/ipfs/go-datastore/sync"
1717
blockstore "github.com/ipfs/go-ipfs-blockstore"
18-
peer "github.com/libp2p/go-libp2p-peer"
18+
peer "github.com/libp2p/go-libp2p-core/peer"
1919
testutil "github.com/libp2p/go-testutil"
2020
)
2121

decision/ledger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
wl "github.com/ipfs/go-bitswap/wantlist"
88

99
cid "github.com/ipfs/go-cid"
10-
peer "github.com/libp2p/go-libp2p-peer"
10+
peer "github.com/libp2p/go-libp2p-core/peer"
1111
)
1212

1313
func newLedger(p peer.ID) *ledger {

go.mod

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module github.com/ipfs/go-bitswap
22

33
require (
4-
github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c // indirect
54
github.com/cskr/pubsub v1.0.2
65
github.com/davecgh/go-spew v1.1.1 // indirect
76
github.com/gogo/protobuf v1.2.1
@@ -22,31 +21,19 @@ require (
2221
github.com/ipfs/go-metrics-interface v0.0.1
2322
github.com/ipfs/go-peertaskqueue v0.0.4
2423
github.com/jbenet/goprocess v0.1.3
25-
github.com/libp2p/go-libp2p v0.0.30
26-
github.com/libp2p/go-libp2p-host v0.0.3
27-
github.com/libp2p/go-libp2p-interface-connmgr v0.0.5
28-
github.com/libp2p/go-libp2p-loggables v0.0.1
29-
github.com/libp2p/go-libp2p-net v0.0.2
30-
github.com/libp2p/go-libp2p-netutil v0.0.1
31-
github.com/libp2p/go-libp2p-peer v0.2.0
32-
github.com/libp2p/go-libp2p-peerstore v0.1.0
33-
github.com/libp2p/go-libp2p-protocol v0.1.0
34-
github.com/libp2p/go-libp2p-routing v0.0.1
35-
github.com/libp2p/go-libp2p-yamux v0.1.3 // indirect
36-
github.com/libp2p/go-mplex v0.0.4 // indirect
37-
github.com/libp2p/go-stream-muxer v0.1.0 // indirect
24+
github.com/libp2p/go-libp2p v0.1.0
25+
github.com/libp2p/go-libp2p-core v0.0.2
26+
github.com/libp2p/go-libp2p-loggables v0.1.0
27+
github.com/libp2p/go-libp2p-netutil v0.1.0
28+
github.com/libp2p/go-libp2p-testing v0.0.3
3829
github.com/libp2p/go-testutil v0.0.1
39-
github.com/libp2p/go-yamux v1.2.3 // indirect
4030
github.com/mattn/go-colorable v0.1.2 // indirect
41-
github.com/minio/sha256-simd v0.1.0 // indirect
4231
github.com/multiformats/go-multiaddr v0.0.4
43-
github.com/multiformats/go-multistream v0.1.0 // indirect
44-
github.com/onsi/ginkgo v1.8.0 // indirect
45-
github.com/onsi/gomega v1.5.0 // indirect
4632
github.com/opentracing/opentracing-go v1.1.0 // indirect
47-
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect
4833
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
4934
golang.org/x/sys v0.0.0-20190524122548-abf6ff778158 // indirect
5035
golang.org/x/text v0.3.2 // indirect
5136
gopkg.in/yaml.v2 v2.2.2 // indirect
5237
)
38+
39+
replace github.com/ipfs/go-ipfs-routing => ../go-ipfs-routing

go.sum

Lines changed: 41 additions & 88 deletions
Large diffs are not rendered by default.

message/message.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import (
1010

1111
ggio "github.com/gogo/protobuf/io"
1212
cid "github.com/ipfs/go-cid"
13-
inet "github.com/libp2p/go-libp2p-net"
13+
14+
"github.com/libp2p/go-libp2p-core/network"
1415
)
1516

1617
// BitSwapMessage is the basic interface for interacting building, encoding,
@@ -169,7 +170,7 @@ func (m *impl) AddBlock(b blocks.Block) {
169170

170171
// FromNet generates a new BitswapMessage from incoming data on an io.Reader.
171172
func FromNet(r io.Reader) (BitSwapMessage, error) {
172-
pbr := ggio.NewDelimitedReader(r, inet.MessageSizeMax)
173+
pbr := ggio.NewDelimitedReader(r, network.MessageSizeMax)
173174
return FromPBReader(pbr)
174175
}
175176

messagequeue/messagequeue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
bsnet "github.com/ipfs/go-bitswap/network"
1010
wantlist "github.com/ipfs/go-bitswap/wantlist"
1111
logging "github.com/ipfs/go-log"
12-
peer "github.com/libp2p/go-libp2p-peer"
12+
peer "github.com/libp2p/go-libp2p-core/peer"
1313
)
1414

1515
var log = logging.Logger("bitswap")

messagequeue/messagequeue_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
bsmsg "github.com/ipfs/go-bitswap/message"
1111
bsnet "github.com/ipfs/go-bitswap/network"
12-
peer "github.com/libp2p/go-libp2p-peer"
12+
peer "github.com/libp2p/go-libp2p-core/peer"
1313
)
1414

1515
type fakeMessageNetwork struct {

network/interface.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import (
66
bsmsg "github.com/ipfs/go-bitswap/message"
77

88
cid "github.com/ipfs/go-cid"
9-
ifconnmgr "github.com/libp2p/go-libp2p-interface-connmgr"
10-
peer "github.com/libp2p/go-libp2p-peer"
11-
protocol "github.com/libp2p/go-libp2p-protocol"
9+
10+
"github.com/libp2p/go-libp2p-core/connmgr"
11+
"github.com/libp2p/go-libp2p-core/peer"
12+
"github.com/libp2p/go-libp2p-core/protocol"
1213
)
1314

1415
var (
@@ -38,7 +39,7 @@ type BitSwapNetwork interface {
3839

3940
NewMessageSender(context.Context, peer.ID) (MessageSender, error)
4041

41-
ConnectionManager() ifconnmgr.ConnManager
42+
ConnectionManager() connmgr.ConnManager
4243

4344
Stats() Stats
4445

0 commit comments

Comments
 (0)