-
Notifications
You must be signed in to change notification settings - Fork 621
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
change FrozenSequence to boolean in solo machine #169
Merged
Merged
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
f3aeb1b
change frozen sequence to is frozen in solo machine
colin-axner 24f95e5
add changelog
colin-axner b83acdb
solo machine protobuf v1 -> v2
colin-axner 7adae74
update docs
colin-axner 29f2277
merge main
colin-axner 3496ebb
merge main
colin-axner e1fb7a2
Merge branch 'main' into colin/36-sm-isfrozen-bool
colin-axner 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
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 |
---|---|---|
|
@@ -22,7 +22,7 @@ var _ exported.ClientState = (*ClientState)(nil) | |
func NewClientState(latestSequence uint64, consensusState *ConsensusState, allowUpdateAfterProposal bool) *ClientState { | ||
return &ClientState{ | ||
Sequence: latestSequence, | ||
FrozenSequence: 0, | ||
IsFrozen: false, | ||
ConsensusState: consensusState, | ||
AllowUpdateAfterProposal: allowUpdateAfterProposal, | ||
} | ||
|
@@ -45,23 +45,18 @@ func (cs ClientState) GetLatestHeight() exported.Height { | |
// - Active: if frozen sequence is 0 | ||
// - Frozen: otherwise solo machine is frozen | ||
func (cs ClientState) Status(_ sdk.Context, _ sdk.KVStore, _ codec.BinaryCodec) exported.Status { | ||
if cs.FrozenSequence != 0 { | ||
if cs.IsFrozen { | ||
return exported.Frozen | ||
} | ||
|
||
return exported.Active | ||
} | ||
|
||
// IsFrozen returns true if the client is frozen. | ||
func (cs ClientState) IsFrozen() bool { | ||
return cs.FrozenSequence != 0 | ||
} | ||
|
||
// GetFrozenHeight returns the frozen sequence of the client. | ||
// Return exported.Height to satisfy interface | ||
// Revision number is always 0 for a solo-machine | ||
func (cs ClientState) GetFrozenHeight() exported.Height { | ||
return clienttypes.NewHeight(0, cs.FrozenSequence) | ||
return clienttypes.NewHeight(0, 1) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this will be removed by #165 |
||
} | ||
|
||
// GetProofSpecs returns nil proof specs since client state verification uses signatures. | ||
|
@@ -445,10 +440,6 @@ func produceVerificationArgs( | |
} | ||
// sequence is encoded in the revision height of height struct | ||
sequence := height.GetRevisionHeight() | ||
if cs.IsFrozen() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should have been removed by Status pr, this is checked in 02-client |
||
return nil, nil, 0, 0, clienttypes.ErrClientFrozen | ||
} | ||
|
||
if prefix == nil { | ||
return nil, nil, 0, 0, sdkerrors.Wrap(commitmenttypes.ErrInvalidPrefix, "prefix cannot be empty") | ||
} | ||
|
Oops, something went wrong.
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.
This should have been deleted in the Status pr
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.
Have you removed it from localhost?
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.
yup, I think this one got added back during a merge of main when I fixed the solo machine bug