diff --git a/src/factories/NFTFactory.ts b/src/factories/NFTFactory.ts index e89c4760..842dabae 100644 --- a/src/factories/NFTFactory.ts +++ b/src/factories/NFTFactory.ts @@ -33,7 +33,7 @@ export interface TokenOrder { v: number // v of provider signed message r: string // r of provider signed message s: string // s of provider signed message - providerDatas: string // data encoded by provider + providerData: string // data encoded by provider } export interface NftCreateData { diff --git a/src/provider/Provider.ts b/src/provider/Provider.ts index 0fef80b4..fee2a45b 100644 --- a/src/provider/Provider.ts +++ b/src/provider/Provider.ts @@ -203,7 +203,7 @@ export class Provider { serviceType: string, consumerAddress: string, providerUri: string, - fetchMethod: any, + getMethod: any, userCustomParameters?: UserCustomParameters ): Promise { const providerEndpoints = await this.getEndpoints(providerUri) @@ -224,8 +224,8 @@ export class Provider { if (userCustomParameters) initializeUrl += '&userdata=' + encodeURI(JSON.stringify(userCustomParameters)) try { - const response = await fetchMethod(initializeUrl) - return await response.text() + const response = await getMethod(initializeUrl) + return await response } catch (e) { LoggerInstance.error(e) throw new Error('Asset URL not found or not available.') diff --git a/src/tokens/Datatoken.ts b/src/tokens/Datatoken.ts index c2d6873d..1077f1c1 100644 --- a/src/tokens/Datatoken.ts +++ b/src/tokens/Datatoken.ts @@ -25,7 +25,7 @@ export interface OrderParams { v: number // v of provider signed message r: string // r of provider signed message s: string // s of provider signed message - providerDatas: string // data encoded by provider + providerData: string // data encoded by provider } export interface DispenserParams { diff --git a/test/unit/NftFactory.test.ts b/test/unit/NftFactory.test.ts index a1259db3..362769d6 100644 --- a/test/unit/NftFactory.test.ts +++ b/test/unit/NftFactory.test.ts @@ -406,7 +406,7 @@ describe('Nft Factory test', () => { v: signedMessage.v, r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')), s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')), - providerDatas: web3.utils.toHex(web3.utils.asciiToHex(providerData)) + providerData: web3.utils.toHex(web3.utils.asciiToHex(providerData)) }, { tokenAddress: dtAddress2, @@ -418,7 +418,7 @@ describe('Nft Factory test', () => { v: signedMessage.v, r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')), s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')), - providerDatas: web3.utils.toHex(web3.utils.asciiToHex(providerData)) + providerData: web3.utils.toHex(web3.utils.asciiToHex(providerData)) } ] console.log('orders', orders) diff --git a/test/unit/tokens/Datatoken.test.ts b/test/unit/tokens/Datatoken.test.ts index 25c09abc..c168b3b0 100644 --- a/test/unit/tokens/Datatoken.test.ts +++ b/test/unit/tokens/Datatoken.test.ts @@ -405,15 +405,15 @@ describe('Datatoken', () => { const order: OrderParams = { consumer: user1, serviceIndex: 1, - providerFeeAddress: user1, + providerFeeAddress: user3, providerFeeToken: '0x0000000000000000000000000000000000000000', providerFeeAmount: '0', v: signedMessage.v, r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')), s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')), - providerDatas: web3.utils.toHex(web3.utils.asciiToHex(providerData)) + providerData: web3.utils.toHex(web3.utils.asciiToHex(providerData)) } - + console.log('order', order) const buyFromDispenseTx = await datatoken.buyFromDispenserAndOrder( datatokenAddress, nftOwner, @@ -445,7 +445,7 @@ describe('Datatoken', () => { v: signedMessage.v, r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')), s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')), - providerDatas: web3.utils.toHex(web3.utils.asciiToHex(providerData)) + providerData: web3.utils.toHex(web3.utils.asciiToHex(providerData)) } const fre: FreOrderParams = {