From f9c5b7bd493da4044c79aaf3b52f413d26e253cc Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Tue, 30 Jun 2020 11:37:03 +0200 Subject: [PATCH] fix initialize --- src/ocean/Assets.ts | 4 +--- src/provider/Provider.ts | 22 +++++++++------------- test/integration/Marketplaceflow.test.ts | 9 +-------- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/src/ocean/Assets.ts b/src/ocean/Assets.ts index 5f7d3322..5d6b541a 100644 --- a/src/ocean/Assets.ts +++ b/src/ocean/Assets.ts @@ -386,10 +386,8 @@ export class Assets extends Instantiable { public async order( did: string, serviceType: string, - tokenAddress, consumerAddress: string - ): Promise { - // provider.initialize + ): Promise { const service = await this.getService(did, serviceType) return await this.ocean.provider.initialize( did, diff --git a/src/provider/Provider.ts b/src/provider/Provider.ts index 05bb3f61..e989395a 100644 --- a/src/provider/Provider.ts +++ b/src/provider/Provider.ts @@ -69,7 +69,7 @@ export class Provider extends Instantiable { serviceIndex: number, serviceType: string, consumerAddress: string - ): Promise { + ): Promise { let DDO try { DDO = await this.ocean.assets.resolve(did) @@ -78,20 +78,16 @@ export class Provider extends Instantiable { throw new Error('Failed to resolve DID') } - const args = { - documentId: did, - serviceId: serviceIndex, - serviceType: serviceType, - tokenAddress: DDO.dataToken, - consumerAddress: consumerAddress - } - console.log(args) + let initializeUrl = this.getInitializeEndpoint() + initializeUrl += `?documentId=${did}` + initializeUrl += `&serviceId=${serviceIndex}` + initializeUrl += `&serviceType=${serviceType}` + initializeUrl += `&tokenAddress=${DDO.dataToken}` + initializeUrl += `&consumerAddress=${consumerAddress}` try { - return await this.ocean.utils.fetch.post( - this.getInitializeEndpoint(), - decodeURI(JSON.stringify(args)) - ) + const response = await this.ocean.utils.fetch.get(initializeUrl) + return await response.text() } catch (e) { this.logger.error(e) throw new Error('HTTP request failed') diff --git a/test/integration/Marketplaceflow.test.ts b/test/integration/Marketplaceflow.test.ts index c117f5fe..cb78b78d 100644 --- a/test/integration/Marketplaceflow.test.ts +++ b/test/integration/Marketplaceflow.test.ts @@ -159,14 +159,7 @@ describe('Marketplace flow', () => { }) it('Bob consumes asset 1', async () => { - console.log( - await ocean.assets.order( - ddo.id, - accessService.type, - ddo.dataToken, - bob.getId() - ) - ) + console.log(await ocean.assets.order(ddo.id, accessService.type, bob.getId())) // await ocean.assets.download(tokenAddress, accessService.serviceEndpoint, accessService.index, bob.getId(), '~/my-datasets') }) })