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

feat: add batch operation for x/nft module #12187

Merged
merged 15 commits into from
Jun 15, 2022
Merged

feat: add batch operation for x/nft module #12187

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9519370
add batch operation for x/nft module
Jun 8, 2022
cc5fc3d
refactor code
Jun 8, 2022
35ccb02
Merge branch 'main' of https://github.com/cosmos/cosmos-sdk into add-…
Jun 9, 2022
154b54b
Merge branch 'main' into add-batch-for-nft-module
Jun 10, 2022
da6024d
Merge branch 'main' of https://github.com/cosmos/cosmos-sdk into add-…
Jun 11, 2022
b906512
apply comment from github
Jun 12, 2022
a5286d3
Remove redundant checksums
Jun 12, 2022
d114913
add noCheck method
Jun 13, 2022
953275e
private noCheck method
Jun 14, 2022
8de7586
Merge branch 'main' into add-batch-for-nft-module
Jun 14, 2022
97cc545
Merge branch 'main' of https://github.com/cosmos/cosmos-sdk into add-…
Jun 14, 2022
9fa5c2e
add changelog
Jun 14, 2022
d19ae12
Merge branch 'add-batch-for-nft-module' of https://github.com/bianjie…
Jun 14, 2022
a79bf54
Merge branch 'main' into add-batch-for-nft-module
Jun 15, 2022
dd666e8
fix test error
Jun 15, 2022
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
Prev Previous commit
fix test error
  • Loading branch information
Dreamer committed Jun 15, 2022
commit dd666e82f2606c164dece7b39c0e58bc62a7b4b5
40 changes: 20 additions & 20 deletions x/nft/keeper/nft_batch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (s *TestSuite) TestBatchMint() {
func(tokens []nft.NFT) {
s.saveClass(tokens)
idx := rand.Intn(len(tokens))
s.app.NFTKeeper.Mint(s.ctx, tokens[idx], receiver)
s.nftKeeper.Mint(s.ctx, tokens[idx], receiver)
},
[]nft.NFT{
{ClassId: "classID1", Id: "nftID1"},
Expand All @@ -103,31 +103,31 @@ func (s *TestSuite) TestBatchMint() {
s.SetupTest() // reset
tc.malleate(tc.tokens)

err := s.app.NFTKeeper.BatchMint(s.ctx, tc.tokens, receiver)
err := s.nftKeeper.BatchMint(s.ctx, tc.tokens, receiver)
if tc.expPass {
s.Require().NoError(err)

classMap := groupByClassID(tc.tokens)
for classID, tokens := range classMap {
for _, token := range tokens {
actNFT, has := s.app.NFTKeeper.GetNFT(s.ctx, token.ClassId, token.Id)
actNFT, has := s.nftKeeper.GetNFT(s.ctx, token.ClassId, token.Id)
s.Require().True(has)
s.Require().EqualValues(token, actNFT)

owner := s.app.NFTKeeper.GetOwner(s.ctx, token.ClassId, token.Id)
owner := s.nftKeeper.GetOwner(s.ctx, token.ClassId, token.Id)
s.Require().True(receiver.Equals(owner))
}

actNFTs := s.app.NFTKeeper.GetNFTsOfClass(s.ctx, classID)
actNFTs := s.nftKeeper.GetNFTsOfClass(s.ctx, classID)
s.Require().EqualValues(tokens, actNFTs)

actNFTs = s.app.NFTKeeper.GetNFTsOfClassByOwner(s.ctx, classID, receiver)
actNFTs = s.nftKeeper.GetNFTsOfClassByOwner(s.ctx, classID, receiver)
s.Require().EqualValues(tokens, actNFTs)

balance := s.app.NFTKeeper.GetBalance(s.ctx, classID, receiver)
balance := s.nftKeeper.GetBalance(s.ctx, classID, receiver)
s.Require().EqualValues(len(tokens), balance)

supply := s.app.NFTKeeper.GetTotalSupply(s.ctx, classID)
supply := s.nftKeeper.GetTotalSupply(s.ctx, classID)
s.Require().EqualValues(len(tokens), supply)
}
return
Expand Down Expand Up @@ -157,7 +157,7 @@ func (s *TestSuite) TestBatchBurn() {
"success",
func() {
s.saveClass(tokens)
s.app.NFTKeeper.BatchMint(s.ctx, tokens, receiver)
s.nftKeeper.BatchMint(s.ctx, tokens, receiver)
},
"classID1",
[]string{"nftID1", "nftID2"},
Expand Down Expand Up @@ -186,11 +186,11 @@ func (s *TestSuite) TestBatchBurn() {
s.SetupTest() // reset
tc.malleate()

err := s.app.NFTKeeper.BatchBurn(s.ctx, tc.classID, tc.nftIDs)
err := s.nftKeeper.BatchBurn(s.ctx, tc.classID, tc.nftIDs)
if tc.expPass {
s.Require().NoError(err)
for _, nftID := range tc.nftIDs {
s.Require().False(s.app.NFTKeeper.HasNFT(s.ctx, tc.classID, nftID))
s.Require().False(s.nftKeeper.HasNFT(s.ctx, tc.classID, nftID))
}
return
}
Expand Down Expand Up @@ -218,7 +218,7 @@ func (s *TestSuite) TestBatchUpdate() {
"success",
func() {
s.saveClass(tokens)
s.app.NFTKeeper.BatchMint(s.ctx, tokens, receiver)
s.nftKeeper.BatchMint(s.ctx, tokens, receiver)
},
[]nft.NFT{
{ClassId: "classID1", Id: "nftID1", Uri: "nftID1_URI"},
Expand Down Expand Up @@ -253,11 +253,11 @@ func (s *TestSuite) TestBatchUpdate() {
s.SetupTest() // reset
tc.malleate()

err := s.app.NFTKeeper.BatchUpdate(s.ctx, tc.tokens)
err := s.nftKeeper.BatchUpdate(s.ctx, tc.tokens)
if tc.expPass {
s.Require().NoError(err)
for _, token := range tc.tokens {
actToken, found := s.app.NFTKeeper.GetNFT(s.ctx, token.ClassId, token.Id)
actToken, found := s.nftKeeper.GetNFT(s.ctx, token.ClassId, token.Id)
s.Require().True(found)
s.Require().EqualValues(token, actToken)
}
Expand Down Expand Up @@ -289,7 +289,7 @@ func (s *TestSuite) TestBatchTransfer() {
"success",
func() {
s.saveClass(tokens)
s.app.NFTKeeper.BatchMint(s.ctx, tokens, owner)
s.nftKeeper.BatchMint(s.ctx, tokens, owner)
},
"classID1",
[]string{"nftID1", "nftID2"},
Expand All @@ -299,7 +299,7 @@ func (s *TestSuite) TestBatchTransfer() {
"failed with not exist classID",
func() {
s.saveClass(tokens)
s.app.NFTKeeper.BatchMint(s.ctx, tokens, receiver)
s.nftKeeper.BatchMint(s.ctx, tokens, receiver)
},
"classID3",
[]string{"nftID1", "nftID2"},
Expand All @@ -321,11 +321,11 @@ func (s *TestSuite) TestBatchTransfer() {
s.SetupTest() // reset
tc.malleate()

err := s.app.NFTKeeper.BatchTransfer(s.ctx, tc.classID, tc.nftIDs, receiver)
err := s.nftKeeper.BatchTransfer(s.ctx, tc.classID, tc.nftIDs, receiver)
if tc.expPass {
s.Require().NoError(err)
for _, nftID := range tc.nftIDs {
actOwner := s.app.NFTKeeper.GetOwner(s.ctx, tc.classID, nftID)
actOwner := s.nftKeeper.GetOwner(s.ctx, tc.classID, nftID)
s.Require().EqualValues(receiver, actOwner)
}
return
Expand All @@ -350,14 +350,14 @@ func groupByClassID(tokens []nft.NFT) map[string][]nft.NFT {
func (s *TestSuite) saveClass(tokens []nft.NFT) {
classMap := groupByClassID(tokens)
for classID := range classMap {
err := s.app.NFTKeeper.SaveClass(s.ctx, nft.Class{Id: classID})
err := s.nftKeeper.SaveClass(s.ctx, nft.Class{Id: classID})
s.Require().NoError(err)
}
}

func (s *TestSuite) mintNFT(tokens []nft.NFT, receiver sdk.AccAddress) {
for _, token := range tokens {
err := s.app.NFTKeeper.Mint(s.ctx, token, receiver)
err := s.nftKeeper.Mint(s.ctx, token, receiver)
s.Require().NoError(err)
}
}