This repository has been archived by the owner on Aug 29, 2023. It is now read-only.
create type for deal label #320
Merged
Conversation
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
Gas results 馃殌馃摑Account actor
Miner actor
Datacap actor
Init actor
Market actor
Power actor
Precompiles actor
Send actor
Verifreg actor
|
raulk
reviewed
Feb 28, 2023
| @@ -130,6 +130,10 @@ library MarketCBOR { | |||
| buf.startFixedArray(uint64(params.deals.length)); | |||
|
|
|||
| for (uint64 i = 0; i < params.deals.length; i++) { | |||
| bool isLabelStr = bytes(params.deals[i].proposal.label.dataStr).length > 0; | |||
| bool isLabelBts = params.deals[i].proposal.label.dataBts.length > 0; | |||
| require((!isLabelStr && isLabelBts) || (!isLabelBts && isLabelStr), "deal label must be either string or bytes"); | |||
There was a problem hiding this comment.
Not super deep into this code, but can't this be simplified?
Suggested change
| require((!isLabelStr && isLabelBts) || (!isLabelBts && isLabelStr), "deal label must be either string or bytes"); | |
| require(!(isLabelStr && isLabelBts), "deal label must be either string or bytes"); |
Also worth noting that this will default to serializing empty bytes if none is set, which I think is fine, but please document that behavior.
There was a problem hiding this comment.
Yes Raul, you are right! good catch
| @@ -64,5 +64,11 @@ library CommonTypes { | |||
| bytes data; | |||
| } | |||
|
|
|||
| /// @param dataBytes deal proposal label in bytes format (it can be utf8 string or arbitray bytes string) | |||
There was a problem hiding this comment.
Can we strengthen the documentation to indicate that this is actually an enum type and it's expect to be either or? Also check typos.
There was a problem hiding this comment.
I will add that in the inline docs
longfeiWan9
pushed a commit
to longfeiWan9/filecoin-solidity
that referenced
this pull request
Mar 7, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
closes #318
馃敆 zboto Link