Fixed tests failing because of nil telemetry endpoints

ChainSafe · Oct 14, 2021 · e75298c · e75298c
1 parent 8b95797
commit e75298c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 21 deletions.
diff --git a/chain/dev/defaults.go b/chain/dev/defaults.go
@@ -17,6 +17,7 @@
 package dev
 
 import (
+	"github.com/ChainSafe/gossamer/lib/genesis"
 	"github.com/ChainSafe/gossamer/lib/runtime/wasmer"
 	log "github.com/ChainSafe/log15"
 )
@@ -44,6 +45,9 @@ var (
 	// DefaultRetainBlocks is the default retained blocks
 	DefaultRetainBlocks = int64(512)
 
+	// DefaultTelemetryURLs is the default URL of the telemetry server to connect to.
+	DefaultTelemetryURLs = []genesis.TelemetryEndpoint{}
+
 	// InitConfig
 
 	// DefaultGenesis is the default genesis configuration path

diff --git a/chain/kusama/defaults.go b/chain/kusama/defaults.go
@@ -17,6 +17,7 @@
 package kusama
 
 import (
+	"github.com/ChainSafe/gossamer/lib/genesis"
 	"github.com/ChainSafe/gossamer/lib/runtime/wasmer"
 	log "github.com/ChainSafe/log15"
 )
@@ -44,6 +45,9 @@ var (
 	// DefaultRetainBlocks is the default retained blocks
 	DefaultRetainBlocks = int64(512)
 
+	// DefaultTelemetryURLs is the default URL of the telemetry server to connect to.
+	DefaultTelemetryURLs = []genesis.TelemetryEndpoint{}
+
 	// InitConfig
 
 	// DefaultGenesis is the default genesis configuration path

diff --git a/chain/polkadot/defaults.go b/chain/polkadot/defaults.go
@@ -17,6 +17,7 @@
 package polkadot
 
 import (
+	"github.com/ChainSafe/gossamer/lib/genesis"
 	"github.com/ChainSafe/gossamer/lib/runtime/wasmer"
 	log "github.com/ChainSafe/log15"
 )
@@ -41,6 +42,9 @@ var (
 	// DefaultRetainBlocks is the default pruning mode
 	DefaultRetainBlocks = int64(512)
 
+	// DefaultTelemetryURLs is the default URL of the telemetry server to connect to.
+	DefaultTelemetryURLs = []genesis.TelemetryEndpoint{}
+
 	// InitConfig
 
 	// DefaultGenesis is the default genesis configuration path

diff --git a/cmd/gossamer/config_test.go b/cmd/gossamer/config_test.go
@@ -721,6 +721,7 @@ func TestUpdateConfigFromGenesisJSON(t *testing.T) {
 			LogLvl:         testCfg.Global.LogLvl,
 			PublishMetrics: testCfg.Global.PublishMetrics,
 			MetricsPort:    testCfg.Global.MetricsPort,
+			TelemetryURLs:  testCfg.Global.TelemetryURLs,
 		},
 		Log: dot.LogConfig{
 			CoreLvl:           log.LvlInfo,
@@ -774,6 +775,7 @@ func TestUpdateConfigFromGenesisJSON_Default(t *testing.T) {
 			LogLvl:         testCfg.Global.LogLvl,
 			PublishMetrics: testCfg.Global.PublishMetrics,
 			MetricsPort:    testCfg.Global.MetricsPort,
+			TelemetryURLs:  testCfg.Global.TelemetryURLs,
 		},
 		Log: dot.LogConfig{
 			CoreLvl:           log.LvlInfo,
@@ -823,6 +825,7 @@ func TestUpdateConfigFromGenesisData(t *testing.T) {
 			LogLvl:         testCfg.Global.LogLvl,
 			PublishMetrics: testCfg.Global.PublishMetrics,
 			MetricsPort:    testCfg.Global.MetricsPort,
+			TelemetryURLs:  testCfg.Global.TelemetryURLs,
 		},
 		Log: dot.LogConfig{
 			CoreLvl:           log.LvlInfo,

diff --git a/dot/config.go b/dot/config.go
@@ -202,13 +202,14 @@ func GssmrConfig() *Config {
 func KusamaConfig() *Config {
 	return &Config{
 		Global: GlobalConfig{
-			Name:         kusama.DefaultName,
-			ID:           kusama.DefaultID,
-			BasePath:     kusama.DefaultBasePath,
-			LogLvl:       kusama.DefaultLvl,
-			MetricsPort:  kusama.DefaultMetricsPort,
-			RetainBlocks: gssmr.DefaultRetainBlocks,
-			Pruning:      pruner.Mode(gssmr.DefaultPruningMode),
+			Name:          kusama.DefaultName,
+			ID:            kusama.DefaultID,
+			BasePath:      kusama.DefaultBasePath,
+			LogLvl:        kusama.DefaultLvl,
+			MetricsPort:   kusama.DefaultMetricsPort,
+			RetainBlocks:  gssmr.DefaultRetainBlocks,
+			Pruning:       pruner.Mode(gssmr.DefaultPruningMode),
+			TelemetryURLs: kusama.DefaultTelemetryURLs,
 		},
 		Log: LogConfig{
 			CoreLvl:           kusama.DefaultLvl,
@@ -250,13 +251,14 @@ func KusamaConfig() *Config {
 func PolkadotConfig() *Config {
 	return &Config{
 		Global: GlobalConfig{
-			Name:         polkadot.DefaultName,
-			ID:           polkadot.DefaultID,
-			BasePath:     polkadot.DefaultBasePath,
-			LogLvl:       polkadot.DefaultLvl,
-			RetainBlocks: gssmr.DefaultRetainBlocks,
-			Pruning:      pruner.Mode(gssmr.DefaultPruningMode),
-			MetricsPort:  gssmr.DefaultMetricsPort,
+			Name:          polkadot.DefaultName,
+			ID:            polkadot.DefaultID,
+			BasePath:      polkadot.DefaultBasePath,
+			LogLvl:        polkadot.DefaultLvl,
+			RetainBlocks:  gssmr.DefaultRetainBlocks,
+			Pruning:       pruner.Mode(gssmr.DefaultPruningMode),
+			MetricsPort:   gssmr.DefaultMetricsPort,
+			TelemetryURLs: polkadot.DefaultTelemetryURLs,
 		},
 		Log: LogConfig{
 			CoreLvl:           polkadot.DefaultLvl,
@@ -298,13 +300,14 @@ func PolkadotConfig() *Config {
 func DevConfig() *Config {
 	return &Config{
 		Global: GlobalConfig{
-			Name:         dev.DefaultName,
-			ID:           dev.DefaultID,
-			BasePath:     dev.DefaultBasePath,
-			LogLvl:       dev.DefaultLvl,
-			MetricsPort:  dev.DefaultMetricsPort,
-			RetainBlocks: dev.DefaultRetainBlocks,
-			Pruning:      pruner.Mode(dev.DefaultPruningMode),
+			Name:          dev.DefaultName,
+			ID:            dev.DefaultID,
+			BasePath:      dev.DefaultBasePath,
+			LogLvl:        dev.DefaultLvl,
+			MetricsPort:   dev.DefaultMetricsPort,
+			RetainBlocks:  dev.DefaultRetainBlocks,
+			Pruning:       pruner.Mode(dev.DefaultPruningMode),
+			TelemetryURLs: dev.DefaultTelemetryURLs,
 		},
 		Log: LogConfig{
 			CoreLvl:           dev.DefaultLvl,