d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nftPool out fix

Browse Source
This commit is contained in:
owen05
2021-09-27 15:11:03 +08:00
parent 5af15a4eff
commit 15675bf5f2
7 changed files with 33 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/NFTPool/erc1155NftPool.test.ts
View File

@@ -149,14 +149,14 @@ describe("ERC1155-NFTPool", () => {
assert.equal(beforeAmount, 2)
//maker targetout
var tx = await logGas(ctx.DODONFTPoolProxy.methods.erc1155TargetOut(
filter,
var tx = await logGas(filterInstance.methods.ERC1155TargetOut(
[0, 1, 3],
[2, 1, 1],
maker,
MAX_UINT256,
), ctx.sendParam(maker), "Erc1155TargetOut");
var paid = tx.events['Erc1155TargetOut'].returnValues['paid']
var paid = tx.events['TargetOutOrder'].returnValues['paidAmount']
assert.equal(paid, "3673527453990000000");
var maxNftOutAmount = await filterInstance.methods.getAvaliableNFTOutAmount().call();
@@ -176,13 +176,13 @@ describe("ERC1155-NFTPool", () => {
var filterInstance = contracts.getContractWithAddress(contracts.FILTER_ERC1155_V1, filter);
//maker randomOut
var tx = await logGas(ctx.DODONFTPoolProxy.methods.erc1155RandomOut(
filter,
var tx = await logGas(filterInstance.methods.ERC1155RandomOut(
3,
maker,
MAX_UINT256,
), ctx.sendParam(maker), "Erc1155RandomOut");
var paid = tx.events['Erc1155RandomOut'].returnValues['paid']
var paid = tx.events['RandomOutOrder'].returnValues['paidAmount']
assert.equal(paid, "1302665521995000000");
var maxNftOutAmount = await filterInstance.methods.getAvaliableNFTOutAmount().call();

12
test/NFTPool/erc721NftPool.test.ts
View File

@@ -164,13 +164,13 @@ describe("ERC721-NFTPool", () => {
assert.equal(beforeOwner, filter)
//maker targetout
var tx = await logGas(ctx.DODONFTPoolProxy.methods.erc721TargetOut(
filter,
var tx = await logGas(filterInstance.methods.ERC721TargetOut(
[0, 1, 3],
maker,
MAX_UINT256,
), ctx.sendParam(maker), "Erc721TargetOut");
var paid = tx.events['Erc721TargetOut'].returnValues['paid']
var paid = tx.events['TargetOutOrder'].returnValues['paidAmount']
assert.equal(paid, "4412151000000000000");
@@ -193,13 +193,13 @@ describe("ERC721-NFTPool", () => {
var filterInstance = contracts.getContractWithAddress(contracts.FILTER_ERC721_V1, filter);
//maker randomOut
var tx = await logGas(ctx.DODONFTPoolProxy.methods.erc721RandomOut(
filter,
var tx = await logGas(filterInstance.methods.ERC721RandomOut(
3,
maker,
MAX_UINT256,
), ctx.sendParam(maker), "Erc721RandomOut");
var paid = tx.events['Erc721RandomOut'].returnValues['paid']
var paid = tx.events['RandomOutOrder'].returnValues['paidAmount']
assert.equal(paid, "2206075500000000000");
var maxNftOutAmount = await filterInstance.methods.getAvaliableNFTOutAmount().call();