Merge pull request #571 from PolymathNetwork/more-events-cleanup

Cleanup for timestamp

Author: maxsam4

contracts/SecurityTokenRegistry.sol

@@ -83,7 +83,7 @@ contract SecurityTokenRegistry is EternalStorage, Proxy {
     // Emit when network becomes unpaused
     event Unpause(address account);
     // Emit when the ticker is removed from the registry
-    event TickerRemoved(string _ticker, uint256 _removedAt, address _removedBy);
+    event TickerRemoved(string _ticker, address _removedBy);
     // Emit when the token ticker expiry is changed
     event ChangeExpiryLimit(uint256 _oldExpiry, uint256 _newExpiry);
     // Emit when changeSecurityLaunchFee is called
@@ -367,7 +367,7 @@ contract SecurityTokenRegistry is EternalStorage, Proxy {
         set(Encoder.getKey("tickerToSecurityToken", ticker), address(0));
         _storeTickerDetails(ticker, address(0), 0, 0, "", false);
         /*solium-disable-next-line security/no-block-members*/
-        emit TickerRemoved(ticker, now, msg.sender);
+        emit TickerRemoved(ticker, msg.sender);
     }
 
     /**

contracts/mocks/MockRedemptionManager.sol

@@ -8,7 +8,7 @@ import "../modules/Experimental/Burn/TrackedRedemption.sol";
 contract MockRedemptionManager is TrackedRedemption {
     mapping(address => uint256) tokenToRedeem;
 
-    event RedeemedTokenByOwner(address _investor, address _byWhoom, uint256 _value, uint256 _timestamp);
+    event RedeemedTokenByOwner(address _investor, address _byWhoom, uint256 _value);
 
     /**
      * @notice Constructor
@@ -37,7 +37,7 @@ contract MockRedemptionManager is TrackedRedemption {
         redeemedTokens[msg.sender] = redeemedTokens[msg.sender].add(_value);
         ISecurityToken(securityToken).redeem(_value, "");
         /*solium-disable-next-line security/no-block-members*/
-        emit RedeemedTokenByOwner(msg.sender, address(this), _value, now);
+        emit RedeemedTokenByOwner(msg.sender, address(this), _value);
     }
 
 }

contracts/modules/Checkpoint/ERC20DividendCheckpoint.sol

@@ -14,7 +14,6 @@ contract ERC20DividendCheckpoint is ERC20DividendCheckpointStorage, DividendChec
     event ERC20DividendDeposited(
         address indexed _depositor,
         uint256 _checkpointId,
-        uint256 _created,
         uint256 _maturity,
         uint256 _expiry,
         address indexed _token,
@@ -215,7 +214,6 @@ contract ERC20DividendCheckpoint is ERC20DividendCheckpointStorage, DividendChec
         emit ERC20DividendDeposited(
             msg.sender,
             _checkpointId,
-            now,
             _maturity,
             _expiry,
             _token,

contracts/modules/Checkpoint/EtherDividendCheckpoint.sol

@@ -12,7 +12,6 @@ contract EtherDividendCheckpoint is DividendCheckpoint {
     event EtherDividendDeposited(
         address indexed _depositor,
         uint256 _checkpointId,
-        uint256 _created,
         uint256 _maturity,
         uint256 _expiry,
         uint256 _amount,
@@ -157,7 +156,7 @@ contract EtherDividendCheckpoint is DividendCheckpoint {
         }
         dividends[dividendIndex].totalSupply = currentSupply.sub(excludedSupply);
         /*solium-disable-next-line security/no-block-members*/
-        emit EtherDividendDeposited(msg.sender, _checkpointId, now, _maturity, _expiry, msg.value, currentSupply, dividendIndex, _name);
+        emit EtherDividendDeposited(msg.sender, _checkpointId, _maturity, _expiry, msg.value, currentSupply, dividendIndex, _name);
     }
 
     /**

contracts/modules/TransferManager/GeneralTransferManager.sol

@@ -36,7 +36,6 @@ contract GeneralTransferManager is GeneralTransferManagerStorage, TransferManage
     // in any case, any investor sending or receiving tokens, must have a _expiryTime in the future
     event ModifyKYCData(
         address indexed _investor,
-        uint256 _dateAdded,
         address indexed _addedBy,
         uint256 _fromTime,
         uint256 _toTime,
@@ -251,7 +250,7 @@ contract GeneralTransferManager is GeneralTransferManagerStorage, TransferManage
         }
         uint256 _data = VersionUtils.packKYC(uint64(_fromTime), uint64(_toTime), uint64(_expiryTime), uint8(1));
         dataStore.setUint256(_getKey(WHITELIST, _investor), _data);
-        emit ModifyKYCData(_investor, now, msg.sender, _fromTime, _toTime, _expiryTime);
+        emit ModifyKYCData(_investor, msg.sender, _fromTime, _toTime, _expiryTime);
     }
 
     /**

contracts/modules/TransferManager/PercentageTransferManager.sol

@@ -18,7 +18,7 @@ contract PercentageTransferManager is PercentageTransferManagerStorage, Transfer
     using SafeMath for uint256;
 
     event ModifyHolderPercentage(uint256 _oldHolderPercentage, uint256 _newHolderPercentage);
-    event ModifyWhitelist(address _investor, uint256 _dateAdded, address _addedBy, bool _valid);
+    event ModifyWhitelist(address _investor, address _addedBy, bool _valid);
     event SetAllowPrimaryIssuance(bool _allowPrimaryIssuance);
 
     /**
@@ -116,7 +116,7 @@ contract PercentageTransferManager is PercentageTransferManagerStorage, Transfer
     function modifyWhitelist(address _investor, bool _valid) public withPerm(ADMIN) {
         whitelist[_investor] = _valid;
         /*solium-disable-next-line security/no-block-members*/
-        emit ModifyWhitelist(_investor, now, msg.sender, _valid);
+        emit ModifyWhitelist(_investor, msg.sender, _valid);
     }
 
     /**