feat: implement dataDeal query client

proto/panacea/datadeal/v2/query.proto

@@ -40,7 +40,7 @@ message QueryDealsRequest {
 
 // QueryDealsResponse defines the response type for the Query/Deals RPC method.
 message QueryDealsResponse {
-  repeated Deal deal = 1;
+  repeated Deal deals = 1;
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 

types/testsuite/suite.go

@@ -221,6 +221,7 @@ func (suite *TestSuite) SetupTest() {
 		memKeys[oracletypes.MemStoreKey],
 		paramsKeeper.Subspace(oracletypes.ModuleName),
 	)
+	suite.OracleMsgServer = oraclekeeper.NewMsgServerImpl(suite.OracleKeeper)
 
 	suite.DataDealKeeper = *datadealkeeper.NewKeeper(
 		cdc.Marshaler,
@@ -231,8 +232,6 @@ func (suite *TestSuite) SetupTest() {
 		suite.OracleKeeper,
 	)
 	suite.DataDealMsgServer = datadealkeeper.NewMsgServerImpl(suite.DataDealKeeper)
-
-	suite.OracleMsgServer = oraclekeeper.NewMsgServerImpl(suite.OracleKeeper)
 }
 
 func (suite *TestSuite) BeforeTest(suiteName, testName string) {

x/datadeal/client/cli/query.go

@@ -19,8 +19,10 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
 		RunE:                       client.ValidateCmd,
 	}
 
-	cmd.AddCommand(CmdGetDeal())
 	cmd.AddCommand(CmdGetDeals())
+	cmd.AddCommand(CmdGetDeal())
+	cmd.AddCommand(CmdGetCertificates())
+	cmd.AddCommand(CmdGetCertificate())
 
 	return cmd
 }

x/datadeal/client/cli/queryCertificate.go

@@ -0,0 +1,87 @@
+package cli
+
+import (
+	"strconv"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/medibloc/panacea-core/v2/x/datadeal/types"
+	"github.com/spf13/cobra"
+)
+
+func CmdGetCertificates() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "certificates [deal-id]",
+		Short: "Query certificates",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(clientCtx)
+
+			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
+			dealID, err := strconv.ParseUint(args[0], 10, 64)
+			if err != nil {
+				return err
+			}
+
+			req := &types.QueryCertificates{
+				DealId:     dealID,
+				Pagination: pageReq,
+			}
+			res, err := queryClient.Certificates(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}
+
+func CmdGetCertificate() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "certificate [deal-id] [data-hash]",
+		Short: "Query a certificate info",
+		Args:  cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(clientCtx)
+
+			dealID, err := strconv.ParseUint(args[0], 10, 64)
+			if err != nil {
+				return err
+			}
+
+			req := &types.QueryCertificate{
+				DealId:   dealID,
+				DataHash: args[1],
+			}
+			res, err := queryClient.Certificate(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}

x/datadeal/keeper/grpc_query_deal.go

@@ -52,17 +52,53 @@ func (k Keeper) Deals(goCtx context.Context, req *types.QueryDealsRequest) (*typ
 	}
 
 	return &types.QueryDealsResponse{
-		Deal:       deals,
+		Deals:       deals,
 		Pagination: pageRes,
 	}, nil
 }
 
-func (k Keeper) Certificates(ctx context.Context, certificates *types.QueryCertificates) (*types.QueryCertificatesResponse, error) {
-	//TODO implement me
-	panic("implement me")
+func (k Keeper) Certificates(goCtx context.Context, req *types.QueryCertificates) (*types.QueryCertificatesResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "invalid request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+
+	store := ctx.KVStore(k.storeKey)
+
+	certsStore := prefix.NewStore(store, append(types.CertificateKey, sdk.Uint64ToBigEndian(req.DealId)...))
+
+	var certs []*types.Certificate
+	pageRes, err := query.Paginate(certsStore, req.Pagination, func(_ []byte, value []byte) error {
+		var cert types.Certificate
+		err := k.cdc.UnmarshalLengthPrefixed(value, &cert)
+		if err != nil {
+			return err
+		}
+		certs = append(certs, &cert)
+		return nil
+	})
+	if err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+
+	return &types.QueryCertificatesResponse{
+		Certificates: certs,
+		Pagination:   pageRes,
+	}, nil
 }
 
-func (k Keeper) Certificate(ctx context.Context, certificate *types.QueryCertificate) (*types.QueryCertificateResponse, error) {
-	//TODO implement me
-	panic("implement me")
+func (k Keeper) Certificate(goCtx context.Context, req *types.QueryCertificate) (*types.QueryCertificateResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "invalid request")
+	}
+
+	cert, err := k.GetCertificate(sdk.UnwrapSDKContext(goCtx), req.DealId, req.DataHash)
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.QueryCertificateResponse{
+		Certificate: cert,
+	}, nil
 }

x/datadeal/keeper/grpc_query_deal_test.go

@@ -3,7 +3,9 @@ package keeper_test
 import (
 	"testing"
 
+	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/query"
 	"github.com/medibloc/panacea-core/v2/x/datadeal/testutil"
 	"github.com/medibloc/panacea-core/v2/x/datadeal/types"
 	"github.com/stretchr/testify/suite"
@@ -12,13 +14,21 @@ import (
 type queryDealTestSuite struct {
 	testutil.DataDealBaseTestSuite
 
+	oracleAccAddr   sdk.AccAddress
+	providerAccAddr sdk.AccAddress
 	consumerAccAddr sdk.AccAddress
 }
 
 func TestQueryDealTest(t *testing.T) {
 	suite.Run(t, new(queryDealTestSuite))
 }
 
+func (suite *queryDealTestSuite) BeforeTest(_, _ string) {
+	suite.oracleAccAddr = sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address())
+	suite.providerAccAddr = sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address())
+	suite.consumerAccAddr = sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address())
+}
+
 func (suite *queryDealTestSuite) TestQueryDeal() {
 	deal := suite.MakeTestDeal(1, suite.consumerAccAddr, 100)
 	err := suite.DataDealKeeper.SetDeal(suite.Ctx, deal)
@@ -36,24 +46,104 @@ func (suite *queryDealTestSuite) TestQueryDeal() {
 }
 
 func (suite *queryDealTestSuite) TestQueryDeals() {
-	deal1 := suite.MakeTestDeal(1, suite.consumerAccAddr, 100)
-	err := suite.DataDealKeeper.SetDeal(suite.Ctx, deal1)
+	deal := suite.MakeTestDeal(1, suite.consumerAccAddr, 100)
+	err := suite.DataDealKeeper.SetDeal(suite.Ctx, deal)
 	suite.Require().NoError(err)
 
-	deal2 := suite.MakeTestDeal(2, suite.consumerAccAddr, 100)
+	deal2 := suite.MakeTestDeal(2, suite.consumerAccAddr, 10)
 	err = suite.DataDealKeeper.SetDeal(suite.Ctx, deal2)
 	suite.Require().NoError(err)
 
-	deal3 := suite.MakeTestDeal(3, suite.consumerAccAddr, 100)
-	err = suite.DataDealKeeper.SetDeal(suite.Ctx, deal3)
+	req := types.QueryDealsRequest{}
+	res, err := suite.DataDealKeeper.Deals(sdk.WrapSDKContext(suite.Ctx), &req)
 	suite.Require().NoError(err)
+	suite.Require().NotNil(res)
+	suite.Require().Equal(2, len(res.Deals))
+	suite.Require().Equal(deal, res.Deals[0])
+	suite.Require().Equal(deal2, res.Deals[1])
+}
 
-	req := types.QueryDealsRequest{}
+func (suite *queryDealTestSuite) TestQueryCert() {
+	cert := &types.Certificate{
+		UnsignedCertificate: &types.UnsignedCertificate{
+			Cid:             "cid1",
+			OracleAddress:   suite.oracleAccAddr.String(),
+			DealId:          1,
+			ProviderAddress: suite.providerAccAddr.String(),
+			DataHash:        "dataHash",
+		},
+		Signature: []byte("signature"),
+	}
 
-	res, err := suite.DataDealKeeper.Deals(sdk.WrapSDKContext(suite.Ctx), &req)
+	err := suite.DataDealKeeper.SetCertificate(suite.Ctx, cert)
+	suite.Require().NoError(err)
+
+	req := &types.QueryCertificate{
+		DealId:   cert.UnsignedCertificate.DealId,
+		DataHash: cert.UnsignedCertificate.DataHash,
+	}
+	res, err := suite.DataDealKeeper.Certificate(sdk.WrapSDKContext(suite.Ctx), req)
 	suite.Require().NoError(err)
-	suite.Require().Len(res.Deal, 3)
-	suite.Require().Equal(res.Deal[0].Address, deal1.Address)
-	suite.Require().Equal(res.Deal[1].Address, deal2.Address)
-	suite.Require().Equal(res.Deal[2].Address, deal3.Address)
+	suite.Require().NotNil(res)
+	suite.Require().Equal(cert, res.Certificate)
 }
+
+func (suite *queryDealTestSuite) TestQueryCerts() {
+	cert := &types.Certificate{
+		UnsignedCertificate: &types.UnsignedCertificate{
+			Cid:             "cid1",
+			OracleAddress:   suite.oracleAccAddr.String(),
+			DealId:          1,
+			ProviderAddress: suite.providerAccAddr.String(),
+			DataHash:        "dataHash",
+		},
+		Signature: []byte("signature"),
+	}
+
+	err := suite.DataDealKeeper.SetCertificate(suite.Ctx, cert)
+	suite.Require().NoError(err)
+
+	cert2 := &types.Certificate{
+		UnsignedCertificate: &types.UnsignedCertificate{
+			Cid:             "cid2",
+			OracleAddress:   suite.oracleAccAddr.String(),
+			DealId:          1,
+			ProviderAddress: suite.providerAccAddr.String(),
+			DataHash:        "dataHash2",
+		},
+		Signature: []byte("signature"),
+	}
+
+	err = suite.DataDealKeeper.SetCertificate(suite.Ctx, cert2)
+	suite.Require().NoError(err)
+
+	cert3 := &types.Certificate{
+		UnsignedCertificate: &types.UnsignedCertificate{
+			Cid:             "cid2",
+			OracleAddress:   suite.oracleAccAddr.String(),
+			DealId:          2,
+			ProviderAddress: suite.providerAccAddr.String(),
+			DataHash:        "dataHash2",
+		},
+		Signature: []byte("signature"),
+	}
+
+	err = suite.DataDealKeeper.SetCertificate(suite.Ctx, cert3)
+	suite.Require().NoError(err)
+
+	req := &types.QueryCertificates{
+		DealId:     1,
+		Pagination: &query.PageRequest{},
+	}
+	res, err := suite.DataDealKeeper.Certificates(sdk.WrapSDKContext(suite.Ctx), req)
+	suite.Require().NoError(err)
+	suite.Require().Equal(2, len(res.Certificates))
+	suite.Require().Equal(cert, res.Certificates[0])
+	suite.Require().Equal(cert2, res.Certificates[1])
+
+	req.DealId = 2
+	res, err = suite.DataDealKeeper.Certificates(sdk.WrapSDKContext(suite.Ctx), req)
+	suite.Require().NoError(err)
+	suite.Require().Equal(1, len(res.Certificates))
+	suite.Require().Equal(cert3, res.Certificates[0])
+}

x/datadeal/types/deal.go

@@ -69,4 +69,4 @@ func (m *Deal) GetPricePerData() sdk.Dec {
 
 func (m *Deal) IncreaseCurNumData() {
 	m.CurNumData += 1
-}
+}