From 6b2900345a55ed6676bed9e6a3087a4257539915 Mon Sep 17 00:00:00 2001
From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com>
Date: Sat, 5 Feb 2022 07:58:35 -0800
Subject: [PATCH] Rename PRICENODE to PRICE_DATA_SERVER

---
 README.md                          |  6 +++---
 backend/mempool-config.sample.json |  2 +-
 backend/src/api/fiat-conversion.ts |  8 ++++----
 backend/src/config.ts              |  8 ++++----
 docker/backend/mempool-config.json |  6 +++---
 docker/backend/start.sh            | 10 +++++-----
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 3dc04b81b..75146d4b1 100644
--- a/README.md
+++ b/README.md
@@ -267,7 +267,7 @@ docker-compose overrides:
 
 JSON:
 ```
-  "PRICENODE": {
+  "PRICE_DATA_SERVER": {
     "TOR_URL": "http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices",
     "CLEARNET_URL": "https://price.bisq.wiz.biz/getAllMarketPrices"
   }
@@ -275,8 +275,8 @@ JSON:
 
 docker-compose overrides:
 ```
-      PRICENODE_TOR_URL: ""
-      PRICENODE_CLEARNET_URL: ""
+      PRICE_DATA_SERVER_TOR_URL: ""
+      PRICE_DATA_SERVER_CLEARNET_URL: ""
 ```
 
 # Manual Installation
diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json
index b9d7fb982..dc0f1a69e 100644
--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -69,7 +69,7 @@
     "USERNAME": "",
     "PASSWORD": ""
   },
-  "PRICENODE": {
+  "PRICE_DATA_SERVER": {
     "TOR_URL": "http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices",
     "CLEARNET_URL": "https://price.bisq.wiz.biz/getAllMarketPrices"
   }
diff --git a/backend/src/api/fiat-conversion.ts b/backend/src/api/fiat-conversion.ts
index df10d7698..be5331d7a 100644
--- a/backend/src/api/fiat-conversion.ts
+++ b/backend/src/api/fiat-conversion.ts
@@ -20,9 +20,9 @@ class FiatConversion {
   public startService() {
     logger.info('Starting currency rates service');
     if (config.SOCKS5PROXY.ENABLED) {
-      logger.info(`Currency rates service will be queried over the Tor network using ${config.PRICENODE.TOR_URL}`);
+      logger.info(`Currency rates service will be queried over the Tor network using ${config.PRICE_DATA_SERVER.TOR_URL}`);
     } else {
-      logger.info(`Currency rates service will be queried over clearnet using ${config.PRICENODE.CLEARNET_URL}`);
+      logger.info(`Currency rates service will be queried over clearnet using ${config.PRICE_DATA_SERVER.CLEARNET_URL}`);
     }
     setInterval(this.updateCurrency.bind(this), 1000 * config.MEMPOOL.PRICE_FEED_UPDATE_INTERVAL);
     this.updateCurrency();
@@ -53,11 +53,11 @@ class FiatConversion {
         }
 
         const agent = new SocksProxyAgent(socksOptions);
-        fiatConversionUrl = config.PRICENODE.TOR_URL;
+        fiatConversionUrl = config.PRICE_DATA_SERVER.TOR_URL;
         logger.info('Querying currency rates service...');
         response = await axios.get(fiatConversionUrl, { httpAgent: agent, headers: headers, timeout: 30000 });
       } else {
-        fiatConversionUrl = config.PRICENODE.CLEARNET_URL;
+        fiatConversionUrl = config.PRICE_DATA_SERVER.CLEARNET_URL;
         logger.info('Querying currency rates service...');
         response = await axios.get(fiatConversionUrl, { headers: headers, timeout: 10000 });
       }
diff --git a/backend/src/config.ts b/backend/src/config.ts
index f2787977b..040d94bf1 100644
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -69,7 +69,7 @@ interface IConfig {
     USERNAME: string;
     PASSWORD: string;
   };
-  PRICENODE: {
+  PRICE_DATA_SERVER: {
     TOR_URL: string;
     CLEARNET_URL: string;
   };
@@ -146,7 +146,7 @@ const defaults: IConfig = {
     'USERNAME': '',
     'PASSWORD': ''
   },
-  "PRICENODE": {
+  "PRICE_DATA_SERVER": {
     'TOR_URL': 'http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices',
     'CLEARNET_URL': 'https://price.bisq.wiz.biz/getAllMarketPrices'
   }
@@ -163,7 +163,7 @@ class Config implements IConfig {
   STATISTICS: IConfig['STATISTICS'];
   BISQ: IConfig['BISQ'];
   SOCKS5PROXY: IConfig['SOCKS5PROXY'];
-  PRICENODE: IConfig['PRICENODE'];
+  PRICE_DATA_SERVER: IConfig['PRICE_DATA_SERVER'];
 
   constructor() {
     const configs = this.merge(configFile, defaults);
@@ -177,7 +177,7 @@ class Config implements IConfig {
     this.STATISTICS = configs.STATISTICS;
     this.BISQ = configs.BISQ;
     this.SOCKS5PROXY = configs.SOCKS5PROXY;
-    this.PRICENODE = configs.PRICENODE;
+    this.PRICE_DATA_SERVER = configs.PRICE_DATA_SERVER;
   }
 
   merge = (...objects: object[]): IConfig => {
diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json
index 5a069455d..b97c9e571 100644
--- a/docker/backend/mempool-config.json
+++ b/docker/backend/mempool-config.json
@@ -66,8 +66,8 @@
     "USERNAME": "__SOCKS5PROXY_USERNAME__",
     "PASSWORD": "__SOCKS5PROXY_PASSWORD__"
   },
-  "PRICENODE": {
-    "TOR_URL": "__PRICENODE_TOR_URL__",
-    "CLEARNET_URL": "__PRICENODE_CLEARNET_URL__"
+  "PRICE_DATA_SERVER": {
+    "TOR_URL": "__PRICE_DATA_SERVER_TOR_URL__",
+    "CLEARNET_URL": "__PRICE_DATA_SERVER_CLEARNET_URL__"
   }
 }
diff --git a/docker/backend/start.sh b/docker/backend/start.sh
index d1422bf45..d12978970 100644
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -68,9 +68,9 @@ __SOCKS5PROXY_PORT__=${SOCKS5PROXY_PORT:=9050}
 __SOCKS5PROXY_USERNAME__=${SOCKS5PROXY_USERNAME:=""}
 __SOCKS5PROXY_PASSWORD__=${SOCKS5PROXY_PASSWORD:=""}
 
-# PRICENODE
-__PRICENODE_TOR_URL__=${PRICENODE_TOR_URL:=http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices}
-__PRICENODE_CLEARNET_URL__=${PRICENODE_CLEARNET_URL:=https://price.bisq.wiz.biz/getAllMarketPrices}
+# PRICE_DATA_SERVER
+__PRICE_DATA_SERVER_TOR_URL__=${PRICE_DATA_SERVER_TOR_URL:=http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices}
+__PRICE_DATA_SERVER_CLEARNET_URL__=${PRICE_DATA_SERVER_CLEARNET_URL:=https://price.bisq.wiz.biz/getAllMarketPrices}
 
 mkdir -p "${__MEMPOOL_CACHE_DIR__}"
 
@@ -132,7 +132,7 @@ sed -i "s/__SOCKS5PROXY_PORT__/${__SOCKS5PROXY_PORT__}/g" mempool-config.json
 sed -i "s/__SOCKS5PROXY_USERNAME__/${__SOCKS5PROXY_USERNAME__}/g" mempool-config.json
 sed -i "s/__SOCKS5PROXY_PASSWORD__/${__SOCKS5PROXY_PASSWORD__}/g" mempool-config.json
 
-sed -i "s!__PRICENODE_TOR_URL__!${__PRICENODE_TOR_URL__}!g" mempool-config.json
-sed -i "s!__PRICENODE_CLEARNET_URL__!${__PRICENODE_CLEARNET_URL__}!g" mempool-config.json
+sed -i "s!__PRICE_DATA_SERVER_TOR_URL__!${__PRICE_DATA_SERVER_TOR_URL__}!g" mempool-config.json
+sed -i "s!__PRICE_DATA_SERVER_CLEARNET_URL__!${__PRICE_DATA_SERVER_CLEARNET_URL__}!g" mempool-config.json
 
 node /backend/dist/index.js