From 41ed1b576e061382620886802c8645ea3f5bfeca Mon Sep 17 00:00:00 2001
From: Ahmed Ali <ahmedaabdulwahed@gmail.com>
Date: Wed, 24 Jun 2020 15:05:06 +0200
Subject: [PATCH] replae brizo with provider

---
 src/models/Config.ts                         |  4 ++--
 src/ocean/Assets.ts                          |  6 +++---
 src/ocean/Ocean.ts                           | 17 +++++++++++------
 src/{brizo/Brizo.ts => provider/Provider.ts} |  6 +++---
 test/unit/config.ts                          |  2 +-
 5 files changed, 20 insertions(+), 15 deletions(-)
 rename src/{brizo/Brizo.ts => provider/Provider.ts} (95%)

diff --git a/src/models/Config.ts b/src/models/Config.ts
index b015a300..f2305949 100644
--- a/src/models/Config.ts
+++ b/src/models/Config.ts
@@ -15,10 +15,10 @@ export class Config {
     public aquariusUri?: string
 
     /**
-     * Brizo URL.
+     * Provider URL.
      * @type {string}
      */
-    public brizoUri?: string
+    public providerUri?: string
 
     /**
      * Web3 Provider.
diff --git a/src/ocean/Assets.ts b/src/ocean/Assets.ts
index 088ebd55..082303bf 100644
--- a/src/ocean/Assets.ts
+++ b/src/ocean/Assets.ts
@@ -48,7 +48,7 @@ export class Assets extends Instantiable {
      * @return {Promise<String>}
      */
     public createSimpleAsset(publisher: Account): Promise<string> {
-        const publisherURI = this.ocean.brizo.getURI()
+        const publisherURI = this.ocean.provider.getURI()
         const jsonBlob = { t: 0, url: publisherURI }
         const { datatokens } = this.ocean
         return datatokens.create(JSON.stringify(jsonBlob), publisher)
@@ -87,7 +87,7 @@ export class Assets extends Instantiable {
 
             this.logger.log('Encrypting files')
             observer.next(CreateProgressStep.EncryptingFiles)
-            const encryptedFiles = await this.ocean.brizo.encrypt(
+            const encryptedFiles = await this.ocean.provider.encrypt(
                 did.getId(),
                 metadata.main.files,
                 publisher,
@@ -364,7 +364,7 @@ export class Assets extends Instantiable {
         return {
             type: 'access',
             index: 2,
-            serviceEndpoint: this.ocean.brizo.getConsumeEndpoint(),
+            serviceEndpoint: this.ocean.provider.getConsumeEndpoint(),
             attributes: {
                 main: {
                     creator: consumerAccount.getId(),
diff --git a/src/ocean/Ocean.ts b/src/ocean/Ocean.ts
index b7a033aa..09fe2efd 100644
--- a/src/ocean/Ocean.ts
+++ b/src/ocean/Ocean.ts
@@ -8,7 +8,7 @@ import { Versions } from './Versions'
 import { OceanUtils } from './utils/Utils'
 
 import { Aquarius } from '../aquarius/Aquarius'
-import { Brizo } from '../brizo/Brizo'
+import { Provider } from '../provider/Provider'
 import { DataTokens } from '../datatokens/Datatokens'
 import { Network } from '../datatokens/Network'
 import { Config } from '../models/Config'
@@ -38,7 +38,7 @@ export class Ocean extends Instantiable {
 
         instance.utils = await OceanUtils.getInstance(instanceConfig)
 
-        instance.brizo = new Brizo(instanceConfig)
+        instance.provider = new Provider(instanceConfig)
         instance.aquarius = new Aquarius(
             instanceConfig.config.aquariusUri,
             instanceConfig.logger
@@ -59,12 +59,17 @@ export class Ocean extends Instantiable {
         return instance
     }
 
-    public network: Network
     /**
-     * Brizo instance.
-     * @type {Brizo}
+     * Network instance
+     * @type {Network}
      */
-    public brizo: Brizo
+    public network: Network
+
+    /**
+     * Provider instance.
+     * @type {Provider}
+     */
+    public provider: Provider
 
     /**
      * Web3 provider.
diff --git a/src/brizo/Brizo.ts b/src/provider/Provider.ts
similarity index 95%
rename from src/brizo/Brizo.ts
rename to src/provider/Provider.ts
index 6dc55aa0..762d6179 100644
--- a/src/brizo/Brizo.ts
+++ b/src/provider/Provider.ts
@@ -2,7 +2,7 @@ import Account from '../ocean/Account'
 import { noZeroX } from '../utils'
 import { Instantiable, InstantiableConfig } from '../Instantiable.abstract'
 
-const apiPath = '/api/v1/brizo/services'
+const apiPath = '/api/v1/service/'
 
 /**
  * Provides an interface for provider service.
@@ -10,9 +10,9 @@ const apiPath = '/api/v1/brizo/services'
  * by the Publishers allowing to them to provide extended
  * data services.
  */
-export class Brizo extends Instantiable {
+export class Provider extends Instantiable {
     private get url() {
-        return this.config.brizoUri
+        return this.config.providerUri
     }
 
     constructor(config: InstantiableConfig) {
diff --git a/test/unit/config.ts b/test/unit/config.ts
index aaf62df9..74cb8293 100644
--- a/test/unit/config.ts
+++ b/test/unit/config.ts
@@ -5,7 +5,7 @@ LoggerInstance.setLevel(LogLevel.Error)
 
 export default {
     aquariusUri: 'http://localhost:5000',
-    brizoUri: 'http://localhost:8030',
+    providerUri: 'http://localhost:8030',
     nodeUri: `http://localhost:${process.env.ETH_PORT || 8545}`,
     parityUri: 'http://localhost:9545',
     secretStoreUri: 'http://localhost:12001',