Remove sleeper only used for testing

delay.go

@@ -6,8 +6,6 @@ import (
 	"time"
 )
 
-var sharedRealSleeper = NewRealSleeper()
-
 // D (Delay) makes it easy to add (threadsafe) configurable delays to other
 // objects.
 type D interface {
@@ -21,7 +19,6 @@ type delay struct {
 	l         sync.RWMutex
 	t         time.Duration
 	generator Generator
-	sleeper   Sleeper
 }
 
 func (d *delay) Set(t time.Duration) time.Duration {
@@ -35,7 +32,7 @@ func (d *delay) Set(t time.Duration) time.Duration {
 func (d *delay) Wait() {
 	d.l.RLock()
 	defer d.l.RUnlock()
-	d.sleeper.Sleep(d.generator.NextWaitTime(d.t))
+	time.Sleep(d.generator.NextWaitTime(d.t))
 }
 
 func (d *delay) NextWaitTime() time.Duration {
@@ -51,32 +48,28 @@ func (d *delay) Get() time.Duration {
 }
 
 // Delay generates a generic delay form a t, a sleeper, and a generator
-func Delay(t time.Duration, generator Generator, sleeper Sleeper) D {
-	if sleeper == nil {
-		sleeper = sharedRealSleeper
-	}
+func Delay(t time.Duration, generator Generator) D {
 	return &delay{
 		t:         t,
-		sleeper:   sleeper,
 		generator: generator,
 	}
 }
 
 // Fixed returns a delay with fixed latency
 func Fixed(t time.Duration) D {
-	return Delay(t, FixedGenerator(), nil)
+	return Delay(t, FixedGenerator())
 }
 
 // VariableUniform is a delay following a uniform distribution
 // Notice that to implement the D interface Set can only change the minimum delay
 // the delta is set only at initialization
 func VariableUniform(t, d time.Duration, rng *rand.Rand) D {
-	return Delay(t, VariableUniformGenerator(d, rng), nil)
+	return Delay(t, VariableUniformGenerator(d, rng))
 }
 
 // VariableNormal is a delay following a normal distribution
 // Notice that to implement the D interface Set can only change the mean delay
 // the standard deviation is set only at initialization
 func VariableNormal(t, std time.Duration, rng *rand.Rand) D {
-	return Delay(t, VariableNormalGenerator(std, rng), nil)
+	return Delay(t, VariableNormalGenerator(std, rng))
 }

delay_test.go

@@ -46,14 +46,6 @@ func TestDelaySetAndGet(t *testing.T) {
 
 }
 
-type recordSleeper struct {
-	lastSleep time.Duration
-}
-
-func (rs *recordSleeper) Sleep(t time.Duration) {
-	rs.lastSleep = t
-}
-
 type fixedAdd struct {
 	toAdd time.Duration
 }
@@ -66,16 +58,10 @@ func TestDelaySleep(t *testing.T) {
 	initialValue := 1000 * time.Millisecond
 	toAdd := 500 * time.Millisecond
 	generator := &fixedAdd{toAdd: toAdd}
-	sleeper := &recordSleeper{lastSleep: -1}
-
-	delay := Delay(initialValue, generator, sleeper)
+	delay := Delay(initialValue, generator)
 
 	if delay.NextWaitTime() != initialValue+toAdd {
 		t.Fatal("NextWaitTime should call the generator")
 	}
 
-	delay.Wait()
-	if sleeper.lastSleep != initialValue+toAdd {
-		t.Fatal("Wait should sleep based on the next wait time generated")
-	}
 }

sleeper.go

-package delay
-
-import "time"
-
-// Sleeper - a generic interface for wrapping a sleep function
-// So that sleeping can be mocked in tests
-type Sleeper interface {
-	Sleep(time.Duration)
-}
-
-type realSleeper struct{}
-
-func (rc *realSleeper) Sleep(d time.Duration) {
-	time.Sleep(d)
-}
-
-// NewRealSleeper - returns a new sleeper that uses the real time.Sleep function
-func NewRealSleeper() Sleeper {
-	return &realSleeper{}
-}