CU-3884ybt - Update the name of the payment config item.

Author: fred-yu-2013

config/.env.local

@@ -22,10 +22,10 @@ SENTRY_DSN = https://[email protected]/5
 
 ## payment configuration
 PAYMENT_ENABLED = True
-PAYMENT_PATH = ./payment_config.json
+PAYMENT_CONFIG_PATH = ./payment_config.json
 PAYMENT_CONTRACT_URL = http://127.0.0.1:8545
 PAYMENT_CONTRACT_ADDRESS = 0x5fbdb2315678afecb367f032d93f642f64180aa3
-PAYMENT_ADDRESS = EN9YK69ScA6WFgVQW3UZcmSRLSCStaU2pQ
+PAYMENT_RECEIVING_ADDRESS = EN9YK69ScA6WFgVQW3UZcmSRLSCStaU2pQ
 
 ## using atlast service or mongodb service
 ATLAS_ENABLED = False

config/.env.sample

@@ -22,10 +22,10 @@
 
 ## payment configuration
 # PAYMENT_ENABLED = True
-# PAYMENT_PATH = ./payment_config.json
+# PAYMENT_CONFIG_PATH = ./payment_config.json
 # PAYMENT_CONTRACT_URL = "xxx"
 # PAYMENT_CONTRACT_ADDRESS = "xxx"
-# PAYMENT_ADDRESS =
+# PAYMENT_RECEIVING_ADDRESS =
 
 ## using atlast service or mongodb service
 ATLAS_ENABLED = False

config/.env.testnet config/.env.testnet.deprecated_v1

@@ -21,10 +21,10 @@ SENTRY_ENABLED = False
 
 ## payment configuration
 PAYMENT_ENABLED = True
-PAYMENT_PATH = ./payment_config.json
+PAYMENT_CONFIG_PATH = ./payment_config.json
 PAYMENT_CONTRACT_URL = http://127.0.0.1:8545
 PAYMENT_CONTRACT_ADDRESS = 0x5fbdb2315678afecb367f032d93f642f64180aa3
-PAYMENT_ADDRESS = EN9YK69ScA6WFgVQW3UZcmSRLSCStaU2pQ
+PAYMENT_RECEIVING_ADDRESS = EN9YK69ScA6WFgVQW3UZcmSRLSCStaU2pQ
 
 ## using atlast service or mongodb service
 ATLAS_ENABLED = False

config/.env.travis

@@ -72,15 +72,15 @@ def DID_DATA_CACHE_PATH(self):
         return self.DID_DATA_BASE_DIR + '/cache'
 
     @property
-    def PAYMENT_PATH(self):
-        path = self.env_config('PAYMENT_PATH', default='./payment_config.json', cast=str)
+    def PAYMENT_CONFIG_PATH(self):
+        path = self.env_config('PAYMENT_CONFIG_PATH', default='./payment_config.json', cast=str)
         if path.startswith('/'):
             return path
         return os.path.join(BASE_DIR, path)
 
     @property
-    def PAYMENT_ADDRESS(self):
-        return self.env_config('PAYMENT_ADDRESS', default='EN9YK69ScA6WFgVQW3UZcmSRLSCStaU2pQ', cast=str)
+    def PAYMENT_RECEIVING_ADDRESS(self):
+        return self.env_config('PAYMENT_RECEIVING_ADDRESS', default='EN9YK69ScA6WFgVQW3UZcmSRLSCStaU2pQ', cast=str)
 
     @property
     def MONGODB_URI(self):

hive/settings.py

@@ -14,16 +14,16 @@ class PaymentConfig:
 
     @staticmethod
     def init_config():
-        path = os.path.join(SRC_DIR, hive_setting.PAYMENT_PATH)
+        path = os.path.join(SRC_DIR, hive_setting.PAYMENT_CONFIG_PATH)
         config_file = Path(path)
         if not config_file.exists():
             logging.getLogger('v1 PaymentConfig').info("hive_setting.HIVE_PAYMENT_CONFIG dose not exist")
         else:
-            logging.getLogger('v1 PaymentConfig').info("hive_setting.HIVE_PAYMENT_CONFIG: " + hive_setting.PAYMENT_PATH)
+            logging.getLogger('v1 PaymentConfig').info("hive_setting.HIVE_PAYMENT_CONFIG: " + hive_setting.PAYMENT_CONFIG_PATH)
         with open(path, 'r')as fp:
             json_data = json.load(fp)
             PaymentConfig.config_info = json_data
-            logging.getLogger("Hive Payment").info("Load payment config file:" + hive_setting.PAYMENT_PATH)
+            logging.getLogger("Hive Payment").info("Load payment config file:" + hive_setting.PAYMENT_CONFIG_PATH)
 
     @staticmethod
     def get_all_package_info():

hive/util/payment/payment_config.py

@@ -40,10 +40,10 @@ def before_request():
     if request.method == "OPTIONS":
         # return None to let CORS handle OPTIONS
         return
-    # elif request.method == '""OPTIONS':
-    #     # for hive js demo local connecting, its maybe ionic bug
-    #     request.method = 'OPTIONS'
-    #     return '{}'
+    elif request.method == '""OPTIONS':
+        # for hive js demo local connecting, its maybe ionic bug
+        request.method = 'OPTIONS'
+        return '{}'
 
     # Sets the "wsgi.input_terminated" environment flag, thus enabling
     # Werkzeug to pass chunked requests as streams; this makes the API

src/__init__.py

@@ -140,7 +140,7 @@ def to_get_orders(self):
 
 class OrderManager:
     def __init__(self):
-        self.ela_address = hive_setting.PAYMENT_ADDRESS
+        self.ela_address = hive_setting.PAYMENT_RECEIVING_ADDRESS
         self.mcli = MongodbClient()
         self.vault_manager = VaultManager()
         self.backup_manager = BackupManager()

src/modules/payment/order.py

@@ -22,7 +22,7 @@
 
 class Payment(metaclass=Singleton):
     def __init__(self):
-        self.ela_address = hive_setting.PAYMENT_ADDRESS
+        self.ela_address = hive_setting.PAYMENT_RECEIVING_ADDRESS
         self.auth = Auth()
         self.vault_subscription = None
         self.vault_manager = VaultManager()

src/modules/payment/payment.py

@@ -90,8 +90,8 @@ def PAYMENT_ENABLED(self):
         return self.env_config('PAYMENT_ENABLED', default='True', cast=bool)
 
     @property
-    def PAYMENT_PATH(self):
-        path = self.env_config('PAYMENT_PATH', default='./payment_config.json', cast=str)
+    def PAYMENT_CONFIG_PATH(self):
+        path = self.env_config('PAYMENT_CONFIG_PATH', default='./payment_config.json', cast=str)
         if path.startswith('/'):
             return path
         return os.path.join(BASE_DIR, path)
@@ -105,8 +105,8 @@ def PAYMENT_CONTRACT_ADDRESS(self):
         return self.env_config('PAYMENT_CONTRACT_ADDRESS', default='', cast=str)
 
     @property
-    def PAYMENT_ADDRESS(self):
-        return self.env_config('PAYMENT_ADDRESS', default='EN9YK69ScA6WFgVQW3UZcmSRLSCStaU2pQ', cast=str)
+    def PAYMENT_RECEIVING_ADDRESS(self):
+        return self.env_config('PAYMENT_RECEIVING_ADDRESS', default='EN9YK69ScA6WFgVQW3UZcmSRLSCStaU2pQ', cast=str)
 
     @property
     def ATLAS_ENABLED(self):

src/settings.py

@@ -11,15 +11,15 @@ class PaymentConfig:
 
     @staticmethod
     def init_config():
-        config_file = Path(hive_setting.PAYMENT_PATH)
+        config_file = Path(hive_setting.PAYMENT_CONFIG_PATH)
         if not config_file.exists():
             logging.getLogger('PaymentConfig').info("hive_setting.HIVE_PAYMENT_CONFIG dose not exist")
         else:
-            logging.getLogger('PaymentConfig').info("hive_setting.HIVE_PAYMENT_CONFIG: " + hive_setting.PAYMENT_PATH)
-        with open(hive_setting.PAYMENT_PATH, 'r')as fp:
+            logging.getLogger('PaymentConfig').info("hive_setting.HIVE_PAYMENT_CONFIG: " + hive_setting.PAYMENT_CONFIG_PATH)
+        with open(hive_setting.PAYMENT_CONFIG_PATH, 'r')as fp:
             json_data = json.load(fp)
             PaymentConfig.config_info = json_data
-            logging.getLogger("PaymentConfig").info("Load payment config file:" + hive_setting.PAYMENT_PATH)
+            logging.getLogger("PaymentConfig").info("Load payment config file:" + hive_setting.PAYMENT_CONFIG_PATH)
 
     @staticmethod
     def get_all_package_info():