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

fixed typo and tests and update initialize method

Browse Source
This commit is contained in:
Bogdan Fazakas 2021-12-22 17:18:43 +02:00
parent 67eea42290
commit 303d7607c7
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/factories/NFTFactory.ts
View File

@ -33,7 +33,7 @@ export interface TokenOrder {
v: number // v of provider signed message v: number // v of provider signed message
r: string // r of provider signed message r: string // r of provider signed message
s: string // s 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 { export interface NftCreateData {

6
src/provider/Provider.ts
View File

@ -203,7 +203,7 @@ export class Provider {
serviceType: string, serviceType: string,
consumerAddress: string, consumerAddress: string,
providerUri: string, providerUri: string,
fetchMethod: any, getMethod: any,
userCustomParameters?: UserCustomParameters userCustomParameters?: UserCustomParameters
): Promise<string> { ): Promise<string> {
const providerEndpoints = await this.getEndpoints(providerUri) const providerEndpoints = await this.getEndpoints(providerUri)
@ -224,8 +224,8 @@ export class Provider {
if (userCustomParameters) if (userCustomParameters)
initializeUrl += '&userdata=' + encodeURI(JSON.stringify(userCustomParameters)) initializeUrl += '&userdata=' + encodeURI(JSON.stringify(userCustomParameters))
try { try {
const response = await fetchMethod(initializeUrl) const response = await getMethod(initializeUrl)
return await response.text() return await response
} catch (e) { } catch (e) {
LoggerInstance.error(e) LoggerInstance.error(e)
throw new Error('Asset URL not found or not available.') throw new Error('Asset URL not found or not available.')

2
src/tokens/Datatoken.ts
View File

@ -25,7 +25,7 @@ export interface OrderParams {
v: number // v of provider signed message v: number // v of provider signed message
r: string // r of provider signed message r: string // r of provider signed message
s: string // s 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 { export interface DispenserParams {

4
test/unit/NftFactory.test.ts
View File

@ -406,7 +406,7 @@ describe('Nft Factory test', () => {
v: signedMessage.v, v: signedMessage.v,
r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')), r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
s: web3.utils.asciiToHex(signedMessage.s.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, tokenAddress: dtAddress2,
@ -418,7 +418,7 @@ describe('Nft Factory test', () => {
v: signedMessage.v, v: signedMessage.v,
r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')), r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
s: web3.utils.asciiToHex(signedMessage.s.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) console.log('orders', orders)

8
test/unit/tokens/Datatoken.test.ts
View File

@ -405,15 +405,15 @@ describe('Datatoken', () => {
const order: OrderParams = { const order: OrderParams = {
consumer: user1, consumer: user1,
serviceIndex: 1, serviceIndex: 1,
providerFeeAddress: user1, providerFeeAddress: user3,
providerFeeToken: '0x0000000000000000000000000000000000000000', providerFeeToken: '0x0000000000000000000000000000000000000000',
providerFeeAmount: '0', providerFeeAmount: '0',
v: signedMessage.v, v: signedMessage.v,
r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')), r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
s: web3.utils.asciiToHex(signedMessage.s.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( const buyFromDispenseTx = await datatoken.buyFromDispenserAndOrder(
datatokenAddress, datatokenAddress,
nftOwner, nftOwner,
@ -445,7 +445,7 @@ describe('Datatoken', () => {
v: signedMessage.v, v: signedMessage.v,
r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')), r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
s: web3.utils.asciiToHex(signedMessage.s.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 = { const fre: FreOrderParams = {