nft module rollback to version 1

irisnet · Jul 25, 2024 · 9093822 · 9093822
1 parent ef0885f
commit 9093822
Show file tree

Hide file tree

Showing 41 changed files with 2,172 additions and 4,999 deletions.
diff --git a/api/irismod/nft/nft.pulsar.go b/api/irismod/nft/nft.pulsar.go
diff --git a/api/irismod/nft/query.pulsar.go b/api/irismod/nft/query.pulsar.go
diff --git a/api/irismod/nft/query_grpc.pb.go b/api/irismod/nft/query_grpc.pb.go
diff --git a/e2e/nft/query.go b/e2e/nft/query.go
@@ -144,10 +144,10 @@ func (s *QueryTestSuite) TestQueryCmd() {
 	//------test GetCmdQueryOwner()-------------
 	url = fmt.Sprintf("%s/irismod/nft/nfts?owner=%s", baseURL, from.String())
 	resp, err = testutil.GetRequest(url)
-	respType = proto.Message(&nfttypes.QueryNFTsOfOwnerResponse{})
+	respType = proto.Message(&nfttypes.QueryOwnerResponse{})
 	s.Require().NoError(err)
 	s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, respType))
-	ownerResp := respType.(*nfttypes.QueryNFTsOfOwnerResponse)
+	ownerResp := respType.(*nfttypes.QueryOwnerResponse)
 	s.Require().Equal(from.String(), ownerResp.Owner.Address)
 	s.Require().Equal(denomID, ownerResp.Owner.IDCollections[0].DenomId)
 	s.Require().Equal(tokenID, ownerResp.Owner.IDCollections[0].TokenIds[0])

diff --git a/e2e/nft/test_helper.go b/e2e/nft/test_helper.go
@@ -213,15 +213,15 @@ func QueryOwnerExec(t *testing.T,
 	clientCtx client.Context,
 	address string,
 	extraArgs ...string,
-) *nfttypes.QueryNFTsOfOwnerResponse {
+) *nfttypes.QueryOwnerResponse {
 	t.Helper()
 	args := []string{
 		address,
 		fmt.Sprintf("--%s=json", cli.OutputFlag),
 	}
 	args = append(args, extraArgs...)
 
-	response := &nfttypes.QueryNFTsOfOwnerResponse{}
+	response := &nfttypes.QueryOwnerResponse{}
 	network.ExecQueryCmd(t, clientCtx, nftcli.GetCmdQueryOwner(), args, response)
 	return response
 }

diff --git a/modules/nft/client/cli/query.go b/modules/nft/client/cli/query.go
@@ -101,7 +101,7 @@ func GetCmdQueryOwner() *cobra.Command {
 				return err
 			}
 			queryClient := types.NewQueryClient(clientCtx)
-			resp, err := queryClient.NFTsOfOwner(context.Background(), &types.QueryNFTsOfOwnerRequest{
+			resp, err := queryClient.Owner(context.Background(), &types.QueryOwnerRequest{
 				DenomId:    denomID,
 				Owner:      args[0],
 				Pagination: pageReq,

diff --git a/modules/nft/depinject.go b/modules/nft/depinject.go
@@ -53,8 +53,6 @@ func ProvideModule(in Inputs) Outputs {
 	keeper := keeper.NewKeeper(
 		in.Cdc,
 		in.Key,
-		in.AccountKeeper,
-		in.BankKeeper,
 	)
 	m := NewAppModule(in.Cdc, keeper, in.AccountKeeper, in.BankKeeper)
 

diff --git a/modules/nft/go.mod b/modules/nft/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/cometbft/cometbft v0.37.4
 	github.com/cosmos/cosmos-sdk v0.47.9
 	github.com/cosmos/gogoproto v1.4.10
+	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.3
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/spf13/cobra v1.6.1
@@ -80,7 +81,6 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect