From 6e7c46a6e29122df2f5837adcbd875eaf97b07f8 Mon Sep 17 00:00:00 2001 From: Brian Tiger Chow Date: Tue, 16 Dec 2014 23:43:23 -0800 Subject: [PATCH] unexport functions License: MIT Signed-off-by: Brian Tiger Chow --- exchange/bitswap/decision/engine.go | 12 ++++-------- exchange/bitswap/decision/engine_test.go | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/exchange/bitswap/decision/engine.go b/exchange/bitswap/decision/engine.go index e34b6a225..1a46d4535 100644 --- a/exchange/bitswap/decision/engine.go +++ b/exchange/bitswap/decision/engine.go @@ -160,17 +160,13 @@ func (e *Engine) MessageSent(p peer.Peer, m bsmsg.BitSwapMessage) error { return nil } -func (e *Engine) NumBytesSentTo(p peer.Peer) uint64 { - e.lock.RLock() - defer e.lock.RUnlock() - +func (e *Engine) numBytesSentTo(p peer.Peer) uint64 { + // NB not threadsafe return e.findOrCreate(p).Accounting.BytesSent } -func (e *Engine) NumBytesReceivedFrom(p peer.Peer) uint64 { - e.lock.RLock() - defer e.lock.RUnlock() - +func (e *Engine) numBytesReceivedFrom(p peer.Peer) uint64 { + // NB not threadsafe return e.findOrCreate(p).Accounting.BytesRecv } diff --git a/exchange/bitswap/decision/engine_test.go b/exchange/bitswap/decision/engine_test.go index 5b1740754..148937573 100644 --- a/exchange/bitswap/decision/engine_test.go +++ b/exchange/bitswap/decision/engine_test.go @@ -44,18 +44,18 @@ func TestConsistentAccounting(t *testing.T) { } // Ensure sender records the change - if sender.Engine.NumBytesSentTo(receiver.Peer) == 0 { + if sender.Engine.numBytesSentTo(receiver.Peer) == 0 { t.Fatal("Sent bytes were not recorded") } // Ensure sender and receiver have the same values - if sender.Engine.NumBytesSentTo(receiver.Peer) != receiver.Engine.NumBytesReceivedFrom(sender.Peer) { + if sender.Engine.numBytesSentTo(receiver.Peer) != receiver.Engine.numBytesReceivedFrom(sender.Peer) { t.Fatal("Inconsistent book-keeping. Strategies don't agree") } // Ensure sender didn't record receving anything. And that the receiver // didn't record sending anything - if receiver.Engine.NumBytesSentTo(sender.Peer) != 0 || sender.Engine.NumBytesReceivedFrom(receiver.Peer) != 0 { + if receiver.Engine.numBytesSentTo(sender.Peer) != 0 || sender.Engine.numBytesReceivedFrom(receiver.Peer) != 0 { t.Fatal("Bert didn't send bytes to Ernie") } }