From db4ee4c01ec3337da1c7695747ef4f6cb0293251 Mon Sep 17 00:00:00 2001 From: Victor Grau Serrat Date: Thu, 1 Feb 2018 23:42:40 -0700 Subject: [PATCH] BLD: check for existence of dataset in ingestion & subscription --- catalyst/marketplace/marketplace.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/catalyst/marketplace/marketplace.py b/catalyst/marketplace/marketplace.py index ced5bfde..a59d5ed7 100644 --- a/catalyst/marketplace/marketplace.py +++ b/catalyst/marketplace/marketplace.py @@ -213,11 +213,18 @@ class Marketplace: def subscribe(self, dataset): + dataset = dataset.lower() + address = self.choose_pubaddr()[0] dataset_info = self.mkt_contract.functions.getDataSource( bytes32(dataset)).call() + if not dataset_info[4]: + print('The requested "{}" dataset is not registered in ' + 'the Data Marketplace.'.format(dataset)) + return + price = dataset_info[1] print('\nThe price for a monthly subscription to this dataset is' @@ -364,6 +371,14 @@ class Marketplace: dataset = dataset.lower() + dataset_info = self.mkt_contract.functions.getDataSource( + bytes32(dataset)).call() + + if not dataset_info[4]: + print('The requested "{}" dataset is not registered in ' + 'the Data Marketplace.'.format(dataset)) + return + address, address_i = self.choose_pubaddr() check_sub = self.mkt_contract.functions.checkAddressSubscription( @@ -551,6 +566,8 @@ class Marketplace: def publish(self, dataset, datadir, watch): + dataset = dataset.lower() + datasource = self.mkt_contract.functions.getDataSource( bytes32(dataset)).call() @@ -607,4 +624,4 @@ class Marketplace: raise MarketplaceHTTPRequest(request='upload file', error=r.json()['error']) - print('Dataset {} published successfully.'.format(dataset)) + print('Dataset {} uploaded successfully.'.format(dataset))