-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
feat!: add simpler Option style #471
Merged
Merged
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
7292184
add option simplifier
ffcd4f6
simplifiy
b4e3c00
add changeset
2b782e3
adjust test to check for a missing argument as undefined
333ed50
Allow void params
2ed3866
Update typechain
a3c37ce
Update packages/abi-coder/src/abi-coder.ts
c74ee8f
format
68692e1
Merge branch 'master' into cm/issue-470
luizstacio File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
import type Coder from './abstract-coder'; | ||
import type { InputValueOf, DecodedValueOf } from './enum'; | ||
import EnumCoder from './enum'; | ||
|
||
type Option<T> = T | undefined; | ||
type SwayOption<T> = { None: [] } | { Some: T }; | ||
|
||
export default class OptionCoder<TCoders extends Record<string, Coder>> extends EnumCoder<TCoders> { | ||
encode(value: InputValueOf<TCoders>): Uint8Array { | ||
const result = super.encode(this.toSwayOption(value) as unknown as InputValueOf<TCoders>); | ||
return result; | ||
} | ||
|
||
toSwayOption(input: InputValueOf<TCoders>): SwayOption<unknown> { | ||
if (input !== undefined) { | ||
return { Some: input }; | ||
} | ||
|
||
return { None: [] }; | ||
} | ||
|
||
decode(data: Uint8Array, offset: number): [DecodedValueOf<TCoders>, number] { | ||
const [decoded, newOffset] = super.decode(data, offset); | ||
return [this.toOption(decoded) as DecodedValueOf<TCoders>, newOffset]; | ||
} | ||
|
||
toOption(output?: DecodedValueOf<TCoders>): Option<unknown> { | ||
if (output && 'Some' in output) { | ||
return output.Some; | ||
} | ||
|
||
return undefined; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was trying to think of a better way to de-nest this but couldn't. My gut tells me we should refactor
getCoder
but probably not a blocker for this pr