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

fix merge errors

This commit is contained in:
Miquel A. Cabot 2022-03-29 22:41:20 +02:00
parent 736cf2e736
commit 12eb0aebc2

View File

@ -348,7 +348,7 @@ describe('Nft Factory test', () => {
it('#addNFTTemplate - should add a new erc721 token template', async () => { it('#addNFTTemplate - should add a new erc721 token template', async () => {
const currentNFTTemplateCount = await nftFactory.getCurrentNFTTemplateCount() const currentNFTTemplateCount = await nftFactory.getCurrentNFTTemplateCount()
await nftFactory.addNFTTemplate(factoryOwner, contracts.template721Address) await nftFactory.addNFTTemplate(factoryOwner, contracts.erc721TemplateAddress)
expect( expect(
(await nftFactory.getCurrentNFTTemplateCount()) === currentNFTTemplateCount + 1 (await nftFactory.getCurrentNFTTemplateCount()) === currentNFTTemplateCount + 1
@ -382,7 +382,7 @@ describe('Nft Factory test', () => {
it('#addTokenTemplate - should add a new erc20 token template', async () => { it('#addTokenTemplate - should add a new erc20 token template', async () => {
const currentTokenTemplateCount = await nftFactory.getCurrentTokenTemplateCount() const currentTokenTemplateCount = await nftFactory.getCurrentTokenTemplateCount()
await nftFactory.addTokenTemplate(factoryOwner, contracts.template20Address) await nftFactory.addTokenTemplate(factoryOwner, contracts.erc20TemplateAddress)
expect( expect(
(await nftFactory.getCurrentTokenTemplateCount()) === currentTokenTemplateCount + 1 (await nftFactory.getCurrentTokenTemplateCount()) === currentTokenTemplateCount + 1