Merge pull request #44 from Noroth/feature/move-exported-values-to-de…

…fault-function

moves exported default values to function

README.md

@@ -88,19 +88,6 @@ now implement via functions produces Options (aka `retry.OnRetry`)
 
 ## Usage
 
-```go
-var (
-	DefaultAttempts      = uint(10)
-	DefaultDelay         = 100 * time.Millisecond
-	DefaultMaxJitter     = 100 * time.Millisecond
-	DefaultOnRetry       = func(n uint, err error) {}
-	DefaultRetryIf       = IsRecoverable
-	DefaultDelayType     = CombineDelay(BackOffDelay, RandomDelay)
-	DefaultLastErrorOnly = false
-	DefaultContext       = context.Background()
-)
-```
-
 #### func  BackOffDelay
 
 ```go

VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

retry.go

@@ -80,31 +80,11 @@ import (
 // Function signature of retryable function
 type RetryableFunc func() error
 
-var (
-	DefaultAttempts      = uint(10)
-	DefaultDelay         = 100 * time.Millisecond
-	DefaultMaxJitter     = 100 * time.Millisecond
-	DefaultOnRetry       = func(n uint, err error) {}
-	DefaultRetryIf       = IsRecoverable
-	DefaultDelayType     = CombineDelay(BackOffDelay, RandomDelay)
-	DefaultLastErrorOnly = false
-	DefaultContext       = context.Background()
-)
-
 func Do(retryableFunc RetryableFunc, opts ...Option) error {
 	var n uint
 
 	//default
-	config := &Config{
-		attempts:      DefaultAttempts,
-		delay:         DefaultDelay,
-		maxJitter:     DefaultMaxJitter,
-		onRetry:       DefaultOnRetry,
-		retryIf:       DefaultRetryIf,
-		delayType:     DefaultDelayType,
-		lastErrorOnly: DefaultLastErrorOnly,
-		context:       DefaultContext,
-	}
+	config := newDefaultRetryConfig()
 
 	//apply opts
 	for _, opt := range opts {
@@ -167,6 +147,19 @@ func Do(retryableFunc RetryableFunc, opts ...Option) error {
 	return errorLog
 }
 
+func newDefaultRetryConfig() *Config {
+	return &Config{
+		attempts:      uint(10),
+		delay:         100 * time.Millisecond,
+		maxJitter:     100 * time.Millisecond,
+		onRetry:       func(n uint, err error) {},
+		retryIf:       IsRecoverable,
+		delayType:     CombineDelay(BackOffDelay, RandomDelay),
+		lastErrorOnly: false,
+		context:       context.Background(),
+	}
+}
+
 // Error type represents list of errors in retry
 type Error []error
 

retry_test.go

@@ -262,6 +262,7 @@ func TestCombineDelay(t *testing.T) {
 }
 
 func TestContext(t *testing.T) {
+	const defaultDelay = 100 * time.Millisecond
 	t.Run("cancel before", func(t *testing.T) {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
@@ -275,7 +276,7 @@ func TestContext(t *testing.T) {
 		)
 		dur := time.Since(start)
 		assert.Error(t, err)
-		assert.True(t, dur < DefaultDelay, "immediately cancellation")
+		assert.True(t, dur < defaultDelay, "immediately cancellation")
 		assert.Equal(t, 0, retrySum, "called at most once")
 	})