From 1759ecbc8f3bc98f671f4a34129cb9fd99b1c030 Mon Sep 17 00:00:00 2001
From: ChronosX88 <chronosx88@gmail.com>
Date: Wed, 26 May 2021 23:59:05 +0300
Subject: [PATCH] Add blockchain config to Config struct

---
 config/config.go | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/config/config.go b/config/config.go
index 2c25fa9..8f51f52 100644
--- a/config/config.go
+++ b/config/config.go
@@ -7,18 +7,19 @@ import (
 )
 
 type Config struct {
-	ListenPort            int            `mapstructure:"listen_port"`
-	ListenAddr            string         `mapstructure:"listen_addr"`
-	IsBootstrap           bool           `mapstructure:"is_bootstrap"`
-	BootstrapNodes        []string       `mapstructure:"bootstrap_node_multiaddr"`
-	Rendezvous            string         `mapstructure:"rendezvous"`
-	Ethereum              EthereumConfig `mapstructure:"ethereum"`
-	Filecoin              FilecoinConfig `mapstructure:"filecoin"`
-	PubSub                PubSubConfig   `mapstructure:"pubSub"`
-	Store                 StoreConfig    `mapstructure:"store"`
-	ConsensusMinApprovals int            `mapstructure:"consensus_min_approvals"`
-	Redis                 RedisConfig    `mapstructure:"redis"`
-	CacheType             string         `mapstructure:"cache_type"`
+	ListenPort            int              `mapstructure:"listen_port"`
+	ListenAddr            string           `mapstructure:"listen_addr"`
+	IsBootstrap           bool             `mapstructure:"is_bootstrap"`
+	BootstrapNodes        []string         `mapstructure:"bootstrap_node_multiaddr"`
+	Rendezvous            string           `mapstructure:"rendezvous"`
+	Ethereum              EthereumConfig   `mapstructure:"ethereum"`
+	Filecoin              FilecoinConfig   `mapstructure:"filecoin"`
+	PubSub                PubSubConfig     `mapstructure:"pubsub"`
+	Store                 StoreConfig      `mapstructure:"store"`
+	ConsensusMinApprovals int              `mapstructure:"consensus_min_approvals"`
+	Redis                 RedisConfig      `mapstructure:"redis"`
+	CacheType             string           `mapstructure:"cache_type"`
+	Blockchain            BlockchainConfig `mapstructure:"blockchain"`
 }
 
 type EthereumConfig struct {
@@ -39,8 +40,7 @@ type FilecoinConfig struct {
 }
 
 type PubSubConfig struct {
-	ProtocolID       string `mapstructure:"protocolID"`
-	ServiceTopicName string `mapstructure:"serviceTopicName"`
+	ServiceTopicName string `mapstructure:"service_topic_name"`
 }
 
 type StoreConfig struct {
@@ -53,6 +53,10 @@ type RedisConfig struct {
 	DB       int    `mapstructure:"redis_db"`
 }
 
+type BlockchainConfig struct {
+	DatabasePath string `mapstructure:"database_path"`
+}
+
 // NewConfig creates a new config based on default values or provided .env file
 func NewConfig(configPath string) (*Config, error) {
 	dbName := "dione"
@@ -64,12 +68,12 @@ func NewConfig(configPath string) (*Config, error) {
 		ListenAddr:     "localhost",
 		ListenPort:     8000,
 		BootstrapNodes: []string{"/ip4/127.0.0.1/tcp/0"},
-		Rendezvous:     "filecoin-p2p-oracle",
+		Rendezvous:     "dione",
 		Ethereum: EthereumConfig{
 			PrivateKey: "",
 		},
 		PubSub: PubSubConfig{
-			ProtocolID: "p2p-oracle",
+			ServiceTopicName: "dione",
 		},
 		Store: StoreConfig{
 			DatabaseURL: dbURL,