From 1182699a3c5bd1f880a8cc131a8fbc95416d8f91 Mon Sep 17 00:00:00 2001
From: satyam <satyam@secureblocks.io>
Date: Thu, 13 Jun 2019 11:13:34 +0530
Subject: [PATCH] remove shadow declaration

---
 contracts/interfaces/ISTFactory.sol     | 3 ++-
 contracts/interfaces/ISecurityToken.sol | 6 +++---
 contracts/tokens/STFactory.sol          | 1 +
 contracts/tokens/STGetter.sol           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/contracts/interfaces/ISTFactory.sol b/contracts/interfaces/ISTFactory.sol
index 3ad502a2f..a2b911f9d 100644
--- 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
index 76aef7765..67a2dc2f8 100644
--- 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
index 5b78e057c..2f01f7e96 100644
--- 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
index f78d99043..efea1793a 100644
--- 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;