From 90f69b845f06d2393846dd4a1c9b33d73090174a Mon Sep 17 00:00:00 2001 From: neodaoist Date: Thu, 17 Nov 2022 17:30:45 -0500 Subject: [PATCH] Fix NewOptionType event test --- .gas-snapshot | 94 ++++++++++++++++++------------------- test/OptionSettlement.t.sol | 10 ++-- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/.gas-snapshot b/.gas-snapshot index 34ed219..b51730b 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -1,57 +1,57 @@ -OptionSettlementTest:testAddOptionsToExistingClaim() (gas: 452588) -OptionSettlementTest:testAssignMultipleBuckets() (gas: 719739) -OptionSettlementTest:testDecodeTokenId() (gas: 487534) -OptionSettlementTest:testEncodeTokenId() (gas: 487135) -OptionSettlementTest:testEventExercise() (gas: 340839) -OptionSettlementTest:testEventNewOptionType() (gas: 124307) -OptionSettlementTest:testEventRedeem() (gas: 299413) -OptionSettlementTest:testEventSweepFeesWhenFeesAccruedForExercise() (gas: 1206725) +OptionSettlementTest:testAddOptionsToExistingClaim() (gas: 452610) +OptionSettlementTest:testAssignMultipleBuckets() (gas: 719761) +OptionSettlementTest:testDecodeTokenId() (gas: 487556) +OptionSettlementTest:testEncodeTokenId() (gas: 487157) +OptionSettlementTest:testEventExercise() (gas: 340861) +OptionSettlementTest:testEventNewOptionType() (gas: 124335) +OptionSettlementTest:testEventRedeem() (gas: 299435) +OptionSettlementTest:testEventSweepFeesWhenFeesAccruedForExercise() (gas: 1206747) OptionSettlementTest:testEventSweepFeesWhenFeesAccruedForWrite() (gas: 1176035) -OptionSettlementTest:testEventWriteWhenExistingClaim() (gas: 322234) +OptionSettlementTest:testEventWriteWhenExistingClaim() (gas: 322145) OptionSettlementTest:testEventWriteWhenNewClaim() (gas: 300745) -OptionSettlementTest:testExerciseBeforeExpiry() (gas: 333449) -OptionSettlementTest:testExerciseIncompleteExercise() (gas: 354551) -OptionSettlementTest:testExerciseMultipleWriteSameChain() (gas: 467337) +OptionSettlementTest:testExerciseBeforeExpiry() (gas: 333471) +OptionSettlementTest:testExerciseIncompleteExercise() (gas: 354573) +OptionSettlementTest:testExerciseMultipleWriteSameChain() (gas: 467359) OptionSettlementTest:testExerciseWithDifferentDecimals() (gas: 405054) -OptionSettlementTest:testFailGetClaimForTokenId() (gas: 392104) -OptionSettlementTest:testFuzzDecodeTokenId(uint256,uint256) (runs: 256, μ: 10866, ~: 10866) -OptionSettlementTest:testFuzzEncodeTokenId(uint256,uint256) (runs: 256, μ: 10770, ~: 10770) -OptionSettlementTest:testFuzzExercise(uint112,uint112) (runs: 256, μ: 402699, ~: 406069) -OptionSettlementTest:testFuzzNewOptionType(uint96,uint96,uint40,uint40) (runs: 256, μ: 124724, ~: 124724) -OptionSettlementTest:testFuzzRedeem(uint112,uint112) (runs: 256, μ: 393489, ~: 397073) +OptionSettlementTest:testFuzzDecodeTokenId(uint256,uint256) (runs: 256, μ: 10888, ~: 10888) +OptionSettlementTest:testFuzzEncodeTokenId(uint256,uint256) (runs: 256, μ: 10792, ~: 10792) +OptionSettlementTest:testFuzzExercise(uint112,uint112) (runs: 256, μ: 402721, ~: 406091) +OptionSettlementTest:testFuzzNewOptionType(uint96,uint96,uint40,uint40) (runs: 256, μ: 124635, ~: 124635) +OptionSettlementTest:testFuzzRedeem(uint112,uint112) (runs: 256, μ: 393511, ~: 397095) OptionSettlementTest:testFuzzWrite(uint112) (runs: 256, μ: 318417, ~: 318417) -OptionSettlementTest:testFuzzWriteExerciseRedeem(uint32) (runs: 256, μ: 11625354, ~: 11717902) -OptionSettlementTest:testGetOptionForTokenId() (gas: 124564) -OptionSettlementTest:testInitial() (gas: 7802) -OptionSettlementTest:testIsOptionInitialized() (gas: 124876) -OptionSettlementTest:testRandomAssignment() (gas: 1599889) -OptionSettlementTest:testRedeemNotExercised() (gas: 303048) -OptionSettlementTest:testRevertExerciseBeforeExcercise() (gas: 401588) -OptionSettlementTest:testRevertExerciseWhenCallerHoldsInsufficientOptions() (gas: 306335) -OptionSettlementTest:testRevertExerciseWhenExerciseTooEarly() (gas: 308025) -OptionSettlementTest:testRevertExerciseWhenExpiredOption() (gas: 427764) -OptionSettlementTest:testRevertExerciseWhenInvalidOption() (gas: 294499) -OptionSettlementTest:testRevertNewOptionTypeWhenExerciseWindowTooShort() (gas: 19267) -OptionSettlementTest:testRevertNewOptionTypeWhenExpiryTooSoon() (gas: 20652) -OptionSettlementTest:testRevertNewOptionTypeWhenInvalidAssets() (gas: 20857) -OptionSettlementTest:testRevertNewOptionTypeWhenOptionsTypeExists() (gas: 22596) +OptionSettlementTest:testFuzzWriteExerciseRedeem(uint32) (runs: 256, μ: 11633757, ~: 11691787) +OptionSettlementTest:testGetClaimForTokenId() (gas: 377636) +OptionSettlementTest:testGetOptionForTokenId() (gas: 124586) +OptionSettlementTest:testInitial() (gas: 7824) +OptionSettlementTest:testIsOptionInitialized() (gas: 124898) +OptionSettlementTest:testRandomAssignment() (gas: 1599911) +OptionSettlementTest:testRedeemNotExercised() (gas: 303070) +OptionSettlementTest:testRevertExerciseBeforeExcercise() (gas: 401610) +OptionSettlementTest:testRevertExerciseWhenCallerHoldsInsufficientOptions() (gas: 306357) +OptionSettlementTest:testRevertExerciseWhenExerciseTooEarly() (gas: 308047) +OptionSettlementTest:testRevertExerciseWhenExpiredOption() (gas: 427786) +OptionSettlementTest:testRevertExerciseWhenInvalidOption() (gas: 294521) +OptionSettlementTest:testRevertNewOptionTypeWhenExerciseWindowTooShort() (gas: 19289) +OptionSettlementTest:testRevertNewOptionTypeWhenExpiryTooSoon() (gas: 20674) +OptionSettlementTest:testRevertNewOptionTypeWhenInvalidAssets() (gas: 20879) +OptionSettlementTest:testRevertNewOptionTypeWhenOptionsTypeExists() (gas: 22618) OptionSettlementTest:testRevertNewOptionTypeWhenTotalSuppliesAreTooLowToExercise() (gas: 48813) -OptionSettlementTest:testRevertRedeemWhenCallerDoesNotOwnClaimId() (gas: 318633) +OptionSettlementTest:testRevertRedeemWhenCallerDoesNotOwnClaimId() (gas: 318655) OptionSettlementTest:testRevertRedeemWhenClaimTooSoon() (gas: 298679) OptionSettlementTest:testRevertRedeemWhenInvalidClaim() (gas: 10603) -OptionSettlementTest:testRevertSetFeeToWhenNotCurrentFeeTo() (gas: 11875) -OptionSettlementTest:testRevertSetFeeToWhenZeroAddress() (gas: 11689) -OptionSettlementTest:testRevertUnderlyingWhenTokenNotFound() (gas: 11757) -OptionSettlementTest:testRevertUriWhenTokenNotFound() (gas: 18683) -OptionSettlementTest:testRevertWriteExpiredOption() (gas: 16631) -OptionSettlementTest:testRevertWriteWhenAmountWrittenCannotBeZero() (gas: 10948) -OptionSettlementTest:testRevertWriteWhenCallerDoesNotOwnClaimId() (gas: 302961) -OptionSettlementTest:testRevertWriteWhenEncodedOptionIdInClaimIdDoesNotMatchProvidedOptionId() (gas: 11668) -OptionSettlementTest:testRevertWriteWhenExpiredOption() (gas: 295704) +OptionSettlementTest:testRevertSetFeeToWhenNotCurrentFeeTo() (gas: 11786) +OptionSettlementTest:testRevertSetFeeToWhenZeroAddress() (gas: 11600) +OptionSettlementTest:testRevertUnderlyingWhenTokenNotFound() (gas: 11779) +OptionSettlementTest:testRevertUriWhenTokenNotFound() (gas: 18596) +OptionSettlementTest:testRevertWriteExpiredOption() (gas: 16537) +OptionSettlementTest:testRevertWriteWhenAmountWrittenCannotBeZero() (gas: 10881) +OptionSettlementTest:testRevertWriteWhenCallerDoesNotOwnClaimId() (gas: 302983) +OptionSettlementTest:testRevertWriteWhenEncodedOptionIdInClaimIdDoesNotMatchProvidedOptionId() (gas: 11690) +OptionSettlementTest:testRevertWriteWhenExpiredOption() (gas: 295699) OptionSettlementTest:testRevertWriteWhenInvalidOption() (gas: 13650) -OptionSettlementTest:testSetFeeTo() (gas: 15817) -OptionSettlementTest:testTokenURI() (gas: 480968) +OptionSettlementTest:testSetFeeTo() (gas: 15731) +OptionSettlementTest:testTokenURI() (gas: 480880) OptionSettlementTest:testUnderlyingAfterExercise() (gas: 375445) -OptionSettlementTest:testUnderlyingForFungibleOptionToken() (gas: 31042) -OptionSettlementTest:testUnderlyingWhenNotExercised() (gas: 304719) +OptionSettlementTest:testUnderlyingForFungibleOptionToken() (gas: 31064) +OptionSettlementTest:testUnderlyingWhenNotExercised() (gas: 304741) OptionSettlementTest:testWriteMultipleWriteSameOptionType() (gas: 431129) diff --git a/test/OptionSettlement.t.sol b/test/OptionSettlement.t.sol index 049d95b..b66e486 100644 --- a/test/OptionSettlement.t.sol +++ b/test/OptionSettlement.t.sol @@ -640,18 +640,18 @@ contract OptionSettlementTest is Test, NFTreceiver { function testEventNewOptionType() public { IOptionSettlementEngine.Option memory optionInfo = IOptionSettlementEngine.Option({ underlyingAsset: DAI_A, + underlyingAmount: testUnderlyingAmount, + exerciseAsset: WETH_A, + exerciseAmount: testExerciseAmount, exerciseTimestamp: testExerciseTimestamp, expiryTimestamp: testExpiryTimestamp, - exerciseAsset: WETH_A, - underlyingAmount: testUnderlyingAmount, settlementSeed: 0, - exerciseAmount: testExerciseAmount, - nextClaimNum: 1 + nextClaimNum: 0 }); uint256 expectedOptionId = _createOptionIdFromStruct(optionInfo); - vm.expectEmit(false, true, true, true); + vm.expectEmit(true, true, true, true); emit NewOptionType( expectedOptionId, WETH_A,