Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Standardize member naming and ordering #99

Merged
merged 13 commits into from
Nov 16, 2022
Merged

Standardize member naming and ordering #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
491c7f0
Try different interface ordering
neodaoist Nov 14, 2022
83d489d
Rename / Reorder variables
neodaoist Nov 14, 2022
1f2affe
Rename Claim to OptionLotClaim
neodaoist Nov 15, 2022
6c14a9f
Propose naming convention -- optionKey, claimNum, and tokenId/optionI…
neodaoist Nov 15, 2022
a364112
Lint
neodaoist Nov 15, 2022
2296abd
Revert changes to claim bucket indexing logic
neodaoist Nov 15, 2022
2bfe93e
Swap events and errors
neodaoist Nov 15, 2022
5ad0401
Revise interface
neodaoist Nov 16, 2022
2e48774
Get up to speed
neodaoist Nov 16, 2022
ccebe92
testFail
neodaoist Nov 16, 2022
416f6ba
Merge /master
neodaoist Nov 16, 2022
d15ad9a
Lint
neodaoist Nov 16, 2022
a37dfb2
Switch back to exerciseTimestamp
neodaoist Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 56 additions & 51 deletions .gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,56 @@
OptionSettlementTest:testAddOptionsToExistingClaim() (gas: 452756)
OptionSettlementTest:testAssignMultipleBuckets() (gas: 707173)
OptionSettlementTest:testEventExercise() (gas: 339582)
OptionSettlementTest:testEventNewOptionType() (gas: 121993)
OptionSettlementTest:testEventRedeem() (gas: 297390)
OptionSettlementTest:testEventSweepFeesWhenFeesAccruedForExercise() (gas: 1197408)
OptionSettlementTest:testEventSweepFeesWhenFeesAccruedForWrite() (gas: 1171427)
OptionSettlementTest:testEventWriteWhenExistingClaim() (gas: 322228)
OptionSettlementTest:testEventWriteWhenNewClaim() (gas: 300501)
OptionSettlementTest:testExerciseBeforeExpiry() (gas: 332323)
OptionSettlementTest:testExerciseIncompleteExercise() (gas: 352342)
OptionSettlementTest:testExerciseMultipleWriteSameChain() (gas: 463859)
OptionSettlementTest:testExerciseWithDifferentDecimals() (gas: 442738)
OptionSettlementTest:testFailAssignExercise() (gas: 13434)
OptionSettlementTest:testFailExerciseAtExpiry() (gas: 327050)
OptionSettlementTest:testFailExerciseBeforeExcercise() (gas: 14430)
OptionSettlementTest:testFailExerciseExpiredOption() (gas: 327194)
OptionSettlementTest:testFailRedeemAlreadyClaimed() (gas: 423509)
OptionSettlementTest:testFailRedeemBalanceTooLow() (gas: 324790)
OptionSettlementTest:testFailRedeemInvalidClaim() (gas: 13012)
OptionSettlementTest:testFailWriteExpiredOption() (gas: 5711)
OptionSettlementTest:testFailWriteInvalidOption() (gas: 10795)
OptionSettlementTest:testFuzzExercise(uint112,uint112) (runs: 256, μ: 399443, ~: 402813)
OptionSettlementTest:testFuzzGetDecodedIdComponents(uint256,uint256) (runs: 256, μ: 10888, ~: 10888)
OptionSettlementTest:testFuzzGetEncodedIdComponents(uint256,uint256) (runs: 256, μ: 10770, ~: 10770)
OptionSettlementTest:testFuzzNewOptionType(uint96,uint96,uint40,uint40) (runs: 256, μ: 123715, ~: 123715)
OptionSettlementTest:testFuzzRedeem(uint112,uint112) (runs: 256, μ: 390230, ~: 393814)
OptionSettlementTest:testFuzzWrite(uint112) (runs: 256, μ: 318289, ~: 318289)
OptionSettlementTest:testFuzzWriteExerciseRedeem(uint32) (runs: 256, μ: 11566384, ~: 11647944)
OptionSettlementTest:testGetDecodedIdComponents() (gas: 487728)
OptionSettlementTest:testGetEncodedIdComponents() (gas: 487326)
OptionSettlementTest:testGetOptionFromEncodedId() (gas: 124690)
OptionSettlementTest:testIsOptionInitialized() (gas: 125287)
OptionSettlementTest:testRandomAssignment() (gas: 1147606)
OptionSettlementTest:testRedeemClaimTooSoon() (gas: 298562)
OptionSettlementTest:testRedeemNotExercised() (gas: 300895)
OptionSettlementTest:testRevertIfClaimIdDoesNotEncodeOptionId() (gas: 11709)
OptionSettlementTest:testRevertIfWriterDoesNotOwnClaim() (gas: 302896)
OptionSettlementTest:testRevertNewOptionTypeWhenExerciseWindowTooShort() (gas: 17011)
OptionSettlementTest:testRevertNewOptionTypeWhenExpiryTooSoon() (gas: 18799)
OptionSettlementTest:testRevertNewOptionTypeWhenInvalidAssets() (gas: 17658)
OptionSettlementTest:testRevertNewOptionTypeWhenOptionsTypeExists() (gas: 120748)
OptionSettlementTest:testRevertSetFeeToWhenNotCurrentFeeTo() (gas: 11808)
OptionSettlementTest:testRevertSetFeeToWhenZeroAddress() (gas: 11633)
OptionSettlementTest:testSetFeeTo() (gas: 15753)
OptionSettlementTest:testTokenURI() (gas: 480899)
OptionSettlementTest:testUnderlyingAfterExercise() (gas: 371141)
OptionSettlementTest:testUnderlyingWhenNotExercised() (gas: 302682)
OptionSettlementTest:testUriFailsWithTokenIdEncodingNonexistantOptionType() (gas: 18659)
OptionSettlementTest:testWriteMultipleWriteSameOptionType() (gas: 431115)
OptionSettlementTest:testWriteZeroOptionsFails() (gas: 11272)
OptionSettlementTest:testAddOptionsToExistingClaim() (gas: 452638)
OptionSettlementTest:testDecodeTokenId() (gas: 487512)
OptionSettlementTest:testEncodeTokenId() (gas: 487113)
OptionSettlementTest:testEventExercise() (gas: 340796)
OptionSettlementTest:testEventNewOptionType() (gas: 124307)
OptionSettlementTest:testEventRedeem() (gas: 299522)
OptionSettlementTest:testEventSweepFeesWhenFeesAccruedForExercise() (gas: 1206709)
OptionSettlementTest:testEventSweepFeesWhenFeesAccruedForWrite() (gas: 1175972)
OptionSettlementTest:testEventWriteWhenExistingClaim() (gas: 322146)
OptionSettlementTest:testEventWriteWhenNewClaim() (gas: 300701)
OptionSettlementTest:testExerciseBeforeExpiry() (gas: 333473)
OptionSettlementTest:testExerciseIncompleteExercise() (gas: 354620)
OptionSettlementTest:testExerciseMultipleWriteSameChain() (gas: 467341)
OptionSettlementTest:testExerciseWithDifferentDecimals() (gas: 405077)
OptionSettlementTest:testFailAssignMultipleBuckets() (gas: 738993)
OptionSettlementTest:testFailGetClaimForTokenId() (gas: 392082)
OptionSettlementTest:testFailRandomAssignment() (gas: 1204419)
OptionSettlementTest:testFuzzDecodeTokenId(uint256,uint256) (runs: 256, μ: 10844, ~: 10844)
OptionSettlementTest:testFuzzEncodeTokenId(uint256,uint256) (runs: 256, μ: 10770, ~: 10770)
OptionSettlementTest:testFuzzExercise(uint112,uint112) (runs: 256, μ: 402658, ~: 406028)
OptionSettlementTest:testFuzzNewOptionType(uint96,uint96,uint40,uint40) (runs: 256, μ: 124702, ~: 124702)
OptionSettlementTest:testFuzzRedeem(uint112,uint112) (runs: 256, μ: 393471, ~: 397055)
OptionSettlementTest:testFuzzWrite(uint112) (runs: 256, μ: 318375, ~: 318375)
OptionSettlementTest:testFuzzWriteExerciseRedeem(uint32) (runs: 256, μ: 11635799, ~: 11692076)
OptionSettlementTest:testGetOptionForTokenId() (gas: 124631)
OptionSettlementTest:testIsOptionInitialized() (gas: 124854)
OptionSettlementTest:testRedeemNotExercised() (gas: 302961)
OptionSettlementTest:testRevertExerciseBeforeExcercise() (gas: 401588)
OptionSettlementTest:testRevertExerciseWhenCallerHoldsInsufficientOptions() (gas: 306381)
OptionSettlementTest:testRevertExerciseWhenExerciseTooEarly() (gas: 308003)
OptionSettlementTest:testRevertExerciseWhenExpiredOption() (gas: 427764)
OptionSettlementTest:testRevertExerciseWhenInvalidOption() (gas: 294499)
OptionSettlementTest:testRevertNewOptionTypeWhenExerciseWindowTooShort() (gas: 19267)
OptionSettlementTest:testRevertNewOptionTypeWhenExpiryTooSoon() (gas: 20652)
OptionSettlementTest:testRevertNewOptionTypeWhenInvalidAssets() (gas: 20857)
OptionSettlementTest:testRevertNewOptionTypeWhenOptionsTypeExists() (gas: 22574)
OptionSettlementTest:testRevertNewOptionTypeWhenTotalSuppliesAreTooLowToExercise() (gas: 48813)
OptionSettlementTest:testRevertRedeemWhenCallerDoesNotOwnClaimId() (gas: 318703)
OptionSettlementTest:testRevertRedeemWhenClaimTooSoon() (gas: 298702)
OptionSettlementTest:testRevertRedeemWhenInvalidClaim() (gas: 10603)
OptionSettlementTest:testRevertSetFeeToWhenNotCurrentFeeTo() (gas: 11831)
OptionSettlementTest:testRevertSetFeeToWhenZeroAddress() (gas: 11689)
OptionSettlementTest:testRevertUnderlyingWhenTokenNotFound() (gas: 11757)
OptionSettlementTest:testRevertUriWhenTokenNotFound() (gas: 18617)
OptionSettlementTest:testRevertWriteExpiredOption() (gas: 16631)
OptionSettlementTest:testRevertWriteWhenAmountWrittenCannotBeZero() (gas: 10926)
OptionSettlementTest:testRevertWriteWhenCallerDoesNotOwnClaimId() (gas: 302895)
OptionSettlementTest:testRevertWriteWhenEncodedOptionIdInClaimIdDoesNotMatchProvidedOptionId() (gas: 11624)
OptionSettlementTest:testRevertWriteWhenExpiredOption() (gas: 295661)
OptionSettlementTest:testRevertWriteWhenInvalidOption() (gas: 13628)
OptionSettlementTest:testSetFeeTo() (gas: 15841)
OptionSettlementTest:testTokenURI() (gas: 480902)
OptionSettlementTest:testUnderlyingAfterExercise() (gas: 375491)
OptionSettlementTest:testUnderlyingForFungibleOptionToken() (gas: 31130)
OptionSettlementTest:testUnderlyingWhenNotExercised() (gas: 304697)
OptionSettlementTest:testWriteMultipleWriteSameOptionType() (gas: 431154)
Loading