Upstream sync

config/config.go

@@ -20,11 +20,12 @@ func Load() error {
 	}
 
 	AppConfig = Config{
-		
+
 		Service: Service{
 			// 9000 DEFAULT FOR DEV ENVIRONMENT
-			Port:        getEnv("NOVATECH_SERVICE_PORT", "9000"),
-			Environment: getEnv("NOVATECH_SERVICE_ENVIRONMENT", "DEV"),
+			Port:             getEnv("NOVATECH_SERVICE_PORT", "9000"),
+			Environment:      getEnv("NOVATECH_SERVICE_ENVIRONMENT", "DEV"),
+			BlockchainSecret: getEnv("NOVATECH_SERVICE_BLOCKCHAIN_SECRET", "novatech_service_blockchain_secret"),
 		},
 		AdminService: Service{
 			// 8080 DEFAULT FOR DEV ENVIRONMENT
@@ -32,14 +33,12 @@ func Load() error {
 			Environment: getEnv("NOVATECH_ADMIN_SERVICE_ENVIRONMENT", "DEV"),
 		},
 		Database: Database{
-			UserName:         getEnv("NOVATECH_DATABASE_USERNAME", "root"),
-			Password:         getEnv("NOVATECH_DATABASE_PASSWORD", "root"),
-			DatabaseName:             getEnv("NOVATECH_DATABASE_NAME", "postgres"),
-			HostName:          getEnv("NOVATECH_DATABASE_ADDRESS", "localhost"),
-			Port:             getEnv("NOVATECH_DATABASE_PORT", " "),
-			
+			UserName:     getEnv("NOVATECH_DATABASE_USERNAME", "root"),
+			Password:     getEnv("NOVATECH_DATABASE_PASSWORD", "root"),
+			DatabaseName: getEnv("NOVATECH_DATABASE_NAME", "postgres"),
+			HostName:     getEnv("NOVATECH_DATABASE_ADDRESS", "localhost"),
+			Port:         getEnv("NOVATECH_DATABASE_PORT", " "),
 		},
-		
 	}
 
 	return nil

config/models.go

@@ -2,25 +2,24 @@ package config
 
 // Config stores application configuration
 type Config struct {
-	Service                       Service
-	AdminService                  Service
-	Database                      Database
+	Service      Service
+	AdminService Service
+	Database     Database
 }
 
-
 // Service contains configuration for service
 type Service struct {
-	Port        string
-	Environment string
-	WebPageURL  string
+	Port             string
+	Environment      string
+	WebPageURL       string
+	BlockchainSecret string
 }
 
 // Database configuration
 type Database struct {
-	UserName         string
-	Password         string
-	DatabaseName             string
-	HostName          string
-	Port             string
+	UserName     string
+	Password     string
+	DatabaseName string
+	HostName     string
+	Port         string
 }
-