From b5ea124a7632e5c5527db4a234e00b2f3a6766db Mon Sep 17 00:00:00 2001 From: Brian Tiger Chow <brian.holderchow@gmail.com> Date: Sun, 21 Sep 2014 02:26:06 -0700 Subject: [PATCH] style(bitswap) swap argument order --- core/core.go | 2 +- exchange/bitswap/bitswap.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core.go b/core/core.go index bed95aae6..423dffe81 100644 --- a/core/core.go +++ b/core/core.go @@ -118,7 +118,7 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) { // TODO(brian): perform this inside NewDHT factory method dhtService.Handler = route // wire the handler to the service. - exchangeSession = bitswap.NetMessageSession(ctx, exchangeService, local, d, route) + exchangeSession = bitswap.NetMessageSession(ctx, local, exchangeService, route, d) // TODO(brian): pass a context to initConnections go initConnections(ctx, cfg, peerstore, route) diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go index 3bee217dd..ce5547d9e 100644 --- a/exchange/bitswap/bitswap.go +++ b/exchange/bitswap/bitswap.go @@ -20,7 +20,7 @@ import ( // NetMessageSession initializes a BitSwap session that communicates over the // provided NetMessage service -func NetMessageSession(parent context.Context, s bsnet.NetMessageService, p *peer.Peer, d ds.Datastore, directory bsnet.Routing) exchange.Interface { +func NetMessageSession(parent context.Context, p *peer.Peer, s bsnet.NetMessageService, directory bsnet.Routing, d ds.Datastore) exchange.Interface { networkAdapter := bsnet.NetMessageAdapter(s, nil) bs := &bitswap{ -- GitLab