State diff on root mismatch option #738
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
austinabell
requested review from
ansermino,
dutterbutter and
ec2
as code owners
austinabell
requested review from
StaticallyTypedAnxiety,
RajarupanSampanthan and
timvermeulen
ec2
approved these changes
Oct 9, 2020
ec2
approved these changes
Oct 9, 2020
timvermeulen
approved these changes
Oct 13, 2020
ipld/blockstore/src/resolve.rs
Outdated
Comment on lines
39
to
52
| link @ Ipld::Link(_) => { | ||
| let resolved: Option<Ipld> = if let Ipld::Link(cid) = link { | ||
| if cid.codec != Codec::DagCBOR { | ||
| return Ok(()); | ||
| } | ||
| bs.get(cid)? | ||
| } else { | ||
| unreachable!() | ||
| }; | ||
|
|
||
| if let Some(ipld) = resolved { | ||
| *link = ipld; | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| link @ Ipld::Link(_) => { | |
| let resolved: Option<Ipld> = if let Ipld::Link(cid) = link { | |
| if cid.codec != Codec::DagCBOR { | |
| return Ok(()); | |
| } | |
| bs.get(cid)? | |
| } else { | |
| unreachable!() | |
| }; | |
| if let Some(ipld) = resolved { | |
| *link = ipld; | |
| } | |
| } | |
| Ipld::Link(cid) => { | |
| if cid.codec == Codec::DagCBOR { | |
| if let Some(x) = bs.get(cid)? { | |
| *ipld = x; | |
| } | |
| } | |
| } |
There was a problem hiding this comment.
ah ya oops, for some reason I thought ipld would not be able to be overwritten while cid was bound in the match
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary of changes
Changes introduced in this pull request:
FOREST_DIFF=1env variable is set and there is a state root mismatchLooks something like:
Edit (looks like this now with the state tree resolve):
Which can be useful sometimes but other times not extremely useful (reverted state doesn't get resolved and the hamt/ amt in ipld can be cryptic if you don't know what to look for)
Reference issue to close (if applicable)
Closes
Other information and links