Skip to content

Problem: versiondb NewKVStore don't accept string as store name #1684

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Problem: versiondb NewKVStore don't accept string as store name #1684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46f2825
Problem: versiondb NewKVStore don't accept string as store name
Nov 11, 2024
9f33c91
Update CHANGELOG.md
Nov 11, 2024
e55e740
Merge branch 'main' into cleanup
Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

* [#1679](https://github.com/crypto-org-chain/cronos/pull/1679) Include no trace detail on insufficient balance fix.

### Improvements

* [#1684](https://github.com/crypto-org-chain/cronos/pull/1684) versiondb NewKVStore accept string as store name.

*Nov 6, 2024*

## v1.4.0-rc3
Expand Down
4 changes: 2 additions & 2 deletions versiondb/multistore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
) *MultiStore {
stores := make(map[types.StoreKey]types.KVStore, len(storeKeys))
for _, k := range storeKeys {
stores[k] = NewKVStore(versionDB, k, nil)
stores[k] = NewKVStore(versionDB, k.Name(), nil)

Check warning on line 39 in versiondb/multistore.go

View check run for this annotation

Codecov / codecov/patch

versiondb/multistore.go#L39 

Added line #L39 was not covered by tests
}
return &MultiStore{
versionDB: versionDB,
Expand All @@ -61,7 +61,7 @@
if version == nil {
stores[k] = s.stores[k]
} else {
stores[k] = NewKVStore(s.versionDB, k, version)
stores[k] = NewKVStore(s.versionDB, k.Name(), version)

Check warning on line 64 in versiondb/multistore.go

View check run for this annotation

Codecov / codecov/patch

versiondb/multistore.go#L64 

Added line #L64 was not covered by tests
}
}
return cachemulti.NewStore(nil, stores, nil, s.traceWriter, s.getTracingContext())
Expand Down
16 changes: 8 additions & 8 deletions versiondb/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@

// Store Implements types.KVStore
type Store struct {
store VersionStore
storeKey types.StoreKey
version *int64
store VersionStore
name string
version *int64
}

func NewKVStore(store VersionStore, storeKey types.StoreKey, version *int64) *Store {
func NewKVStore(store VersionStore, storeKey string, version *int64) *Store {

Check warning on line 23 in versiondb/store.go

View check run for this annotation

Codecov / codecov/patch

versiondb/store.go#L23 

Added line #L23 was not covered by tests
return &Store{store, storeKey, version}
}

Expand All @@ -38,7 +38,7 @@
// Implements types.KVStore.
func (st *Store) Get(key []byte) []byte {
defer telemetry.MeasureSince(time.Now(), "store", "versiondb", "get")
value, err := st.store.GetAtVersion(st.storeKey.Name(), key, st.version)
value, err := st.store.GetAtVersion(st.name, key, st.version)

Check warning on line 41 in versiondb/store.go

View check run for this annotation

Codecov / codecov/patch

versiondb/store.go#L41 

Added line #L41 was not covered by tests
if err != nil {
panic(err)
}
Expand All @@ -48,7 +48,7 @@
// Implements types.KVStore.
func (st *Store) Has(key []byte) (exists bool) {
defer telemetry.MeasureSince(time.Now(), "store", "versiondb", "has")
has, err := st.store.HasAtVersion(st.storeKey.Name(), key, st.version)
has, err := st.store.HasAtVersion(st.name, key, st.version)

Check warning on line 51 in versiondb/store.go

View check run for this annotation

Codecov / codecov/patch

versiondb/store.go#L51 

Added line #L51 was not covered by tests
if err != nil {
panic(err)
}
Expand All @@ -57,7 +57,7 @@

// Implements types.KVStore.
func (st *Store) Iterator(start, end []byte) types.Iterator {
itr, err := st.store.IteratorAtVersion(st.storeKey.Name(), start, end, st.version)
itr, err := st.store.IteratorAtVersion(st.name, start, end, st.version)

Check warning on line 60 in versiondb/store.go

View check run for this annotation

Codecov / codecov/patch

versiondb/store.go#L60 

Added line #L60 was not covered by tests
if err != nil {
panic(err)
}
Expand All @@ -66,7 +66,7 @@

// Implements types.KVStore.
func (st *Store) ReverseIterator(start, end []byte) types.Iterator {
itr, err := st.store.ReverseIteratorAtVersion(st.storeKey.Name(), start, end, st.version)
itr, err := st.store.ReverseIteratorAtVersion(st.name, start, end, st.version)

Check warning on line 69 in versiondb/store.go

View check run for this annotation

Codecov / codecov/patch

versiondb/store.go#L69 

Added line #L69 was not covered by tests
if err != nil {
panic(err)
}
Expand Down
Loading