From 07bb1bfde0fe8f0fdf01ba63f793a0decad7cd43 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Tue, 8 Sep 2020 18:58:54 +0200
Subject: [PATCH] refactor config helper

---
 src/utils/ConfigHelper.ts | 84 ++++++++++-----------------------------
 1 file changed, 22 insertions(+), 62 deletions(-)

diff --git a/src/utils/ConfigHelper.ts b/src/utils/ConfigHelper.ts
index e31b3011..f49575f7 100644
--- a/src/utils/ConfigHelper.ts
+++ b/src/utils/ConfigHelper.ts
@@ -1,19 +1,15 @@
-export interface ConfigHelper {
+import Config from '../models/Config'
+
+export interface ConfigHelperConfig extends Config {
   chainId?: number
-  network: string
-  url: string
-  factoryAddress: string
-  poolFactoryAddress: string
-  oceanTokenAddress: string
-  metadataStoreUri: string
-  providerUri: string
+  network: 'mainnet' | 'rinkeby' | 'development' | string
 }
 
-const configs = [
+const configs: ConfigHelperConfig[] = [
   {
-    chaindId: null,
+    chainId: null,
     network: 'development',
-    url: 'http://localhost:8545',
+    nodeUri: 'http://localhost:8545',
     factoryAddress: null,
     metadataStoreUri: 'http://127.0.0.1:5000',
     providerUri: 'http://127.0.0.1:8030',
@@ -23,7 +19,7 @@ const configs = [
   {
     chainId: 4,
     network: 'rinkeby',
-    url: 'https://rinkeby.infura.io/v3',
+    nodeUri: 'https://rinkeby.infura.io/v3',
     factoryAddress: '0x3ECd1429101f93149D799Ef257C07a2B1Dc30897',
     oceanTokenAddress: '0x8967BCF84170c91B0d24D4302C2376283b0B3a07',
     metadataStoreUri: 'https://aquarius.rinkeby.v3.dev-ocean.com',
@@ -34,7 +30,7 @@ const configs = [
   {
     chainId: 1,
     network: 'mainnet',
-    url: 'https://mainnet.infura.io/v3',
+    nodeUri: 'https://mainnet.infura.io/v3',
     factoryAddress: '0x1234',
     oceanTokenAddress: '0x985dd3d42de1e256d09e1c10f112bccb8015ad41',
     metadataStoreUri: null,
@@ -45,59 +41,23 @@ const configs = [
 ]
 
 export class ConfigHelper {
-  public getConfig(network: string, infuraProjectId?: string): ConfigHelper {
-    const confighelp = new ConfigHelper()
-    // fill unknown values
-    confighelp.chainId = null
-    confighelp.factoryAddress = null
-    confighelp.url = null
-    confighelp.network = network
-    confighelp.oceanTokenAddress = null
-    confighelp.metadataStoreUri = null
-    confighelp.providerUri = null
-    confighelp.poolFactoryAddress = null
+  private getNodeUri(config: ConfigHelperConfig, infuraProjectId?: string) {
+    const nodeUri = infuraProjectId
+      ? `${config.nodeUri}/${infuraProjectId}`
+      : config.nodeUri
 
-    const knownconfig = configs.find((c) => c.network === network)
-
-    if (knownconfig) {
-      confighelp.chainId = knownconfig.chainId
-      confighelp.factoryAddress = knownconfig.factoryAddress
-      confighelp.oceanTokenAddress = knownconfig.oceanTokenAddress
-      confighelp.url = `${knownconfig.url}/${infuraProjectId}`
-      confighelp.network = knownconfig.network
-      confighelp.metadataStoreUri = knownconfig.metadataStoreUri
-      confighelp.providerUri = knownconfig.providerUri
-      confighelp.poolFactoryAddress = knownconfig.poolFactoryAddress
-    }
-
-    return confighelp
+    return nodeUri
   }
 
-  public getConfigById(chainId: number, infuraProjectId?: string): ConfigHelper {
-    const confighelp = new ConfigHelper()
-    // fill unknown values
-    confighelp.chainId = chainId
-    confighelp.factoryAddress = null
-    confighelp.url = null
-    confighelp.network = null
-    confighelp.oceanTokenAddress = null
-    confighelp.metadataStoreUri = null
-    confighelp.providerUri = null
-    confighelp.poolFactoryAddress = null
+  public getConfig(network: string, infuraProjectId?: string): ConfigHelperConfig {
+    const knownconfig = configs.find((c) => c.network === network)
+    const nodeUri = this.getNodeUri(knownconfig, infuraProjectId)
+    return knownconfig ? { ...knownconfig, nodeUri } : null
+  }
 
+  public getConfigById(chainId: number, infuraProjectId?: string): ConfigHelperConfig {
     const knownconfig = configs.find((c) => c.chainId === chainId)
-
-    if (knownconfig) {
-      confighelp.chainId = knownconfig.chainId
-      confighelp.factoryAddress = knownconfig.factoryAddress
-      confighelp.oceanTokenAddress = knownconfig.oceanTokenAddress
-      confighelp.url = `${knownconfig.url}/${infuraProjectId}`
-      confighelp.network = knownconfig.network
-      confighelp.metadataStoreUri = knownconfig.metadataStoreUri
-      confighelp.providerUri = knownconfig.providerUri
-      confighelp.poolFactoryAddress = knownconfig.poolFactoryAddress
-    }
-
-    return confighelp
+    const nodeUri = this.getNodeUri(knownconfig, infuraProjectId)
+    return knownconfig ? { ...knownconfig, nodeUri } : null
   }
 }