mirror of
https://github.com/oceanprotocol/ocean.js.git
synced 2024-11-26 20:39:05 +01:00
rename erc20Params to datatokenParams
This commit is contained in:
parent
6287005473
commit
71390cf862
@ -252,7 +252,7 @@ For pool creation, the OCEAN token is used as the base token. The base token can
|
|||||||
owner: publisherAccount
|
owner: publisherAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
const erc20Params: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -294,7 +294,7 @@ Now we can make the contract call
|
|||||||
const tx = await factory.createNftErc20WithPool(
|
const tx = await factory.createNftErc20WithPool(
|
||||||
publisherAccount,
|
publisherAccount,
|
||||||
nftParams,
|
nftParams,
|
||||||
erc20Params,
|
datatokenParams,
|
||||||
poolParams
|
poolParams
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -526,7 +526,7 @@ Now let's console log the Consumer balance after order to check everything is wo
|
|||||||
owner: publisherAccount
|
owner: publisherAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
const erc20Params: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -552,7 +552,7 @@ Now let's console log the Consumer balance after order to check everything is wo
|
|||||||
const tx = await factory.createNftErc20WithFixedRate(
|
const tx = await factory.createNftErc20WithFixedRate(
|
||||||
publisherAccount,
|
publisherAccount,
|
||||||
nftParams,
|
nftParams,
|
||||||
erc20Params,
|
datatokenParams,
|
||||||
freParams
|
freParams
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -748,7 +748,7 @@ Lets check that the download URL was successfully received
|
|||||||
owner: publisherAccount
|
owner: publisherAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
const erc20Params: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -769,7 +769,7 @@ Lets check that the download URL was successfully received
|
|||||||
const tx = await factory.createNftErc20WithDispenser(
|
const tx = await factory.createNftErc20WithDispenser(
|
||||||
publisherAccount,
|
publisherAccount,
|
||||||
nftParams,
|
nftParams,
|
||||||
erc20Params,
|
datatokenParams,
|
||||||
dispenserParams
|
dispenserParams
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -252,7 +252,7 @@ describe('Marketplace flow tests', async () => {
|
|||||||
owner: publisherAccount
|
owner: publisherAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
const erc20Params: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -294,7 +294,7 @@ describe('Marketplace flow tests', async () => {
|
|||||||
const tx = await factory.createNftErc20WithPool(
|
const tx = await factory.createNftErc20WithPool(
|
||||||
publisherAccount,
|
publisherAccount,
|
||||||
nftParams,
|
nftParams,
|
||||||
erc20Params,
|
datatokenParams,
|
||||||
poolParams
|
poolParams
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -526,7 +526,7 @@ describe('Marketplace flow tests', async () => {
|
|||||||
owner: publisherAccount
|
owner: publisherAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
const erc20Params: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -552,7 +552,7 @@ describe('Marketplace flow tests', async () => {
|
|||||||
const tx = await factory.createNftErc20WithFixedRate(
|
const tx = await factory.createNftErc20WithFixedRate(
|
||||||
publisherAccount,
|
publisherAccount,
|
||||||
nftParams,
|
nftParams,
|
||||||
erc20Params,
|
datatokenParams,
|
||||||
freParams
|
freParams
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -748,7 +748,7 @@ describe('Marketplace flow tests', async () => {
|
|||||||
owner: publisherAccount
|
owner: publisherAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
const erc20Params: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -769,7 +769,7 @@ describe('Marketplace flow tests', async () => {
|
|||||||
const tx = await factory.createNftErc20WithDispenser(
|
const tx = await factory.createNftErc20WithDispenser(
|
||||||
publisherAccount,
|
publisherAccount,
|
||||||
nftParams,
|
nftParams,
|
||||||
erc20Params,
|
datatokenParams,
|
||||||
dispenserParams
|
dispenserParams
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -232,7 +232,7 @@ async function createAsset(
|
|||||||
transferable: true,
|
transferable: true,
|
||||||
owner: owner
|
owner: owner
|
||||||
}
|
}
|
||||||
const erc20ParamsAsset: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -242,7 +242,7 @@ async function createAsset(
|
|||||||
mpFeeAddress: ZERO_ADDRESS
|
mpFeeAddress: ZERO_ADDRESS
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = await Factory.createNftWithErc20(owner, nftParamsAsset, erc20ParamsAsset)
|
const result = await Factory.createNftWithErc20(owner, nftParamsAsset, datatokenParams)
|
||||||
|
|
||||||
const nftAddress = result.events.NFTCreated.returnValues[0]
|
const nftAddress = result.events.NFTCreated.returnValues[0]
|
||||||
const datatokenAddressAsset = result.events.TokenCreated.returnValues[0]
|
const datatokenAddressAsset = result.events.TokenCreated.returnValues[0]
|
||||||
|
@ -107,7 +107,7 @@ describe('Publish tests', async () => {
|
|||||||
owner: publisherAccount
|
owner: publisherAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
const erc20Params: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -136,7 +136,7 @@ describe('Publish tests', async () => {
|
|||||||
const bundleNFT = await factory.createNftErc20WithPool(
|
const bundleNFT = await factory.createNftErc20WithPool(
|
||||||
publisherAccount,
|
publisherAccount,
|
||||||
nftParams,
|
nftParams,
|
||||||
erc20Params,
|
datatokenParams,
|
||||||
poolParams
|
poolParams
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -191,7 +191,7 @@ describe('Publish tests', async () => {
|
|||||||
owner: publisherAccount
|
owner: publisherAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
const erc20Params: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -217,7 +217,7 @@ describe('Publish tests', async () => {
|
|||||||
const bundleNFT = await factory.createNftErc20WithFixedRate(
|
const bundleNFT = await factory.createNftErc20WithFixedRate(
|
||||||
publisherAccount,
|
publisherAccount,
|
||||||
nftParams,
|
nftParams,
|
||||||
erc20Params,
|
datatokenParams,
|
||||||
fixedPriceParams
|
fixedPriceParams
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -270,7 +270,7 @@ describe('Publish tests', async () => {
|
|||||||
owner: publisherAccount
|
owner: publisherAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
const erc20Params: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -291,7 +291,7 @@ describe('Publish tests', async () => {
|
|||||||
const bundleNFT = await factory.createNftErc20WithDispenser(
|
const bundleNFT = await factory.createNftErc20WithDispenser(
|
||||||
publisherAccount,
|
publisherAccount,
|
||||||
nftParams,
|
nftParams,
|
||||||
erc20Params,
|
datatokenParams,
|
||||||
dispenserParams
|
dispenserParams
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ describe('Simple Publish & consume test', async () => {
|
|||||||
owner: publisherAccount
|
owner: publisherAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
const erc20Params: DatatokenCreateParams = {
|
const datatokenParams: DatatokenCreateParams = {
|
||||||
templateIndex: 1,
|
templateIndex: 1,
|
||||||
cap: '100000',
|
cap: '100000',
|
||||||
feeAmount: '0',
|
feeAmount: '0',
|
||||||
@ -96,7 +96,11 @@ describe('Simple Publish & consume test', async () => {
|
|||||||
mpFeeAddress: ZERO_ADDRESS
|
mpFeeAddress: ZERO_ADDRESS
|
||||||
}
|
}
|
||||||
|
|
||||||
const tx = await Factory.createNftWithErc20(publisherAccount, nftParams, erc20Params)
|
const tx = await Factory.createNftWithErc20(
|
||||||
|
publisherAccount,
|
||||||
|
nftParams,
|
||||||
|
datatokenParams
|
||||||
|
)
|
||||||
const nftAddress = tx.events.NFTCreated.returnValues[0]
|
const nftAddress = tx.events.NFTCreated.returnValues[0]
|
||||||
const datatokenAddress = tx.events.TokenCreated.returnValues[0]
|
const datatokenAddress = tx.events.TokenCreated.returnValues[0]
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user