From 10e970c0cf0a4d90d9164456d9d8dc5da115a193 Mon Sep 17 00:00:00 2001 From: Brian Tiger Chow Date: Tue, 16 Dec 2014 20:52:30 -0800 Subject: [PATCH] refactor: context first in argument list (merely by convention) License: MIT Signed-off-by: Brian Tiger Chow --- exchange/bitswap/bitswap.go | 2 +- exchange/bitswap/strategy/ledgermanager.go | 2 +- exchange/bitswap/strategy/ledgermanager_test.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go index f1ae4b556..cae7ab1e8 100644 --- a/exchange/bitswap/bitswap.go +++ b/exchange/bitswap/bitswap.go @@ -56,7 +56,7 @@ func New(parent context.Context, p peer.Peer, network bsnet.BitSwapNetwork, rout blockstore: bstore, cancelFunc: cancelFunc, notifications: notif, - ledgermanager: strategy.NewLedgerManager(bstore, ctx), + ledgermanager: strategy.NewLedgerManager(ctx, bstore), routing: routing, sender: network, wantlist: wl.New(), diff --git a/exchange/bitswap/strategy/ledgermanager.go b/exchange/bitswap/strategy/ledgermanager.go index 3c79c855c..1ea61bb7d 100644 --- a/exchange/bitswap/strategy/ledgermanager.go +++ b/exchange/bitswap/strategy/ledgermanager.go @@ -34,7 +34,7 @@ type LedgerManager struct { workSignal chan struct{} } -func NewLedgerManager(bs bstore.Blockstore, ctx context.Context) *LedgerManager { +func NewLedgerManager(ctx context.Context, bs bstore.Blockstore) *LedgerManager { lm := &LedgerManager{ ledgerMap: make(ledgerMap), bs: bs, diff --git a/exchange/bitswap/strategy/ledgermanager_test.go b/exchange/bitswap/strategy/ledgermanager_test.go index eb89c9959..5c78f2f81 100644 --- a/exchange/bitswap/strategy/ledgermanager_test.go +++ b/exchange/bitswap/strategy/ledgermanager_test.go @@ -23,7 +23,8 @@ func newPeerAndLedgermanager(idStr string) peerAndLedgermanager { return peerAndLedgermanager{ Peer: testutil.NewPeerWithIDString(idStr), //Strategy: New(true), - ls: NewLedgerManager(blockstore.NewBlockstore(sync.MutexWrap(ds.NewMapDatastore())), context.TODO()), + ls: NewLedgerManager(context.TODO(), + blockstore.NewBlockstore(sync.MutexWrap(ds.NewMapDatastore()))), } }