1
0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00

replae brizo with provider

This commit is contained in:
Ahmed Ali 2020-06-24 15:05:06 +02:00
parent 7d079a07cd
commit 41ed1b576e
5 changed files with 20 additions and 15 deletions

View File

@ -15,10 +15,10 @@ export class Config {
public aquariusUri?: string public aquariusUri?: string
/** /**
* Brizo URL. * Provider URL.
* @type {string} * @type {string}
*/ */
public brizoUri?: string public providerUri?: string
/** /**
* Web3 Provider. * Web3 Provider.

View File

@ -48,7 +48,7 @@ export class Assets extends Instantiable {
* @return {Promise<String>} * @return {Promise<String>}
*/ */
public createSimpleAsset(publisher: Account): 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 jsonBlob = { t: 0, url: publisherURI }
const { datatokens } = this.ocean const { datatokens } = this.ocean
return datatokens.create(JSON.stringify(jsonBlob), publisher) return datatokens.create(JSON.stringify(jsonBlob), publisher)
@ -87,7 +87,7 @@ export class Assets extends Instantiable {
this.logger.log('Encrypting files') this.logger.log('Encrypting files')
observer.next(CreateProgressStep.EncryptingFiles) observer.next(CreateProgressStep.EncryptingFiles)
const encryptedFiles = await this.ocean.brizo.encrypt( const encryptedFiles = await this.ocean.provider.encrypt(
did.getId(), did.getId(),
metadata.main.files, metadata.main.files,
publisher, publisher,
@ -364,7 +364,7 @@ export class Assets extends Instantiable {
return { return {
type: 'access', type: 'access',
index: 2, index: 2,
serviceEndpoint: this.ocean.brizo.getConsumeEndpoint(), serviceEndpoint: this.ocean.provider.getConsumeEndpoint(),
attributes: { attributes: {
main: { main: {
creator: consumerAccount.getId(), creator: consumerAccount.getId(),

View File

@ -8,7 +8,7 @@ import { Versions } from './Versions'
import { OceanUtils } from './utils/Utils' import { OceanUtils } from './utils/Utils'
import { Aquarius } from '../aquarius/Aquarius' import { Aquarius } from '../aquarius/Aquarius'
import { Brizo } from '../brizo/Brizo' import { Provider } from '../provider/Provider'
import { DataTokens } from '../datatokens/Datatokens' import { DataTokens } from '../datatokens/Datatokens'
import { Network } from '../datatokens/Network' import { Network } from '../datatokens/Network'
import { Config } from '../models/Config' import { Config } from '../models/Config'
@ -38,7 +38,7 @@ export class Ocean extends Instantiable {
instance.utils = await OceanUtils.getInstance(instanceConfig) instance.utils = await OceanUtils.getInstance(instanceConfig)
instance.brizo = new Brizo(instanceConfig) instance.provider = new Provider(instanceConfig)
instance.aquarius = new Aquarius( instance.aquarius = new Aquarius(
instanceConfig.config.aquariusUri, instanceConfig.config.aquariusUri,
instanceConfig.logger instanceConfig.logger
@ -59,12 +59,17 @@ export class Ocean extends Instantiable {
return instance return instance
} }
public network: Network
/** /**
* Brizo instance. * Network instance
* @type {Brizo} * @type {Network}
*/ */
public brizo: Brizo public network: Network
/**
* Provider instance.
* @type {Provider}
*/
public provider: Provider
/** /**
* Web3 provider. * Web3 provider.

View File

@ -2,7 +2,7 @@ import Account from '../ocean/Account'
import { noZeroX } from '../utils' import { noZeroX } from '../utils'
import { Instantiable, InstantiableConfig } from '../Instantiable.abstract' import { Instantiable, InstantiableConfig } from '../Instantiable.abstract'
const apiPath = '/api/v1/brizo/services' const apiPath = '/api/v1/service/'
/** /**
* Provides an interface for provider 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 * by the Publishers allowing to them to provide extended
* data services. * data services.
*/ */
export class Brizo extends Instantiable { export class Provider extends Instantiable {
private get url() { private get url() {
return this.config.brizoUri return this.config.providerUri
} }
constructor(config: InstantiableConfig) { constructor(config: InstantiableConfig) {

View File

@ -5,7 +5,7 @@ LoggerInstance.setLevel(LogLevel.Error)
export default { export default {
aquariusUri: 'http://localhost:5000', aquariusUri: 'http://localhost:5000',
brizoUri: 'http://localhost:8030', providerUri: 'http://localhost:8030',
nodeUri: `http://localhost:${process.env.ETH_PORT || 8545}`, nodeUri: `http://localhost:${process.env.ETH_PORT || 8545}`,
parityUri: 'http://localhost:9545', parityUri: 'http://localhost:9545',
secretStoreUri: 'http://localhost:12001', secretStoreUri: 'http://localhost:12001',