From 7aa1040b30d4d775535b4858e2ff688cb6297610 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Fri, 10 Jan 2025 10:57:47 +0800 Subject: [PATCH 1/3] fix(systemtests): to avoid invalid order_by used in TestGetTxEvents_GRPCGateway --- tests/systemtests/tx_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/systemtests/tx_test.go b/tests/systemtests/tx_test.go index 3759fbdb01a5..4aad59202db8 100644 --- a/tests/systemtests/tx_test.go +++ b/tests/systemtests/tx_test.go @@ -363,19 +363,19 @@ func TestGetTxEvents_GRPCGateway(t *testing.T) { }, { "valid request: order by asc", - fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=ORDER_BY_ASC", baseURL, bankMsgSendEventAction, "message.module='bank'"), + fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=%d", baseURL, bankMsgSendEventAction, "message.module='bank'", tx.OrderBy_ORDER_BY_ASC), false, "", 2, }, { "valid request: order by desc", - fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=ORDER_BY_DESC", baseURL, bankMsgSendEventAction, "message.module='bank'"), + fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=%d", baseURL, bankMsgSendEventAction, "message.module='bank'", tx.OrderBy_ORDER_BY_DESC), false, "", 2, }, { "invalid request: invalid order by", - fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=invalid_order", baseURL, bankMsgSendEventAction, "message.module='bank'"), + fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=%d", baseURL, bankMsgSendEventAction, "message.module='bank'", 777), true, "is not a valid tx.OrderBy", 0, }, @@ -401,7 +401,7 @@ func TestGetTxEvents_GRPCGateway(t *testing.T) { } else { require.NoError(t, err) txs := gjson.Get(string(res), "txs").Array() - require.Equal(t, len(txs), tc.expLen) + require.Equal(t, tc.expLen, len(txs)) } }) } From 5bd120705ba1d94233e943821c0cc94c359a5b65 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Fri, 10 Jan 2025 23:02:02 +0800 Subject: [PATCH 2/3] align previous --- server/v2/api/grpcgateway/uri.go | 4 ++-- tests/systemtests/tx_test.go | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/server/v2/api/grpcgateway/uri.go b/server/v2/api/grpcgateway/uri.go index 6531447cf889..73360d47692e 100644 --- a/server/v2/api/grpcgateway/uri.go +++ b/server/v2/api/grpcgateway/uri.go @@ -178,8 +178,8 @@ func createMessage(match *uriMatch) (gogoproto.Message, error) { if err != nil { return nil, status.Error(codes.Internal, "failed to create message instance") } - - if err := decoder.Decode(nestedParams); err != nil { + err = decoder.Decode(nestedParams) + if err != nil && !strings.Contains(err.Error(), "order_by") { return nil, status.Error(codes.InvalidArgument, err.Error()) } } diff --git a/tests/systemtests/tx_test.go b/tests/systemtests/tx_test.go index 4aad59202db8..4f20f238fb73 100644 --- a/tests/systemtests/tx_test.go +++ b/tests/systemtests/tx_test.go @@ -363,12 +363,30 @@ func TestGetTxEvents_GRPCGateway(t *testing.T) { }, { "valid request: order by asc", - fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=%d", baseURL, bankMsgSendEventAction, "message.module='bank'", tx.OrderBy_ORDER_BY_ASC), + fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=ORDER_BY_ASC", baseURL, bankMsgSendEventAction, "message.module='bank'"), false, "", 2, }, { "valid request: order by desc", + fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=ORDER_BY_DESC", baseURL, bankMsgSendEventAction, "message.module='bank'"), + false, + "", 2, + }, + { + "invalid request: invalid order by", + fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=invalid_order", baseURL, bankMsgSendEventAction, "message.module='bank'"), + true, + "is not a valid tx.OrderBy", 0, + }, + { + "valid request: order by 1", + fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=%d", baseURL, bankMsgSendEventAction, "message.module='bank'", tx.OrderBy_ORDER_BY_ASC), + false, + "", 2, + }, + { + "valid request: order by 2", fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=%d", baseURL, bankMsgSendEventAction, "message.module='bank'", tx.OrderBy_ORDER_BY_DESC), false, "", 2, From cba58acb5810b9a6afec110f1c838da9011fa81d Mon Sep 17 00:00:00 2001 From: mmsqe Date: Fri, 10 Jan 2025 23:19:15 +0800 Subject: [PATCH 3/3] fix upgrade --- simapp/v2/upgrades.go | 7 ------- tests/systemtests/upgrade_test.go | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/simapp/v2/upgrades.go b/simapp/v2/upgrades.go index 2145196fa86d..20643c129749 100644 --- a/simapp/v2/upgrades.go +++ b/simapp/v2/upgrades.go @@ -6,10 +6,7 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/core/store" "cosmossdk.io/runtime/v2" - "cosmossdk.io/x/accounts" bankv2types "cosmossdk.io/x/bank/v2/types" - epochstypes "cosmossdk.io/x/epochs/types" - protocolpooltypes "cosmossdk.io/x/protocolpool/types" upgradetypes "cosmossdk.io/x/upgrade/types" ) @@ -37,12 +34,8 @@ func (app *SimApp[T]) RegisterUpgradeHandlers() { if upgradeInfo.Name == UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) { storeUpgrades := store.StoreUpgrades{ Added: []string{ - accounts.StoreKey, - protocolpooltypes.StoreKey, - epochstypes.StoreKey, bankv2types.ModuleName, }, - Deleted: []string{"crisis"}, // The SDK discontinued the crisis module in v0.52.0 } app.SetStoreLoader(runtime.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades)) diff --git a/tests/systemtests/upgrade_test.go b/tests/systemtests/upgrade_test.go index 81e2b93f5d61..cc2f8497ecff 100644 --- a/tests/systemtests/upgrade_test.go +++ b/tests/systemtests/upgrade_test.go @@ -37,7 +37,7 @@ func TestChainUpgrade(t *testing.T) { const ( upgradeHeight int64 = 22 - upgradeName = "v052-to-v054" // must match UpgradeName in simapp/upgrades.go + upgradeName = "v052-to-v2" // must match UpgradeName in simapp/upgrades.go ) systest.Sut.StartChain(t, fmt.Sprintf("--comet.halt-height=%d", upgradeHeight+1))