From 19e4114c806cda3da49f98866d0e04c86e43d9bb Mon Sep 17 00:00:00 2001 From: cebgcontract <99630598+cebgcontract@users.noreply.github.com> Date: Thu, 4 Aug 2022 17:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7token?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contracts/chip1155/BEChip1155.sol | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/contracts/chip1155/BEChip1155.sol b/contracts/chip1155/BEChip1155.sol index d58b776..94e6a50 100644 --- a/contracts/chip1155/BEChip1155.sol +++ b/contracts/chip1155/BEChip1155.sol @@ -13,11 +13,6 @@ contract BEChip1155 is ERC1155, AccessControl { mapping(uint256 => bool) public lockedTokens; - struct TokenStruct { - uint256 tokenId; - uint256 amount; - } - mapping(address => uint256[]) private _ownedTokens; mapping(address => mapping(uint256 => uint256)) private _ownedTokensIndex; @@ -257,7 +252,7 @@ contract BEChip1155 is ERC1155, AccessControl { address user, uint256 start, uint256 page - ) external view returns (TokenStruct[] memory) { + ) external view returns (uint256[] memory) { uint256 size = _ownedTokens[user].length; uint256 max = size; uint256 pageSize = 0; @@ -269,14 +264,11 @@ contract BEChip1155 is ERC1155, AccessControl { pageSize = size - start; } } - TokenStruct[] memory results = new TokenStruct[](pageSize); + uint256[] memory results = new uint256[](pageSize); if (pageSize > 0) { for (uint256 i = start; i < max; ++i) { - TokenStruct memory dataObj; uint256 tokenId = _ownedTokens[user][i]; - dataObj.tokenId = tokenId; - dataObj.amount = balanceOf(user, tokenId); - results[i - start] = dataObj; + results[i - start] = tokenId; } } return results;