mirror of
https://github.com/oceanprotocol/ocean.js.git
synced 2024-11-26 20:39:05 +01:00
fix initialize
This commit is contained in:
parent
2219d183f6
commit
f9c5b7bd49
@ -386,10 +386,8 @@ export class Assets extends Instantiable {
|
||||
public async order(
|
||||
did: string,
|
||||
serviceType: string,
|
||||
tokenAddress,
|
||||
consumerAddress: string
|
||||
): Promise<void> {
|
||||
// provider.initialize
|
||||
): Promise<string> {
|
||||
const service = await this.getService(did, serviceType)
|
||||
return await this.ocean.provider.initialize(
|
||||
did,
|
||||
|
@ -69,7 +69,7 @@ export class Provider extends Instantiable {
|
||||
serviceIndex: number,
|
||||
serviceType: string,
|
||||
consumerAddress: string
|
||||
): Promise<any> {
|
||||
): Promise<string> {
|
||||
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')
|
||||
|
@ -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')
|
||||
})
|
||||
})
|
||||
|
Loading…
x
Reference in New Issue
Block a user