From 8b10cb38d8fedf34f2d89b0ed604f2dceb76d6a9 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Wed, 15 Apr 2020 18:04:00 -0300 Subject: [PATCH] Rename Strings.fromUint256 to Strings.toString (#2188) * rename Strings.fromUint256 to Strings.toString * add changelog entry * fix conflict with js toString method --- CHANGELOG.md | 1 + contracts/mocks/StringsMock.sol | 2 +- contracts/token/ERC721/ERC721.sol | 2 +- contracts/utils/Strings.sol | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce48a7730..0859f5153 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ * `ERC721`: added a constructor for `name` and `symbol`. ([#2160](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2160)) * `ERC20Detailed`: this contract was removed and its functionality merged into `ERC20`. ([#2161](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2161)) * `ERC20`: added a constructor for `name` and `symbol`. `decimals` now defaults to 18. ([#2161](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2161)) + * `Strings`: renamed `fromUint256` to `toString` ([#2188](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2188)) ## 2.5.0 (2020-02-04) diff --git a/contracts/mocks/StringsMock.sol b/contracts/mocks/StringsMock.sol index 383278070..a7a50eb3c 100644 --- a/contracts/mocks/StringsMock.sol +++ b/contracts/mocks/StringsMock.sol @@ -4,6 +4,6 @@ import "../utils/Strings.sol"; contract StringsMock { function fromUint256(uint256 value) public pure returns (string memory) { - return Strings.fromUint256(value); + return Strings.toString(value); } } diff --git a/contracts/token/ERC721/ERC721.sol b/contracts/token/ERC721/ERC721.sol index 3bc6bc039..ad72d2606 100644 --- a/contracts/token/ERC721/ERC721.sol +++ b/contracts/token/ERC721/ERC721.sol @@ -153,7 +153,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Enumerable return string(abi.encodePacked(_baseURI, _tokenURI)); } // If there is a baseURI but no tokenURI, concatenate the tokenID to the baseURI. - return string(abi.encodePacked(_baseURI, Strings.fromUint256(tokenId))); + return string(abi.encodePacked(_baseURI, Strings.toString(tokenId))); } /** diff --git a/contracts/utils/Strings.sol b/contracts/utils/Strings.sol index 6977c809f..1ed3c5197 100644 --- a/contracts/utils/Strings.sol +++ b/contracts/utils/Strings.sol @@ -1,14 +1,13 @@ pragma solidity ^0.6.0; /** - * @title Strings * @dev String operations. */ library Strings { /** * @dev Converts a `uint256` to its ASCII `string` representation. */ - function fromUint256(uint256 value) internal pure returns (string memory) { + function toString(uint256 value) internal pure returns (string memory) { // Inspired by OraclizeAPI's implementation - MIT licence // https://github.com/oraclize/ethereum-api/blob/b42146b063c7d6ee1358846c198246239e9360e8/oraclizeAPI_0.4.25.sol