set up rootmultistore in the new way and address WrongArgCount lints

go.work

@@ -3,5 +3,5 @@ go 1.20
 use (
 	./
 	./modules/capability
-	./e2e
+//	./e2e // after upgrading ibc-go we can upgrade interchaintest
 )

modules/core/03-connection/types/msgs_test.go

@@ -7,9 +7,9 @@ import (
 
 	log "cosmossdk.io/log"
 	"cosmossdk.io/store/iavl"
+	"cosmossdk.io/store/metrics"
 	"cosmossdk.io/store/rootmulti"
 	storetypes "cosmossdk.io/store/types"
-	abci "github.com/cometbft/cometbft/abci/types"
 	dbm "github.com/cosmos/cosmos-db"
 	"github.com/stretchr/testify/suite"
 
@@ -48,8 +48,7 @@ func (suite *MsgTestSuite) SetupTest() {
 
 	app := simapp.Setup(false)
 	db := dbm.NewMemDB()
-	dblog := log.NewTestLogger(suite.T())
-	store := rootmulti.NewStore(db, dblog)
+	store := rootmulti.NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
 	storeKey := storetypes.NewKVStoreKey("iavlStoreKey")
 
 	store.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, nil)
@@ -60,9 +59,9 @@ func (suite *MsgTestSuite) SetupTest() {
 	iavlStore.Set([]byte("KEY"), []byte("VALUE"))
 	_ = store.Commit()
 
-	res, err := store.Query(abci.RequestQuery{
-		Path:  fmt.Sprintf("/%s/key", storeKey.Name()), // required path to get key/value+proof
+	res, err := store.Query(&storetypes.RequestQuery{
 		Data:  []byte("KEY"),
+		Path:  fmt.Sprintf("/%s/key", storeKey.Name()), // required path to get key/value+proof
 		Prove: true,
 	})
 

modules/core/04-channel/types/msgs_test.go

@@ -6,6 +6,7 @@ import (
 
 	log "cosmossdk.io/log"
 	"cosmossdk.io/store/iavl"
+	"cosmossdk.io/store/metrics"
 	"cosmossdk.io/store/rootmulti"
 	storetypes "cosmossdk.io/store/types"
 	abci "github.com/cometbft/cometbft/abci/types"
@@ -76,7 +77,7 @@ func (suite *TypesTestSuite) SetupTest() {
 	app := simapp.Setup(false)
 	db := dbm.NewMemDB()
 	dblog := log.NewTestLogger(suite.T())
-	store := rootmulti.NewStore(db, dblog)
+	store := rootmulti.NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
 	storeKey := storetypes.NewKVStoreKey("iavlStoreKey")
 
 	store.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, nil)
@@ -87,7 +88,7 @@ func (suite *TypesTestSuite) SetupTest() {
 	iavlStore.Set([]byte("KEY"), []byte("VALUE"))
 	_ = store.Commit()
 
-	query := abci.RequestQuery{abci.RequestQuery{
+	query := abci.RequestQuery{&storetypes.RequestQuery{
 		Data:   []byte("KEY"),
 		Path:   fmt.Sprintf("/%s/key", storeKey.Name()), // required path to get key/value+proof
 		Height: 1,

modules/core/23-commitment/types/commitment_test.go

@@ -5,6 +5,7 @@ import (
 
 	"cosmossdk.io/log"
 	"cosmossdk.io/store/iavl"
+	"cosmossdk.io/store/metrics"
 	"cosmossdk.io/store/rootmulti"
 	storetypes "cosmossdk.io/store/types"
 	dbm "github.com/cosmos/cosmos-db"
@@ -21,8 +22,7 @@ type MerkleTestSuite struct {
 
 func (suite *MerkleTestSuite) SetupTest() {
 	db := dbm.NewMemDB()
-	dblog := log.NewTestLogger(suite.T())
-	suite.store = rootmulti.NewStore(db, dblog)
+	suite.store = rootmulti.NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
 
 	suite.storeKey = storetypes.NewKVStoreKey("iavlStoreKey")
 

modules/core/23-commitment/types/merkle_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	abci "github.com/cometbft/cometbft/abci/types"
+	storetypes "cosmossdk.io/store/types"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types"
@@ -14,7 +14,7 @@ func (suite *MerkleTestSuite) TestVerifyMembership() {
 	suite.iavlStore.Set([]byte("MYKEY"), []byte("MYVALUE"))
 	cid := suite.store.Commit()
 
-	res, err := suite.store.Query(abci.RequestQuery{
+	res, err := suite.store.Query(&storetypes.RequestQuery{
 		Path:  fmt.Sprintf("/%s/key", suite.storeKey.Name()), // required path to get key/value+proof
 		Data:  []byte("MYKEY"),
 		Prove: true,
@@ -79,7 +79,7 @@ func (suite *MerkleTestSuite) TestVerifyNonMembership() {
 	cid := suite.store.Commit()
 
 	// Get Proof
-	res, err := suite.store.Query(abci.RequestQuery{
+	res, err := suite.store.Query(&storetypes.RequestQuery{
 		Path:  fmt.Sprintf("/%s/key", suite.storeKey.Name()), // required path to get key/value+proof
 		Data:  []byte("MYABSENTKEY"),
 		Prove: true,

modules/core/23-commitment/types/utils_test.go

@@ -3,7 +3,7 @@ package types_test
 import (
 	"fmt"
 
-	abci "github.com/cometbft/cometbft/abci/types"
+	storetypes "cosmossdk.io/store/types"
 	crypto "github.com/cometbft/cometbft/proto/tendermint/crypto"
 	"github.com/stretchr/testify/require"
 
@@ -29,11 +29,12 @@ func (suite *MerkleTestSuite) TestConvertProofs() {
 		{
 			"success for ExistenceProof",
 			func() {
-				res, _ := suite.store.Query(abci.RequestQuery{
+				res, err := suite.store.Query(&storetypes.RequestQuery{
 					Path:  fmt.Sprintf("/%s/key", suite.storeKey.Name()), // required path to get key/value+proof
 					Data:  []byte("MYKEY"),
 					Prove: true,
 				})
+				require.NoError(suite.T(), err)
 				require.NotNil(suite.T(), res.ProofOps)
 
 				proofOps = res.ProofOps
@@ -43,11 +44,12 @@ func (suite *MerkleTestSuite) TestConvertProofs() {
 		{
 			"success for NonexistenceProof",
 			func() {
-				res, _ := suite.store.Query(abci.RequestQuery{
+				res, err := suite.store.Query(&storetypes.RequestQuery{
 					Path:  fmt.Sprintf("/%s/key", suite.storeKey.Name()), // required path to get key/value+proof
 					Data:  []byte("NOTMYKEY"),
 					Prove: true,
 				})
+				require.NoError(suite.T(), err)
 				require.NotNil(suite.T(), res.ProofOps)
 
 				proofOps = res.ProofOps
@@ -64,11 +66,12 @@ func (suite *MerkleTestSuite) TestConvertProofs() {
 		{
 			"proof op data is nil",
 			func() {
-				res, _ := suite.store.Query(abci.RequestQuery{
+				res, err := suite.store.Query(&storetypes.RequestQuery{
 					Path:  fmt.Sprintf("/%s/key", suite.storeKey.Name()), // required path to get key/value+proof
 					Data:  []byte("MYKEY"),
 					Prove: true,
 				})
+				require.NoError(suite.T(), err)
 				require.NotNil(suite.T(), res.ProofOps)
 
 				proofOps = res.ProofOps