From dee2e40e96ab753feadefdc6bb5e94eef824c8f4 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Sun, 2 Oct 2022 21:12:58 -0300 Subject: [PATCH 1/5] refactor: remove dead code --- store/cachekv/memiterator.go | 11 ++++++----- store/cachekv/mergeiterator.go | 17 +---------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/store/cachekv/memiterator.go b/store/cachekv/memiterator.go index e65e8a580fce..a12ff9acfd11 100644 --- a/store/cachekv/memiterator.go +++ b/store/cachekv/memiterator.go @@ -19,8 +19,10 @@ type memIterator struct { } func newMemIterator(start, end []byte, items *dbm.MemDB, deleted map[string]struct{}, ascending bool) *memIterator { - var iter types.Iterator - var err error + var ( + iter types.Iterator + err error + ) if ascending { iter, err = items.Iterator(start, end) @@ -34,9 +36,8 @@ func newMemIterator(start, end []byte, items *dbm.MemDB, deleted map[string]stru return &memIterator{ Iterator: iter, - - lastKey: nil, - deleted: deleted, + lastKey: nil, + deleted: deleted, } } diff --git a/store/cachekv/mergeiterator.go b/store/cachekv/mergeiterator.go index 25dfac803329..7a805e7ec9ea 100644 --- a/store/cachekv/mergeiterator.go +++ b/store/cachekv/mergeiterator.go @@ -35,22 +35,7 @@ func newCacheMergeIterator(parent, cache types.Iterator, ascending bool) *cacheM // Domain implements Iterator. // If the domains are different, returns the union. func (iter *cacheMergeIterator) Domain() (start, end []byte) { - startP, endP := iter.parent.Domain() - startC, endC := iter.cache.Domain() - - if iter.compare(startP, startC) < 0 { - start = startP - } else { - start = startC - } - - if iter.compare(endP, endC) < 0 { - end = endC - } else { - end = endP - } - - return start, end + return iter.parent.Domain() } // Valid implements Iterator. From d711bf06375219f070a3bbdc1ed5f9f2ffd66aa8 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Sun, 2 Oct 2022 22:09:06 -0300 Subject: [PATCH 2/5] remove comment --- store/cachekv/mergeiterator.go | 1 - 1 file changed, 1 deletion(-) diff --git a/store/cachekv/mergeiterator.go b/store/cachekv/mergeiterator.go index 7a805e7ec9ea..67f6ee60213c 100644 --- a/store/cachekv/mergeiterator.go +++ b/store/cachekv/mergeiterator.go @@ -33,7 +33,6 @@ func newCacheMergeIterator(parent, cache types.Iterator, ascending bool) *cacheM } // Domain implements Iterator. -// If the domains are different, returns the union. func (iter *cacheMergeIterator) Domain() (start, end []byte) { return iter.parent.Domain() } From 9ae6824e7ceaa7cbf371f7532043d91472931d5c Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Tue, 4 Oct 2022 09:54:26 -0300 Subject: [PATCH 3/5] cl++ --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3af4efbbd88c..4873c66158e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,6 +87,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [#13236](https://github.com/cosmos/cosmos-sdk/pull/13236) Integrate Filter Logging * [#13301](https://github.com/cosmos/cosmos-sdk/pull/13301) Keep the balance query endpoint compatible with legacy blocks * [#13321](https://github.com/cosmos/cosmos-sdk/pull/13321) Add flag to disable fast node migration and usage. +* [#13433](https://github.com/cosmos/cosmos-sdk/pull/13433) Remove dead code in cacheMergeIterator `Domain()`. ### State Machine Breaking From 64366db0fed53ec39a05bd4b96a8ee4824cb6def Mon Sep 17 00:00:00 2001 From: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Date: Tue, 4 Oct 2022 10:09:14 -0300 Subject: [PATCH 4/5] Update CHANGELOG.md Co-authored-by: Marko --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54b318711cda..31260542ae66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,8 +77,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [#13168](https://github.com/cosmos/cosmos-sdk/pull/13168) Migrate tendermintdev/proto-builder to ghcr.io. New image `ghcr.io/cosmos/proto-builder:0.8` * [#13178](https://github.com/cosmos/cosmos-sdk/pull/13178) Add `cosmos.msg.v1.service` protobuf annotation to allow tooling to distinguish between Msg and Query services via reflection. * [#13236](https://github.com/cosmos/cosmos-sdk/pull/13236) Integrate Filter Logging -* [#13301](https://github.com/cosmos/cosmos-sdk/pull/13301) Keep the balance query endpoint compatible with legacy blocks -* [#13321](https://github.com/cosmos/cosmos-sdk/pull/13321) Add flag to disable fast node migration and usage. * [#13433](https://github.com/cosmos/cosmos-sdk/pull/13433) Remove dead code in cacheMergeIterator `Domain()`. ### State Machine Breaking From 0f056b05b3b4180c46d11635e721d4e3c785215e Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 5 Oct 2022 07:07:37 +0200 Subject: [PATCH 5/5] Update store/cachekv/mergeiterator.go --- store/cachekv/mergeiterator.go | 1 + 1 file changed, 1 insertion(+) diff --git a/store/cachekv/mergeiterator.go b/store/cachekv/mergeiterator.go index 67f6ee60213c..a6c7a035aba0 100644 --- a/store/cachekv/mergeiterator.go +++ b/store/cachekv/mergeiterator.go @@ -33,6 +33,7 @@ func newCacheMergeIterator(parent, cache types.Iterator, ascending bool) *cacheM } // Domain implements Iterator. +// Returns parent domain because cache and parent domains are the same. func (iter *cacheMergeIterator) Domain() (start, end []byte) { return iter.parent.Domain() }