fix: make all

proto/kyve/query/v1beta1/query.proto

@@ -4,9 +4,9 @@ package kyve.query.v1beta1;
 
 import "amino/amino.proto";
 import "cosmos/base/v1beta1/coin.proto";
+import "cosmos/staking/v1beta1/staking.proto";
 import "gogoproto/gogo.proto";
 import "kyve/pool/v1beta1/pool.proto";
-import "cosmos/staking/v1beta1/staking.proto";
 
 option go_package = "github.com/KYVENetwork/chain/x/query/types";
 

proto/kyve/query/v1beta1/stakers.proto

@@ -6,7 +6,6 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "kyve/query/v1beta1/query.proto";
-import "kyve/stakers/v1beta1/stakers.proto";
 
 option go_package = "github.com/KYVENetwork/chain/x/query/types";
 

testutil/integration/checks.go

@@ -2,6 +2,7 @@ package integration
 
 import (
 	"fmt"
+	"sort"
 	"time"
 
 	"github.com/KYVENetwork/chain/util"
@@ -123,19 +124,18 @@ func (suite *KeeperTestSuite) VerifyPoolQueries() {
 
 		// test stakers by pool
 		valaccounts := suite.App().StakersKeeper.GetAllValaccountsOfPool(suite.Ctx(), poolsState[i].Id)
-		stakersByPoolState := make([]querytypes.StakerPoolResponse, 0)
+		stakersByPoolState := make([]querytypes.FullStaker, 0)
 
 		for _, valaccount := range valaccounts {
-			_, stakerFound := suite.App().StakersKeeper.GetValidator(suite.Ctx(), valaccount.Staker)
-
-			if stakerFound {
-				stakersByPoolState = append(stakersByPoolState, querytypes.StakerPoolResponse{
-					Staker:     suite.App().QueryKeeper.GetFullStaker(suite.Ctx(), valaccount.Staker),
-					Valaccount: valaccount,
-				})
+			if _, stakerFound := suite.App().StakersKeeper.GetValidator(suite.Ctx(), valaccount.Staker); stakerFound {
+				stakersByPoolState = append(stakersByPoolState, *suite.App().QueryKeeper.GetFullStaker(suite.Ctx(), valaccount.Staker))
 			}
 		}
 
+		sort.Slice(stakersByPoolState, func(a, b int) bool {
+			return suite.App().StakersKeeper.GetValidatorPoolStake(suite.Ctx(), stakersByPoolState[a].Address, poolsState[i].Id) > suite.App().StakersKeeper.GetValidatorPoolStake(suite.Ctx(), stakersByPoolState[b].Address, poolsState[i].Id)
+		})
+
 		stakersByPoolQuery, stakersByPoolQueryErr := suite.App().QueryKeeper.StakersByPool(suite.Ctx(), &querytypes.QueryStakersByPoolRequest{
 			PoolId: poolsState[i].Id,
 		})

x/query/keeper/grpc_query_stakers_by_pool_count.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"context"
+
 	"github.com/KYVENetwork/chain/x/query/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/query"