From 764db984177fb7aaa18fafa36e79cbc9371849c1 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@eossweden.org>
Date: Wed, 8 Mar 2023 14:04:20 +0100
Subject: [PATCH] config/config.go: Use redis and telegram config from
 app/serivce packages.

---
 config/config.go      | 30 +++++++-----------------------
 config/config_test.go | 13 +++++--------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/config/config.go b/config/config.go
index 11d4540..b9d53b8 100644
--- a/config/config.go
+++ b/config/config.go
@@ -3,36 +3,25 @@ package config
 import (
 	"encoding/json"
 	"io/ioutil"
+
+	"eosio-ship-trace-reader/app/service/redis"
+	"eosio-ship-trace-reader/app/service/telegram"
 )
 
 const NULL_BLOCK_NUMBER uint32 = 0xffffffff
 
-type RedisConfig struct {
-	Addr     string `json:"addr"`
-	Password string `json:"password"`
-	DB       int    `json:"db"`
-	CacheID  string `json:"cache_id"`
-	Prefix   string `json:"prefix"`
-}
-
-type TelegramConfig struct {
-	Id      string `json:"id"`
-	Channel int64  `json:"channel"`
-}
-
 type Config struct {
 	Name    string `json:"name"`
 	ShipApi string `json:"ship_api"`
 	Api     string `json:"api"`
 
-	Redis RedisConfig `json:"redis"`
-
-	Telegram TelegramConfig `json:"telegram"`
-
 	IrreversibleOnly    bool   `json:"irreversible_only"`
 	MaxMessagesInFlight uint32 `json:"max_messages_in_flight"`
 	StartBlockNum       uint32 `json:"start_block_num"`
 	EndBlockNum         uint32 `json:"end_block_num"`
+
+	Redis    redis.Config    `json:"redis"`
+	Telegram telegram.Config `json:"telegram"`
 }
 
 func Parse(data []byte) (*Config, error) {
@@ -41,12 +30,7 @@ func Parse(data []byte) (*Config, error) {
 		EndBlockNum:         NULL_BLOCK_NUMBER,
 		MaxMessagesInFlight: 10,
 		IrreversibleOnly:    false,
-		Redis: RedisConfig{
-			Addr:     "localhost:6379",
-			Password: "",
-			DB:       0,
-			Prefix:   "ship",
-		},
+		Redis:               redis.DefaultConfig,
 	}
 
 	err := json.Unmarshal(data, &cfg)
diff --git a/config/config_test.go b/config/config_test.go
index 9874ea9..593bb03 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -3,6 +3,8 @@ package config
 import (
 	"testing"
 
+	"eosio-ship-trace-reader/app/service/redis"
+	"eosio-ship-trace-reader/app/service/telegram"
 	"github.com/stretchr/testify/require"
 )
 
@@ -12,12 +14,7 @@ func TestParse_Default(t *testing.T) {
 		EndBlockNum:         NULL_BLOCK_NUMBER,
 		MaxMessagesInFlight: 10,
 		IrreversibleOnly:    false,
-		Redis: RedisConfig{
-			Addr:     "localhost:6379",
-			Password: "",
-			DB:       0,
-			Prefix:   "ship",
-		},
+		Redis:               redis.DefaultConfig,
 	}
 
 	cfg, err := Parse([]byte(`{}`))
@@ -34,11 +31,11 @@ func TestParse(t *testing.T) {
 		EndBlockNum:         23872222,
 		IrreversibleOnly:    true,
 		MaxMessagesInFlight: 1337,
-		Telegram: TelegramConfig{
+		Telegram: telegram.Config{
 			Id:      "110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsaw",
 			Channel: -123456789,
 		},
-		Redis: RedisConfig{
+		Redis: redis.Config{
 			Addr:     "localhost:6379",
 			Password: "passwd",
 			DB:       4,