add query to fetch report ids and query_ids

e2e/spinup_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/tellor-io/layer/e2e"
 	"github.com/tellor-io/layer/utils"
+	oracletypes "github.com/tellor-io/layer/x/oracle/types"
 
 	"cosmossdk.io/math"
 )
@@ -89,7 +90,7 @@ func ExecProposal(ctx context.Context, keyName string, prop Proposal, tn *cosmos
 	return tn.ExecTx(ctx, keyName, command...)
 }
 
-func TestLearn(t *testing.T) {
+func TestLayerFlow(t *testing.T) {
 	ctx := context.Background()
 	layer := e2e.LayerSpinup(t) // *cosmos.CosmosChain type
 	validatorI := layer.Validators[0]
@@ -204,3 +205,19 @@ func TestLearn(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, disputes.Disputes[0].Metadata.DisputeStatus, 2) // resolved
 }
+
+func TestGetCyclelist(t *testing.T) {
+	t.Skip("infinitely runs and calls CurrentCyclistQuery")
+	ctx := context.Background()
+	layer := e2e.LayerSpinup(t) // *cosmos.CosmosChain type
+	validatorI := layer.Validators[0]
+
+	queryClient := oracletypes.NewQueryClient(validatorI.GrpcConn)
+	for {
+		res, err := queryClient.CurrentCyclelistQuery(ctx, &oracletypes.QueryCurrentCyclelistQueryRequest{})
+		require.NoError(t, err)
+		// fmt.Println(res.QueryMeta)
+		require.NotNil(t, res.QueryData)
+		require.NotNil(t, res.QueryMeta)
+	}
+}

proto/layer/oracle/query.proto

@@ -87,6 +87,9 @@ service Query {
   rpc GetCurrentQueryByQueryId(QueryGetCurrentQueryByQueryIdRequest) returns (QueryGetCurrentQueryByQueryIdResponse) {
     option (google.api.http).get = "/tellor-io/layer/oracle/get_current_query_by_query_id/{query_id}";
   }
+  rpc ReportedIdsByReporter(QueryReportedIdsByReporterRequest) returns (QueryReportedIdsByReporterResponse) {
+    option (google.api.http).get = "/tellor-io/layer/oracle/reported_ids_by_reporter/{reporter_address}";
+  }
 }
 
 // QueryParamsRequest is request type for the Query/Params RPC method.
@@ -261,4 +264,15 @@ message QueryGetCurrentQueryByQueryIdRequest {
 
 message QueryGetCurrentQueryByQueryIdResponse {
   QueryMeta query = 1;
+}
+
+message QueryReportedIdsByReporterRequest {
+  string reporter_address = 1;
+  cosmos.base.query.v1beta1.PageRequest pagination = 2;
+}
+
+message QueryReportedIdsByReporterResponse {
+  repeated uint64 ids = 1;
+  repeated bytes query_ids =2;
+  cosmos.base.query.v1beta1.PageResponse pagination = 3;
 }

x/oracle/keeper/query.go

@@ -117,3 +117,31 @@ func (k Querier) TippedQueries(ctx context.Context, req *types.QueryTippedQuerie
 
 	return &types.QueryTippedQueriesResponse{Queries: queries}, nil
 }
+
+func (k Querier) ReportedIdsByReporter(ctx context.Context, req *types.QueryReportedIdsByReporterRequest) (*types.QueryReportedIdsByReporterResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "invalid request")
+	}
+
+	store := runtime.KVStoreAdapter(k.keeper.storeService.OpenKVStore(ctx))
+	reportsStore := prefix.NewStore(store, types.ReportsPrefix)
+	ids := make([]uint64, 0)
+	queryIds := make([][]byte, 0)
+
+	pageRes, err := query.Paginate(reportsStore, req.Pagination, func(key, value []byte) error {
+		keycdc := collections.TripleKeyCodec(collections.BytesKey, collections.BytesKey, collections.Uint64Key)
+		_, pk, err := keycdc.Decode(key)
+		if err != nil {
+			return err
+		}
+		ids = append(ids, pk.K3())
+		queryIds = append(queryIds, pk.K1())
+
+		return nil
+	})
+	if err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+
+	return &types.QueryReportedIdsByReporterResponse{Ids: ids, QueryIds: queryIds, Pagination: pageRes}, nil
+}

x/oracle/keeper/query_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	testkeeper "github.com/tellor-io/layer/testutil/keeper"
+	"github.com/tellor-io/layer/testutil/sample"
 	"github.com/tellor-io/layer/utils"
 	"github.com/tellor-io/layer/x/oracle/keeper"
 	"github.com/tellor-io/layer/x/oracle/types"
@@ -411,3 +412,50 @@ func (s *KeeperTestSuite) TestTippedQueries() {
 		})
 	}
 }
+
+func (s *KeeperTestSuite) TestReportedIdsByReporter() {
+	k := s.oracleKeeper
+	q := s.queryClient
+	reporter := sample.AccAddressBytes()
+	// fetching in descending order
+	pageReq := &query.PageRequest{Reverse: true}
+	queryReq := types.QueryReportedIdsByReporterRequest{ReporterAddress: reporter.String(), Pagination: pageReq}
+	for i := 1; i < 11; i++ {
+		s.NoError(k.Reports.Set(s.ctx,
+			collections.Join3([]byte("queryid1"), reporter.Bytes(), uint64(i)),
+			types.MicroReport{}))
+	}
+	res, err := q.ReportedIdsByReporter(s.ctx, &queryReq)
+	s.NoError(err)
+	s.Equal(res.Ids, []uint64{10, 9, 8, 7, 6, 5, 4, 3, 2, 1})
+
+	pageReq.Reverse = false
+	res, err = q.ReportedIdsByReporter(s.ctx, &queryReq)
+	s.NoError(err)
+	s.Equal(res.Ids, []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
+
+	pageReq.Limit = 1
+	res, err = q.ReportedIdsByReporter(s.ctx, &queryReq)
+	s.NoError(err)
+	s.Equal(res.Ids, []uint64{1})
+
+	pageReq.Limit = 1
+	pageReq.Reverse = true
+	res, err = q.ReportedIdsByReporter(s.ctx, &queryReq)
+	s.NoError(err)
+	s.Equal(res.Ids, []uint64{10})
+
+	pageReq.Limit = 5
+	pageReq.Offset = 1
+	pageReq.Reverse = true
+	res, err = q.ReportedIdsByReporter(s.ctx, &queryReq)
+	s.NoError(err)
+	s.Equal(res.Ids, []uint64{9, 8, 7, 6, 5})
+
+	pageReq.Limit = 5
+	pageReq.Offset = 4
+	pageReq.Reverse = false
+	res, err = q.ReportedIdsByReporter(s.ctx, &queryReq)
+	s.NoError(err)
+	s.Equal(res.Ids, []uint64{5, 6, 7, 8, 9})
+}