From c26d78cf0556a5807409deec1e55f20cd2ab001d Mon Sep 17 00:00:00 2001 From: Victor Grau Serrat Date: Tue, 30 Jan 2018 11:20:06 -0700 Subject: [PATCH] BLD: set AUTH_SERVER as a Catalyst constant --- catalyst/constants.py | 2 ++ catalyst/marketplace/marketplace.py | 4 +--- catalyst/marketplace/utils/auth_utils.py | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/catalyst/constants.py b/catalyst/constants.py index 5668bc83..abfa1974 100644 --- a/catalyst/constants.py +++ b/catalyst/constants.py @@ -21,3 +21,5 @@ except Exception as e: print('unable to get catalyst path: {}'.format(e)) AUTO_INGEST = False + +AUTH_SERVER = 'https://data.enigma.co' diff --git a/catalyst/marketplace/marketplace.py b/catalyst/marketplace/marketplace.py index af4c4aef..bbd0be9f 100644 --- a/catalyst/marketplace/marketplace.py +++ b/catalyst/marketplace/marketplace.py @@ -14,7 +14,7 @@ import six import requests from web3 import Web3, HTTPProvider -from catalyst.constants import LOG_LEVEL +from catalyst.constants import LOG_LEVEL, AUTH_SERVER from catalyst.exchange.utils.stats_utils import set_print_settings from catalyst.marketplace.marketplace_errors import ( MarketplacePubAddressEmpty, MarketplaceDatasetNotFound, @@ -43,8 +43,6 @@ CONTRACT_PATH = 'https://raw.githubusercontent.com/enigmampc/catalyst/' \ CONTRACT_ABI = 'https://raw.githubusercontent.com/enigmampc/catalyst/' \ 'data-marketplace/catalyst/marketplace/contract_abi.json' -AUTH_SERVER = 'http://localhost:5000' - log = logbook.Logger('Marketplace', level=LOG_LEVEL) diff --git a/catalyst/marketplace/utils/auth_utils.py b/catalyst/marketplace/utils/auth_utils.py index f1193758..35fa3504 100644 --- a/catalyst/marketplace/utils/auth_utils.py +++ b/catalyst/marketplace/utils/auth_utils.py @@ -4,8 +4,7 @@ from catalyst.marketplace.marketplace_errors import ( MarketplaceHTTPRequest) from catalyst.marketplace.utils.path_utils import ( get_user_pubaddr, save_user_pubaddr) - -AUTH_SERVER = 'http://localhost:5000' +from catalyst.constants import AUTH_SERVER def get_key_secret(pubAddr, dataset):