Merge pull request #4 from krish8664/remove-subpackages

Moves config and ratelimit to parent package
gojekfarm · May 26, 2017 · 920d7e8 · 920d7e8
2 parents 15f4841 + fd0901f
commit 920d7e8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/config/config.go → config.go b/config/config.go → config.go
@@ -1,4 +1,4 @@
-package config
+package ratelimit
 
 // RateLimitConfig type for setting rate limiting params
 type RateLimitConfig struct {

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,4 +1,4 @@
-package: go-ratelimit
+package: github.com/gojek-engineering/go-ratelimit
 import:
 - package: github.com/garyburd/redigo
   version: ^1.0.0

diff --git a/ratelimit/ratelimit.go → ratelimit.go b/ratelimit/ratelimit.go → ratelimit.go
@@ -2,7 +2,6 @@ package ratelimit
 
 import (
 	"errors"
-	"go-ratelimit/config"
 	"strconv"
 
 	"github.com/garyburd/redigo/redis"
@@ -21,11 +20,11 @@ type RateLimiter interface {
 // RateLimit type for ratelimiting
 type RateLimit struct {
 	redisPool *redis.Pool
-	config    *config.RateLimitConfig
+	config    *RateLimitConfig
 }
 
 // NewRateLimit func to create a new rate limiting type
-func NewRateLimit(redisPool *redis.Pool, config *config.RateLimitConfig) *RateLimit {
+func NewRateLimit(redisPool *redis.Pool, config *RateLimitConfig) *RateLimit {
 	return &RateLimit{
 		redisPool: redisPool,
 		config:    config,

diff --git a/ratelimit/ratelimit_test.go → ratelimit_test.go b/ratelimit/ratelimit_test.go → ratelimit_test.go
@@ -1,7 +1,6 @@
 package ratelimit
 
 import (
-	"go-ratelimit/config"
 	"testing"
 
 	"github.com/garyburd/redigo/redis"
@@ -13,7 +12,7 @@ import (
 type RateLimitSuite struct {
 	suite.Suite
 	redisPool   *redis.Pool
-	redisConfig *config.RateLimitConfig
+	redisConfig *RateLimitConfig
 }
 
 func testRedisPool() *redis.Pool {
@@ -30,7 +29,7 @@ func testRedisPool() *redis.Pool {
 }
 
 func (suite *RateLimitSuite) SetupSuite() {
-	suite.redisConfig = config.NewRateLimitConfig(3, 15, 60)
+	suite.redisConfig = NewRateLimitConfig(3, 15, 60)
 	suite.redisPool = testRedisPool()
 }