diff --git a/internal/config/builder.go b/internal/config/builder.go index d2ab2bf..6a55976 100644 --- a/internal/config/builder.go +++ b/internal/config/builder.go @@ -81,7 +81,7 @@ func (b *Builder) Build() (*Config, error) { return nil, errors.New("Config not set") } - conf := New() + conf := Config{} v := viper.New() v.SetConfigType("yaml") diff --git a/internal/config/config.go b/internal/config/config.go index 8edacdb..41777df 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,11 +1,7 @@ package config import ( - "time" - "github.com/eosswedenorg/thalos/internal/log" - - shipclient "github.com/eosswedenorg-go/antelope-ship-client" ) type RedisConfig struct { @@ -42,24 +38,3 @@ type Config struct { Telegram TelegramConfig `yaml:"telegram" mapstructure:"telegram"` } - -// Create a new Config object with default values -func New() Config { - return Config{ - MessageCodec: "json", - Log: log.Config{ - MaxFileSize: 10 * 1000 * 1000, // 10 mb - MaxTime: time.Hour * 24, - }, - Ship: ShipConfig{ - StartBlockNum: shipclient.NULL_BLOCK_NUMBER, - EndBlockNum: shipclient.NULL_BLOCK_NUMBER, - MaxMessagesInFlight: 10, - IrreversibleOnly: false, - }, - Redis: RedisConfig{ - Addr: "localhost:6379", - Prefix: "ship", - }, - } -} diff --git a/internal/config/config_test.go b/internal/config/config_test.go deleted file mode 100644 index c919a18..0000000 --- a/internal/config/config_test.go +++ /dev/null @@ -1,38 +0,0 @@ -package config - -import ( - "testing" - "time" - - "github.com/eosswedenorg/thalos/internal/log" - "github.com/stretchr/testify/require" - - shipclient "github.com/eosswedenorg-go/antelope-ship-client" -) - -func TestNew(t *testing.T) { - expected := Config{ - MessageCodec: "json", - - Log: log.Config{ - MaxFileSize: 10 * 1000 * 1000, // 10 mb - MaxTime: time.Hour * 24, - }, - - Ship: ShipConfig{ - StartBlockNum: shipclient.NULL_BLOCK_NUMBER, - EndBlockNum: shipclient.NULL_BLOCK_NUMBER, - MaxMessagesInFlight: 10, - IrreversibleOnly: false, - }, - - Redis: RedisConfig{ - Addr: "localhost:6379", - Password: "", - DB: 0, - Prefix: "ship", - }, - } - - require.Equal(t, expected, New()) -}