From c60d01176412c3897ab7ea906dd074ff0e7ed233 Mon Sep 17 00:00:00 2001 From: Brian Tiger Chow Date: Wed, 5 Nov 2014 03:00:04 -0800 Subject: [PATCH] fix(exchange) add context to DialPeer --- exchange/bitswap/bitswap.go | 2 +- exchange/bitswap/network/interface.go | 2 +- exchange/bitswap/network/net_message_adapter.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go index 88ff418c7..af84caa05 100644 --- a/exchange/bitswap/bitswap.go +++ b/exchange/bitswap/bitswap.go @@ -91,7 +91,7 @@ func (bs *bitswap) Block(parent context.Context, k u.Key) (*blocks.Block, error) go func(p peer.Peer) { log.Debugf("bitswap dialing peer: %s", p) - err := bs.sender.DialPeer(p) + err := bs.sender.DialPeer(ctx, p) if err != nil { log.Errorf("Error sender.DialPeer(%s)", p) return diff --git a/exchange/bitswap/network/interface.go b/exchange/bitswap/network/interface.go index 467b0f400..1d3fc63a5 100644 --- a/exchange/bitswap/network/interface.go +++ b/exchange/bitswap/network/interface.go @@ -12,7 +12,7 @@ import ( type Adapter interface { // DialPeer ensures there is a connection to peer. - DialPeer(peer.Peer) error + DialPeer(context.Context, peer.Peer) error // SendMessage sends a BitSwap message to a peer. SendMessage( diff --git a/exchange/bitswap/network/net_message_adapter.go b/exchange/bitswap/network/net_message_adapter.go index c7e1a852d..1bdf13ae9 100644 --- a/exchange/bitswap/network/net_message_adapter.go +++ b/exchange/bitswap/network/net_message_adapter.go @@ -67,7 +67,7 @@ func (adapter *impl) HandleMessage( return outgoing } -func (adapter *impl) DialPeer(p peer.Peer) error { +func (adapter *impl) DialPeer(ctx context.Context, p peer.Peer) error { return adapter.net.DialPeer(p) }