From ae82433a8f1d37e6e832048e1f0db5076297770b Mon Sep 17 00:00:00 2001 From: Stephen McQuay Date: Sun, 2 Mar 2014 22:47:28 -0800 Subject: [PATCH] demote NewStream --- .hgignore | 2 ++ bandwidth.go | 8 ++++---- bandwidth_test.go | 10 +++++----- 3 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 .hgignore diff --git a/.hgignore b/.hgignore new file mode 100644 index 0000000..3aa41b2 --- /dev/null +++ b/.hgignore @@ -0,0 +1,2 @@ +tags +.*.swp diff --git a/bandwidth.go b/bandwidth.go index df5ca1f..56afa0a 100644 --- a/bandwidth.go +++ b/bandwidth.go @@ -1,4 +1,4 @@ -package main +package bandwidth import ( "container/list" @@ -29,7 +29,7 @@ type stream struct { max time.Duration } -func NewStream(seconds []int) *stream { +func newStream(seconds []int) *stream { extents := []time.Duration{} for _, s := range seconds { extents = append(extents, time.Duration(-s)*time.Second) @@ -113,8 +113,8 @@ func NewBandwidth(seconds []int, dt time.Duration) (*Bandwidth, error) { Tx: make(chan []float64), dt: dt, Quit: make(chan interface{}), - rxstream: NewStream(seconds), - txstream: NewStream(seconds), + rxstream: newStream(seconds), + txstream: newStream(seconds), } return r, nil } diff --git a/bandwidth_test.go b/bandwidth_test.go index 3754110..ea8c58b 100644 --- a/bandwidth_test.go +++ b/bandwidth_test.go @@ -1,4 +1,4 @@ -package main +package bandwidth import ( "log" @@ -55,7 +55,7 @@ func TestOncePerSecond(t *testing.T) { if err != nil { t.Error(err) } - bw.rxstream = NewStream([]int{1, 10, 60}) + bw.rxstream = newStream([]int{1, 10, 60}) var i int64 = 0 for ; i < 1000; i++ { d := datum{ @@ -72,7 +72,7 @@ func TestOneOverManySeconds(t *testing.T) { if err != nil { t.Error(err) } - bw.rxstream = NewStream([]int{1, 10, 60}) + bw.rxstream = newStream([]int{1, 10, 60}) var i int64 = 0 for ; i < 1000; i++ { d := datum{ @@ -89,7 +89,7 @@ func TestManyPerSecond(t *testing.T) { if err != nil { t.Error(err) } - bw.rxstream = NewStream([]int{1, 10, 60}) + bw.rxstream = newStream([]int{1, 10, 60}) var i int64 = 0 for ; i < 10000; i++ { d := datum{ @@ -106,7 +106,7 @@ func TestEmpty(t *testing.T) { if err != nil { t.Error(err) } - bw.rxstream = NewStream([]int{1, 10, 60}) + bw.rxstream = newStream([]int{1, 10, 60}) validate(t, bw.rxstream.averages(), []float64{}) }