Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: rollback nft module #423

Draft
wants to merge 1 commit into
base: release/module/nft/v1.6.0
Choose a base branch
from
Draft

refactor: rollback nft module #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,491 changes: 600 additions & 1,891 deletions api/irismod/nft/nft.pulsar.go
View file
Open in desktop

Large diffs are not rendered by default.

665 changes: 330 additions & 335 deletions api/irismod/nft/query.pulsar.go
View file
Open in desktop

Large diffs are not rendered by default.

98 changes: 49 additions & 49 deletions api/irismod/nft/query_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions e2e/nft/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
4 changes: 2 additions & 2 deletions e2e/nft/test_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion modules/nft/client/cli/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions modules/nft/depinject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion modules/nft/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading