From 69d1149f33ceb856f7c2a22480d0c5fcb9f330b5 Mon Sep 17 00:00:00 2001
From: mmsqe <mavis@crypto.com>
Date: Mon, 16 Dec 2024 20:47:16 +0800
Subject: [PATCH] resolve

---
 CHANGELOG.md                                              | 1 +
 .../internal => internal/btree}/memiterator_test.go       | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename store/{cachekv/internal => internal/btree}/memiterator_test.go (94%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09bef4b4a38e..3d6171aa191f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (crypto/keyring) [#21653](https://github.com/cosmos/cosmos-sdk/pull/21653) New Linux-only backend that adds Linux kernel's `keyctl` support.
 * (client/keys) [#21829](https://github.com/cosmos/cosmos-sdk/pull/21829) Add support for importing hex key using standard input.
 * (client) [#22807](https://github.com/cosmos/cosmos-sdk/pull/22807) Return v2 server information in the `version` command.
+* (baseapp) [#22893](https://github.com/cosmos/cosmos-sdk/pull/22893) Support mount object store in baseapp, add `ObjectStore` api in context.
 
 ### Improvements
 
diff --git a/store/cachekv/internal/memiterator_test.go b/store/internal/btree/memiterator_test.go
similarity index 94%
rename from store/cachekv/internal/memiterator_test.go
rename to store/internal/btree/memiterator_test.go
index 25e049cbe23a..3eb23e3fae0e 100644
--- a/store/cachekv/internal/memiterator_test.go
+++ b/store/internal/btree/memiterator_test.go
@@ -1,11 +1,11 @@
-package internal
+package btree
 
 import (
 	"testing"
 )
 
 func TestMemIterator_Ascending(t *testing.T) {
-	db := NewBTree()
+	db := NewBTree[[]byte]()
 	// db.set()
 	db.Set([]byte("a"), []byte("value_a"))
 	db.Set([]byte("b"), []byte("value_b"))
@@ -32,7 +32,7 @@ func TestMemIterator_Ascending(t *testing.T) {
 }
 
 func TestMemIterator_Descending(t *testing.T) {
-	db := NewBTree()
+	db := NewBTree[[]byte]()
 
 	db.Set([]byte("a"), []byte("value_a"))
 	db.Set([]byte("b"), []byte("value_b"))
@@ -60,7 +60,7 @@ func TestMemIterator_Descending(t *testing.T) {
 }
 
 func TestMemIterator_EmptyRange(t *testing.T) {
-	db := NewBTree()
+	db := NewBTree[[]byte]()
 	db.Set([]byte("a"), []byte("value_a"))
 	db.Set([]byte("b"), []byte("value_b"))
 	db.Set([]byte("c"), []byte("value_c"))