From 133c3f17cae5e8d1ef5644496b4a053d658a3a9e Mon Sep 17 00:00:00 2001 From: PraetorP Date: Fri, 25 Nov 2022 08:56:05 +0000 Subject: [PATCH] change function name `tokenProperties` to `properties` --- --- a/pallets/nonfungible/src/erc.rs +++ b/pallets/nonfungible/src/erc.rs @@ -721,11 +721,7 @@ /// @param tokenId Id for the token. /// @param keys Properties keys. Empty keys for all propertyes. /// @return Vector of properties key/value pairs. - fn token_properties( - &self, - token_id: uint256, - keys: Vec, - ) -> Result> { + fn properties(&self, token_id: uint256, keys: Vec) -> Result> { let keys = keys .into_iter() .map(|key| { --- a/pallets/nonfungible/src/stubs/UniqueNFT.sol +++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol @@ -676,7 +676,7 @@ } /// @title Unique extensions for ERC721. -/// @dev the ERC-165 identifier for this interface is 0xb8f094a0 +/// @dev the ERC-165 identifier for this interface is 0xb74c26b7 contract ERC721UniqueExtensions is Dummy, ERC165 { /// @notice A descriptive name for a collection of NFTs in this contract /// @dev EVM selector for this function is: 0x06fdde03, @@ -722,9 +722,9 @@ /// @param tokenId Id for the token. /// @param keys Properties keys. Empty keys for all propertyes. /// @return Vector of properties key/value pairs. - /// @dev EVM selector for this function is: 0xefc26c69, - /// or in textual repr: tokenProperties(uint256,string[]) - function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) { + /// @dev EVM selector for this function is: 0xe07ede7e, + /// or in textual repr: properties(uint256,string[]) + function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) { require(false, stub_error); tokenId; keys; --- a/pallets/refungible/src/erc.rs +++ b/pallets/refungible/src/erc.rs @@ -749,11 +749,7 @@ /// @param tokenId Id for the token. /// @param keys Properties keys. Empty keys for all propertyes. /// @return Vector of properties key/value pairs. - fn token_properties( - &self, - token_id: uint256, - keys: Vec, - ) -> Result> { + fn properties(&self, token_id: uint256, keys: Vec) -> Result> { let keys = keys .into_iter() .map(|key| { --- a/pallets/refungible/src/stubs/UniqueRefungible.sol +++ b/pallets/refungible/src/stubs/UniqueRefungible.sol @@ -674,7 +674,7 @@ } /// @title Unique extensions for ERC721. -/// @dev the ERC-165 identifier for this interface is 0x1d4b64d6 +/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1 contract ERC721UniqueExtensions is Dummy, ERC165 { /// @notice A descriptive name for a collection of NFTs in this contract /// @dev EVM selector for this function is: 0x06fdde03, @@ -720,9 +720,9 @@ /// @param tokenId Id for the token. /// @param keys Properties keys. Empty keys for all propertyes. /// @return Vector of properties key/value pairs. - /// @dev EVM selector for this function is: 0xefc26c69, - /// or in textual repr: tokenProperties(uint256,string[]) - function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) { + /// @dev EVM selector for this function is: 0xe07ede7e, + /// or in textual repr: properties(uint256,string[]) + function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) { require(false, stub_error); tokenId; keys; --- a/tests/src/eth/abi/nonFungible.json +++ b/tests/src/eth/abi/nonFungible.json @@ -448,6 +448,26 @@ { "inputs": [ { "internalType": "uint256", "name": "tokenId", "type": "uint256" }, + { "internalType": "string[]", "name": "keys", "type": "string[]" } + ], + "name": "properties", + "outputs": [ + { + "components": [ + { "internalType": "string", "name": "key", "type": "string" }, + { "internalType": "bytes", "name": "value", "type": "bytes" } + ], + "internalType": "struct Property[]", + "name": "", + "type": "tuple[]" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "uint256", "name": "tokenId", "type": "uint256" }, { "internalType": "string", "name": "key", "type": "string" } ], "name": "property", @@ -670,26 +690,6 @@ ], "name": "tokenOfOwnerByIndex", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { "internalType": "uint256", "name": "tokenId", "type": "uint256" }, - { "internalType": "string[]", "name": "keys", "type": "string[]" } - ], - "name": "tokenProperties", - "outputs": [ - { - "components": [ - { "internalType": "string", "name": "key", "type": "string" }, - { "internalType": "bytes", "name": "value", "type": "bytes" } - ], - "internalType": "struct Property[]", - "name": "", - "type": "tuple[]" - } - ], "stateMutability": "view", "type": "function" }, --- a/tests/src/eth/abi/reFungible.json +++ b/tests/src/eth/abi/reFungible.json @@ -430,6 +430,26 @@ { "inputs": [ { "internalType": "uint256", "name": "tokenId", "type": "uint256" }, + { "internalType": "string[]", "name": "keys", "type": "string[]" } + ], + "name": "properties", + "outputs": [ + { + "components": [ + { "internalType": "string", "name": "key", "type": "string" }, + { "internalType": "bytes", "name": "value", "type": "bytes" } + ], + "internalType": "struct Property[]", + "name": "", + "type": "tuple[]" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "uint256", "name": "tokenId", "type": "uint256" }, { "internalType": "string", "name": "key", "type": "string" } ], "name": "property", @@ -661,26 +681,6 @@ ], "name": "tokenOfOwnerByIndex", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { "internalType": "uint256", "name": "tokenId", "type": "uint256" }, - { "internalType": "string[]", "name": "keys", "type": "string[]" } - ], - "name": "tokenProperties", - "outputs": [ - { - "components": [ - { "internalType": "string", "name": "key", "type": "string" }, - { "internalType": "bytes", "name": "value", "type": "bytes" } - ], - "internalType": "struct Property[]", - "name": "", - "type": "tuple[]" - } - ], "stateMutability": "view", "type": "function" }, --- a/tests/src/eth/api/UniqueNFT.sol +++ b/tests/src/eth/api/UniqueNFT.sol @@ -446,7 +446,7 @@ } /// @title Unique extensions for ERC721. -/// @dev the ERC-165 identifier for this interface is 0xb8f094a0 +/// @dev the ERC-165 identifier for this interface is 0xb74c26b7 interface ERC721UniqueExtensions is Dummy, ERC165 { /// @notice A descriptive name for a collection of NFTs in this contract /// @dev EVM selector for this function is: 0x06fdde03, @@ -475,9 +475,9 @@ /// @param tokenId Id for the token. /// @param keys Properties keys. Empty keys for all propertyes. /// @return Vector of properties key/value pairs. - /// @dev EVM selector for this function is: 0xefc26c69, - /// or in textual repr: tokenProperties(uint256,string[]) - function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory); + /// @dev EVM selector for this function is: 0xe07ede7e, + /// or in textual repr: properties(uint256,string[]) + function properties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory); /// @notice Set or reaffirm the approved address for an NFT /// @dev The zero address indicates there is no approved address. --- a/tests/src/eth/api/UniqueRefungible.sol +++ b/tests/src/eth/api/UniqueRefungible.sol @@ -444,7 +444,7 @@ } /// @title Unique extensions for ERC721. -/// @dev the ERC-165 identifier for this interface is 0x1d4b64d6 +/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1 interface ERC721UniqueExtensions is Dummy, ERC165 { /// @notice A descriptive name for a collection of NFTs in this contract /// @dev EVM selector for this function is: 0x06fdde03, @@ -473,9 +473,9 @@ /// @param tokenId Id for the token. /// @param keys Properties keys. Empty keys for all propertyes. /// @return Vector of properties key/value pairs. - /// @dev EVM selector for this function is: 0xefc26c69, - /// or in textual repr: tokenProperties(uint256,string[]) - function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory); + /// @dev EVM selector for this function is: 0xe07ede7e, + /// or in textual repr: properties(uint256,string[]) + function properties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory); /// @notice Transfer ownership of an RFT /// @dev Throws unless `msg.sender` is the current owner. Throws if `to` --- a/tests/src/eth/base.test.ts +++ b/tests/src/eth/base.test.ts @@ -117,7 +117,7 @@ }); itEth('ERC721UniqueExtensions support', async ({helper}) => { - await checkInterface(helper, '0xb8f094a0', true, true); + await checkInterface(helper, '0xb74c26b7', true, true); }); itEth('ERC721Burnable - 0x42966c68 - support', async ({helper}) => { --- a/tests/src/eth/tokenProperties.test.ts +++ b/tests/src/eth/tokenProperties.test.ts @@ -120,17 +120,17 @@ const address = helper.ethAddress.fromCollectionId(collection.collectionId); const contract = helper.ethNativeContract.collection(address, mode, caller); - expect(await contract.methods.tokenProperties(token.tokenId, []).call()).to.be.deep.equal([]); + expect(await contract.methods.properties(token.tokenId, []).call()).to.be.deep.equal([]); await contract.methods.setProperties(token.tokenId, properties).send({from: caller}); const values = await token.getProperties(properties.map(p => p.key)); expect(values).to.be.deep.equal(properties.map(p => { return {key: p.key, value: p.value.toString()}; })); - expect(await contract.methods.tokenProperties(token.tokenId, []).call()).to.be.like(properties + expect(await contract.methods.properties(token.tokenId, []).call()).to.be.like(properties .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); })); - expect(await contract.methods.tokenProperties(token.tokenId, [properties[0].key]).call()) + expect(await contract.methods.properties(token.tokenId, [properties[0].key]).call()) .to.be.like([helper.ethProperty.property(properties[0].key, properties[0].value.toString())]); } -- gitstuff