fix: fix PairFactoryBase::setUp()

This commit is contained in:
ZeframLou
2022-01-12 18:08:24 -08:00
parent 56975902d8
commit 016baafe48
3 changed files with 72 additions and 3 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ export DAPP_TEST_SMTTIMEOUT=500000
export ETH_RPC_ACCOUNTS=true
# only run test files that end in .t.sol
export DAPP_TEST_MATCH=src/test/new-tests/PairFactory.*\.t\.sol
export DAPP_TEST_MATCH=src/test/.*\.t\.sol
if [ "$DEEP_FUZZ" = "true" ]
then
+68
View File
@@ -1,5 +1,6 @@
test_createPair_basic() (gas: 221927)
testFail_createPair_tradePool_owner_changeAssetRecipient() (gas: 1558)
test_createPair_owner_rescueERC721ERC20() (gas: 131558)
testFail_createPair_tradePool_notOwner_changeFee() (gas: 4243)
testFail_createPair_tradePool_owner_revertChangeFee() (gas: 1570)
test_createPair_tradePool_owner_changeSpotDeltaFee() (gas: 45709)
@@ -7,6 +8,7 @@ testFail_createPair_tradePool_notOwner_changeDelta() (gas: 4243)
testFail_createPair_tradePool_notOwner_changeSpot() (gas: 4288)
test_createPair_basic() (gas: 161164)
testFail_createPair_tradePool_owner_changeAssetRecipient() (gas: 1580)
test_createPair_owner_rescueERC721ERC20() (gas: 131462)
testFail_createPair_tradePool_notOwner_changeFee() (gas: 4199)
testFail_createPair_tradePool_owner_revertChangeFee() (gas: 1548)
test_createPair_tradePool_owner_changeSpotDeltaFee() (gas: 44722)
@@ -14,6 +16,7 @@ testFail_createPair_tradePool_notOwner_changeDelta() (gas: 4221)
testFail_createPair_tradePool_notOwner_changeSpot() (gas: 4222)
test_createPair_basic() (gas: 221820)
testFail_createPair_tradePool_owner_changeAssetRecipient() (gas: 1558)
test_createPair_owner_rescueERC721ERC20() (gas: 71121)
testFail_createPair_tradePool_notOwner_changeFee() (gas: 4243)
testFail_createPair_tradePool_owner_revertChangeFee() (gas: 1570)
test_createPair_tradePool_owner_changeSpotDeltaFee() (gas: 45665)
@@ -21,6 +24,7 @@ testFail_createPair_tradePool_notOwner_changeDelta() (gas: 4243)
testFail_createPair_tradePool_notOwner_changeSpot() (gas: 4288)
test_createPair_basic() (gas: 161058)
testFail_createPair_tradePool_owner_changeAssetRecipient() (gas: 1580)
test_createPair_owner_rescueERC721ERC20() (gas: 71025)
testFail_createPair_tradePool_notOwner_changeFee() (gas: 4199)
testFail_createPair_tradePool_owner_revertChangeFee() (gas: 1548)
test_createPair_tradePool_owner_changeSpotDeltaFee() (gas: 44678)
@@ -28,6 +32,7 @@ testFail_createPair_tradePool_notOwner_changeDelta() (gas: 4221)
testFail_createPair_tradePool_notOwner_changeSpot() (gas: 4222)
test_createPair_basic() (gas: 221921)
testFail_createPair_tradePool_owner_changeAssetRecipient() (gas: 1558)
test_createPair_owner_rescueERC721ERC20() (gas: 131558)
testFail_createPair_tradePool_notOwner_changeFee() (gas: 4243)
testFail_createPair_tradePool_owner_revertChangeFee() (gas: 1570)
test_createPair_tradePool_owner_changeSpotDeltaFee() (gas: 45703)
@@ -35,6 +40,7 @@ testFail_createPair_tradePool_notOwner_changeDelta() (gas: 4243)
testFail_createPair_tradePool_notOwner_changeSpot() (gas: 4288)
test_createPair_basic() (gas: 161158)
testFail_createPair_tradePool_owner_changeAssetRecipient() (gas: 1580)
test_createPair_owner_rescueERC721ERC20() (gas: 131462)
testFail_createPair_tradePool_notOwner_changeFee() (gas: 4199)
testFail_createPair_tradePool_owner_revertChangeFee() (gas: 1548)
test_createPair_tradePool_owner_changeSpotDeltaFee() (gas: 44716)
@@ -42,6 +48,7 @@ testFail_createPair_tradePool_notOwner_changeDelta() (gas: 4221)
testFail_createPair_tradePool_notOwner_changeSpot() (gas: 4222)
test_createPair_basic() (gas: 221814)
testFail_createPair_tradePool_owner_changeAssetRecipient() (gas: 1558)
test_createPair_owner_rescueERC721ERC20() (gas: 71121)
testFail_createPair_tradePool_notOwner_changeFee() (gas: 4243)
testFail_createPair_tradePool_owner_revertChangeFee() (gas: 1570)
test_createPair_tradePool_owner_changeSpotDeltaFee() (gas: 45659)
@@ -49,8 +56,69 @@ testFail_createPair_tradePool_notOwner_changeDelta() (gas: 4243)
testFail_createPair_tradePool_notOwner_changeSpot() (gas: 4288)
test_createPair_basic() (gas: 161052)
testFail_createPair_tradePool_owner_changeAssetRecipient() (gas: 1580)
test_createPair_owner_rescueERC721ERC20() (gas: 71025)
testFail_createPair_tradePool_notOwner_changeFee() (gas: 4199)
testFail_createPair_tradePool_owner_revertChangeFee() (gas: 1548)
test_createPair_tradePool_owner_changeSpotDeltaFee() (gas: 44672)
testFail_createPair_tradePool_notOwner_changeDelta() (gas: 4221)
testFail_createPair_tradePool_notOwner_changeSpot() (gas: 4222)
test_swapTokenForSingleSpecificNFT() (gas: 109485)
test_swap5NFTsForToken() (gas: 358611)
test_swapTokenfor5NFTs() (gas: 331073)
test_swapSingleNFTForToken() (gas: 125416)
test_swapSingleNFTForAnyNFT() (gas: 205470)
test_swapTokenForSingleAnyNFT() (gas: 108445)
test_swapSingleNFTForSpecificNFT() (gas: 206492)
test_swapTokenForSingleSpecificNFT() (gas: 106133)
test_swap5NFTsForToken() (gas: 342728)
test_swapTokenfor5NFTs() (gas: 327768)
test_swapSingleNFTForToken() (gas: 109621)
test_swapSingleNFTForAnyNFT() (gas: 214861)
test_swapTokenForSingleAnyNFT() (gas: 104691)
test_swapSingleNFTForSpecificNFT() (gas: 216286)
test_swapTokenForSingleSpecificNFT() (gas: 67341)
test_swap5NFTsForToken() (gas: 361657)
test_swapTokenfor5NFTs() (gas: 115223)
test_swapSingleNFTForToken() (gas: 125902)
test_swapSingleNFTForAnyNFT() (gas: 164942)
test_swapTokenForSingleAnyNFT() (gas: 65331)
test_swapSingleNFTForSpecificNFT() (gas: 166934)
test_swapTokenForSingleSpecificNFT() (gas: 63901)
test_swap5NFTsForToken() (gas: 345774)
test_swapTokenfor5NFTs() (gas: 111827)
test_swapSingleNFTForToken() (gas: 110107)
test_swapSingleNFTForAnyNFT() (gas: 174242)
test_swapTokenForSingleAnyNFT() (gas: 61486)
test_swapSingleNFTForSpecificNFT() (gas: 176640)
test_swapTokenForSingleSpecificNFT() (gas: 109377)
test_swap5NFTsForToken() (gas: 358054)
test_swapTokenfor5NFTs() (gas: 330067)
test_swapSingleNFTForToken() (gas: 125308)
test_swapSingleNFTForAnyNFT() (gas: 205308)
test_swapTokenForSingleAnyNFT() (gas: 108337)
test_swapSingleNFTForSpecificNFT() (gas: 206330)
test_swapTokenForSingleSpecificNFT() (gas: 105971)
test_swap5NFTsForToken() (gas: 342171)
test_swapTokenfor5NFTs() (gas: 326259)
test_swapSingleNFTForToken() (gas: 109513)
test_swapSingleNFTForAnyNFT() (gas: 214645)
test_swapTokenForSingleAnyNFT() (gas: 104529)
test_swapSingleNFTForSpecificNFT() (gas: 216070)
test_swapTokenForSingleSpecificNFT() (gas: 67233)
test_swap5NFTsForToken() (gas: 361100)
test_swapTokenfor5NFTs() (gas: 114217)
test_swapSingleNFTForToken() (gas: 125794)
test_swapSingleNFTForAnyNFT() (gas: 164780)
test_swapTokenForSingleAnyNFT() (gas: 65223)
test_swapSingleNFTForSpecificNFT() (gas: 166772)
test_swapTokenForSingleSpecificNFT() (gas: 63739)
test_swap5NFTsForToken() (gas: 345217)
test_swapTokenfor5NFTs() (gas: 110318)
test_swapSingleNFTForToken() (gas: 109999)
test_swapSingleNFTForAnyNFT() (gas: 174026)
test_swapTokenForSingleAnyNFT() (gas: 61324)
test_swapSingleNFTForSpecificNFT() (gas: 176424)
test_getSellInfoExample() (gas: 3920)
test_getBuyInfoExample() (gas: 3887)
test_getSellInfoExample() (gas: 3269)
test_getBuyInfoExample() (gas: 3279)
+3 -2
View File
@@ -54,8 +54,6 @@ abstract contract PairFactoryBase is DSTest, ERC721Holder, Configurable {
IERC721Mintable(address(test721)).mint(address(this), i);
idList.push(i);
}
testERC20 = IERC20(address(new Test20()));
IMintable(address(testERC20)).mint(address(pair), 1000 ether);
pair = this.setupPair{value: modifyInputAmount(tokenAmount)}(
factory,
@@ -67,6 +65,9 @@ abstract contract PairFactoryBase is DSTest, ERC721Holder, Configurable {
tokenAmount,
address(0)
);
testERC20 = IERC20(address(new Test20()));
IMintable(address(testERC20)).mint(address(pair), 1 ether);
}
function test_createPair_owner_rescueERC721ERC20() public {