From d70e1625a8140badcc3b7b864bdd985bb1c41f67 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Thu, 15 Sep 2016 22:32:51 -0700 Subject: [PATCH] conn/dial: implement contextDial up the stack --- p2p/net/conn/dial.go | 2 +- package.json | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/p2p/net/conn/dial.go b/p2p/net/conn/dial.go index 2c55f31..60c3849 100644 --- a/p2p/net/conn/dial.go +++ b/p2p/net/conn/dial.go @@ -152,7 +152,7 @@ func (d *Dialer) rawConnDial(ctx context.Context, raddr ma.Multiaddr, remote pee return nil, fmt.Errorf("no dialer for %s", raddr) } - return sd.Dial(raddr) + return sd.DialContext(ctx, raddr) } func pickLocalAddr(laddrs []ma.Multiaddr, raddr ma.Multiaddr) (laddr ma.Multiaddr) { diff --git a/package.json b/package.json index ace48df..2f5e1ae 100644 --- a/package.json +++ b/package.json @@ -113,11 +113,6 @@ "name": "go-stream-muxer", "version": "1.0.0" }, - { - "hash": "QmaaC9QMYTQHCbMq3Ebr3uMaAR2ev4AVqMmsJpgQijAZbJ", - "name": "go-reuseport", - "version": "0.0.0" - }, { "hash": "QmbcS9XrwZkF1rZj8bBwwzoYhVuA2PCnPhFUL1pyWGgt2A", "name": "go-notifier", @@ -159,9 +154,9 @@ }, { "author": "whyrusleeping", - "hash": "QmQCGn5uWpL1wWntVzCWQrNmXBZ5a1PXbxZNFtPPbFk3KC", + "hash": "QmPsBtdPF4KubRJA6hYRZuZTaipVahT1M7kgHQbNMYttSm", "name": "go-libp2p-transport", - "version": "1.3.6" + "version": "1.6.0" }, { "author": "whyrusleeping", @@ -189,9 +184,9 @@ }, { "author": "whyrusleeping", - "hash": "Qmb5uXFWQMcJdJK6nMSZ92HRvc1okWutVgLFsyesKdpemc", + "hash": "QmRPLfjThFCccpedegUo6BKkpANXaMNpA7BfEd6eGamoE4", "name": "ws-transport", - "version": "1.0.6" + "version": "1.2.1" } ], "gxVersion": "0.4.0", -- GitLab