LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

chore(store/v2): load the CommitID when LoadVersion (#20776)

Browse Source
This commit is contained in:
cool-developer 2024-06-25 15:55:55 -04:00 committed by GitHub
parent 5aaff21096
commit 929803d6cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
store/v2/root/store.go
View File

@ -243,7 +243,11 @@ func (s *Store) loadVersion(v uint64) error {
s.commitHeader = nil
// set lastCommitInfo explicitly s.t. Commit commits the correct version, i.e. v+1
s.lastCommitInfo = &proof.CommitInfo{Version: v}
var err error
s.lastCommitInfo, err = s.stateCommitment.GetCommitInfo(v)
if err != nil {
return fmt.Errorf("failed to get commit info for version %d: %w", v, err)
}
// if we're migrating, we need to start the migration process
if s.isMigrating {

12
store/v2/root/store_test.go
View File

@ -459,7 +459,7 @@ func (s *RootStoreTestSuite) TestMultiStore_Pruning_SameHeightsTwice() {
for v := uint64(1); v < numVersions-keepRecent; v++ {
var err error
checkErr := func() bool {
if err = s.rootStore.LoadVersion(v); err != nil {
if _, err = s.rootStore.StateAt(v); err != nil {
return true
}
return false
@ -469,7 +469,7 @@ func (s *RootStoreTestSuite) TestMultiStore_Pruning_SameHeightsTwice() {
}
for v := (numVersions - keepRecent); v < numVersions; v++ {
err := s.rootStore.LoadVersion(v)
_, err := s.rootStore.StateAt(v)
s.Require().NoError(err, "expected no error when loading height: %d", v)
}
@ -710,7 +710,7 @@ func (s *RootStoreTestSuite) TestMultiStoreRestart() {
s.Require().Equal([]byte(fmt.Sprintf("val%03d_%03d", 4, 3)), result, "value should be equal")
}
func (s *RootStoreTestSuite) TestHashStableWithEmptyCommit() {
func (s *RootStoreTestSuite) TestHashStableWithEmptyCommitAndRestart() {
err := s.rootStore.LoadLatestVersion()
s.Require().Nil(err)
@ -739,4 +739,10 @@ func (s *RootStoreTestSuite) TestHashStableWithEmptyCommit() {
s.Require().Nil(err)
s.Require().Equal(uint64(2), latestVersion)
s.Require().Equal(hash, cHash)
// reload the store
s.Require().NoError(s.rootStore.LoadLatestVersion())
lastCommitID, err = s.rootStore.LastCommitID()
s.Require().NoError(err)
s.Require().Equal(lastCommitID.Hash, hash)
}