merge api/redis_common and api/redis_pubsub to api/redis

api/redis/key.go

@@ -1,4 +1,4 @@
-package redis_common
+package redis
 
 import (
 	"fmt"

api/redis/key_test.go

@@ -1,4 +1,4 @@
-package redis_common
+package redis
 
 import (
 	"testing"

api/redis/namespace.go

@@ -1,4 +1,4 @@
-package redis_common
+package redis
 
 import (
 	"strings"

api/redis/namespace_test.go

@@ -1,4 +1,4 @@
-package redis_common
+package redis
 
 import "testing"
 

api/redis/publisher.go

@@ -1,10 +1,9 @@
-package redis_pubsub
+package redis
 
 import (
 	"context"
 
 	"thalos/api"
-	. "thalos/api/redis_common"
 
 	"github.com/go-redis/redis/v8"
 )

api/redis/publisher_test.go

@@ -1,10 +1,9 @@
-package redis_pubsub
+package redis
 
 import (
 	"testing"
 
 	"thalos/api"
-	. "thalos/api/redis_common"
 
 	"github.com/go-redis/redismock/v8"
 	"github.com/stretchr/testify/assert"

api/redis/subscriber.go

@@ -1,4 +1,4 @@
-package redis_pubsub
+package redis
 
 import (
 	"context"
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"thalos/api"
-	. "thalos/api/redis_common"
 
 	"github.com/go-redis/redis/v8"
 )

api/redis/subscriber_test.go

@@ -1,11 +1,10 @@
-package redis_pubsub
+package redis
 
 import (
 	"testing"
 	"time"
 
 	"thalos/api"
-	. "thalos/api/redis_common"
 
 	"github.com/alicebob/miniredis/v2"
 	"github.com/go-redis/redis/v8"

cmd/main/main.go

@@ -12,10 +12,9 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"thalos/abi"
+	api_redis "thalos/api/redis"
 	"thalos/app"
 	"thalos/config"
-	"thalos/transport/redis_common"
-	"thalos/transport/redis_pubsub"
 
 	"github.com/nikoksr/notify"
 	"github.com/nikoksr/notify/service/telegram"
@@ -190,7 +189,7 @@ func main() {
 
 	processor := app.SpawnProccessor(
 		shClient,
-		redis_pubsub.NewPublisher(rdb, redis_common.Namespace{
+		api_redis.NewPublisher(rdb, api_redis.Namespace{
 			Prefix:  conf.Redis.Prefix,
 			ChainID: chainInfo.ChainID.String(),
 		}),