From 849dac221957a94ed57d6f66a1121ca38f6e2e88 Mon Sep 17 00:00:00 2001 From: marston Date: Tue, 10 Dec 2024 23:04:15 -0500 Subject: [PATCH 1/2] fixing expired query --- scripts/upgrade-test.sh | 2 +- x/rns/keeper/grpc_query_list_owned_names.go | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade-test.sh b/scripts/upgrade-test.sh index c7838eea2..409a18acb 100755 --- a/scripts/upgrade-test.sh +++ b/scripts/upgrade-test.sh @@ -16,7 +16,7 @@ export GOMODCACHE=${ROOT}/../_build/gocache mkdir -p ../_build/old git checkout $OLD_VERSION -make build +go build -mod=readonly -o build/canined ./cmd/canined mv build/canined ./../_build/old/canined git checkout $NEW_VERSION make install diff --git a/x/rns/keeper/grpc_query_list_owned_names.go b/x/rns/keeper/grpc_query_list_owned_names.go index f09c9f91c..5c9e69230 100644 --- a/x/rns/keeper/grpc_query_list_owned_names.go +++ b/x/rns/keeper/grpc_query_list_owned_names.go @@ -53,8 +53,10 @@ func (k Keeper) ListOwnedNames(goCtx context.Context, req *types.QueryListOwnedN } if names.Value == req.Address { - namess = append(namess, names) - i++ + if names.Expires < ctx.BlockHeight() { + namess = append(namess, names) + i++ + } } } From 24162708d41ae76bb08149a48fdc666c3b48177e Mon Sep 17 00:00:00 2001 From: marston Date: Thu, 12 Dec 2024 12:40:11 -0500 Subject: [PATCH 2/2] fixing sign :( --- x/rns/keeper/grpc_query_list_owned_names.go | 2 +- x/rns/keeper/register_test.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/x/rns/keeper/grpc_query_list_owned_names.go b/x/rns/keeper/grpc_query_list_owned_names.go index 5c9e69230..db7dfff4b 100644 --- a/x/rns/keeper/grpc_query_list_owned_names.go +++ b/x/rns/keeper/grpc_query_list_owned_names.go @@ -53,7 +53,7 @@ func (k Keeper) ListOwnedNames(goCtx context.Context, req *types.QueryListOwnedN } if names.Value == req.Address { - if names.Expires < ctx.BlockHeight() { + if names.Expires > ctx.BlockHeight() { namess = append(namess, names) i++ } diff --git a/x/rns/keeper/register_test.go b/x/rns/keeper/register_test.go index 1ef7806ed..21d0631d7 100644 --- a/x/rns/keeper/register_test.go +++ b/x/rns/keeper/register_test.go @@ -75,6 +75,11 @@ func (suite *KeeperTestSuite) TestMsgRegisterName() { suite.Require().NoError(err) } + rrr, err := suite.queryClient.AllNames(suite.ctx.Context(), &types.QueryAllNames{}) + suite.Require().NoError(err) + + suite.Require().Equal(100, len(rrr.Name)) + r := types.QueryListOwnedNames{ Address: address.String(), }