remove shadow declaration

PolymathNetwork · Jun 13, 2019 · 1182699 · 1182699
1 parent 7438bbe
commit 1182699
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/contracts/interfaces/ISTFactory.sol b/contracts/interfaces/ISTFactory.sol
@@ -42,9 +42,10 @@ interface ISTFactory {
      * @notice Used to set a new token logic contract
      * @param _version Version of upgraded module
      * @param _logicContract Address of deployed module logic contract referenced from proxy
+     * @param _initializationData Initialization data that used to intialize value in the securityToken
      * @param _upgradeData Data to be passed in call to upgradeToAndCall when a token upgrades its module
      */
-    function setLogicContract(string calldata _version, address _logicContract, bytes calldata _upgradeData) external;
+    function setLogicContract(string calldata _version, address _logicContract, bytes calldata _initializationData, bytes calldata _upgradeData) external;
 
     /**
      * @notice Used to upgrade a token

diff --git a/contracts/interfaces/ISecurityToken.sol b/contracts/interfaces/ISecurityToken.sol
@@ -733,15 +733,15 @@ interface ISecurityToken {
     /**
      * @return the address of the owner.
      */
-    function owner() external view returns (address owner);
+    function owner() external view returns (address ownerAddress);
 
-    function controller() external view returns(address controller);
+    function controller() external view returns(address controllerAddress);
 
     function moduleRegistry() external view returns(address moduleRegistryAddress);
 
     function securityTokenRegistry() external view returns(address securityTokenRegistryAddress);
 
-    function polyToken() external view returns(address polyToken);
+    function polyToken() external view returns(address polyTokenAddress);
 
     function tokenFactory() external view returns(address tokenFactoryAddress);
 

diff --git a/contracts/tokens/STFactory.sol b/contracts/tokens/STFactory.sol
@@ -138,6 +138,7 @@ contract STFactory is ISTFactory, Ownable {
      * @notice Used to set a new token logic contract
      * @param _version Version of upgraded module
      * @param _logicContract Address of deployed module logic contract referenced from proxy
+     * @param _initializationData Initialization data that used to intialize value in the securityToken
      * @param _upgradeData Data to be passed in call to upgradeToAndCall when a token upgrades its module
      */
     function setLogicContract(string calldata _version, address _logicContract, bytes calldata _initializationData, bytes calldata _upgradeData) external onlyOwner {

diff --git a/contracts/tokens/STGetter.sol b/contracts/tokens/STGetter.sol
@@ -230,7 +230,7 @@ contract STGetter is OZStorage, SecurityTokenStorage {
      * @notice Return all partitions
      * @return List of partitions
      */
-    function partitionsOf(address /*_tokenHolder*/) external view returns (bytes32[] memory) {
+    function partitionsOf(address /*_tokenHolder*/) external pure returns (bytes32[] memory) {
         bytes32[] memory result = new bytes32[](2);
         result[0] = UNLOCKED;
         result[1] = LOCKED;