Merge pull request #148 from libp2p/rcmgr

marten-seemann · web-flow · commit d74dc573f9d2 · 2022-01-17T23:58:44.000-08:00
use the resource manager
diff --git a/dial.go b/dial.go
@@ -17,7 +17,8 @@ func (d *RelayTransport) Dial(ctx context.Context, a ma.Multiaddr, p peer.ID) (t
 		return nil, err
 	}
 	c.tagHop()
-	return d.upgrader.Upgrade(ctx, d, c, network.DirOutbound, p)
+	scope, _ := network.NullResourceManager.OpenConnection(network.DirOutbound, false)
+	return d.upgrader.Upgrade(ctx, d, c, network.DirOutbound, p, scope)
 }
 
 func (r *Relay) Dial(ctx context.Context, a ma.Multiaddr, p peer.ID) (*Conn, error) {
diff --git a/go.mod b/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/ipfs/go-log v1.0.5
 	github.com/libp2p/go-buffer-pool v0.0.2
 	github.com/libp2p/go-libp2p-blankhost v0.2.0
-	github.com/libp2p/go-libp2p-core v0.13.1-0.20220104083644-a3dd401efe36
-	github.com/libp2p/go-libp2p-swarm v0.9.1-0.20220104091227-f776b7e504b1
+	github.com/libp2p/go-libp2p-core v0.14.0
+	github.com/libp2p/go-libp2p-swarm v0.10.0
 	github.com/libp2p/go-msgio v0.0.6
 	github.com/multiformats/go-multiaddr v0.5.0
 	github.com/multiformats/go-varint v0.0.6
diff --git a/go.sum b/go.sum

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ func (d *RelayTransport) Dial(ctx context.Context, a ma.Multiaddr, p peer.ID) (t`
`17`	`17`	`return nil, err`
`18`	`18`	`}`
`19`	`19`	`c.tagHop()`
`20`		`- return d.upgrader.Upgrade(ctx, d, c, network.DirOutbound, p)`
	`20`	`+ scope, _ := network.NullResourceManager.OpenConnection(network.DirOutbound, false)`
	`21`	`+ return d.upgrader.Upgrade(ctx, d, c, network.DirOutbound, p, scope)`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`func (r Relay) Dial(ctx context.Context, a ma.Multiaddr, p peer.ID) (Conn, error) {`
-Original file line number
+Diff line change
 	github.com/ipfs/go-log v1.0.5
 	github.com/libp2p/go-buffer-pool v0.0.2
 	github.com/libp2p/go-libp2p-blankhost v0.2.0
 -	github.com/libp2p/go-libp2p-core v0.13.1-0.20220104083644-a3dd401efe36
 -	github.com/libp2p/go-libp2p-swarm v0.9.1-0.20220104091227-f776b7e504b1
 +	github.com/libp2p/go-libp2p-core v0.14.0
 +	github.com/libp2p/go-libp2p-swarm v0.10.0
 	github.com/libp2p/go-msgio v0.0.6
 	github.com/multiformats/go-multiaddr v0.5.0
 	github.com/multiformats/go-varint v0.0.6