Remove param address _facilitator from GatewayRedeemInterface.redeem and EIP20CoGateway.redeem

contracts/gateway/EIP20CoGateway.sol

@@ -159,8 +159,6 @@ contract EIP20CoGateway is GatewayBase {
          */
         address beneficiary;
 
-        /** Address of the facilitator that initiates the stake process. */
-        address facilitator;  //todo need to discuss revocation process
         /** bounty amount kept by facilitator for transferring redeem messages*/
         uint256 bounty;
     }
@@ -865,49 +863,43 @@ contract EIP20CoGateway is GatewayBase {
      * @dev In order to redeem the redeemer needs to approve CoGateway contract
      *      for redeem amount. Redeem amount is transferred from redeemer
      *      address to CoGateway contract.
-     *      This is a payable function. The bounty is transferred in base token
-     *      Redeemer is always msg.sender
+     *      This is a payable function. The bounty is transferred in base token.
+     *      Redeemer is always msg.sender.
      *
      * @param _amount Redeem amount that will be transferred from redeemer
      *                account.
      * @param _beneficiary The address in the origin chain where the value
      *                     tok ens will be released.
-     * @param _facilitator Facilitator address.
      * @param _gasPrice Gas price that redeemer is ready to pay to get the
      *                  redeem process done.
-     * @param _gasLimit Gas limit that redeemer is ready to pay
+     * @param _gasLimit Gas limit that redeemer is ready to pay.
      * @param _nonce Nonce of the redeemer address.
      * @param _hashLock Hash Lock provided by the facilitator.
      *
-     * @return messageHash_ which is unique for each request.
+     * @return messageHash_ Unique for each request.
      */
     function redeem(
         uint256 _amount,
         address _beneficiary,
-        address _facilitator,
         uint256 _gasPrice,
         uint256 _gasLimit,
         uint256 _nonce,
         bytes32 _hashLock
     )
-        public
+        external
         payable
         returns (bytes32 messageHash_)
     {
         require(
             msg.value == bounty,
-            "msg.value must match the bounty amount"
+            "Payable amount should be equal to the bounty amount."
         );
         require(
             _amount > uint256(0),
-            "Redeem amount must not be zero"
+            "Redeem amount must not be zero."
         );
 
-        require(
-            _facilitator != address(0),
-            "Facilitator address must not be zero"
-        );
-        // Get the redeem intent hash
+        // Get the redeem intent hash.
         bytes32 intentHash = GatewayLib.hashRedeemIntent(
             _amount,
             _beneficiary,
@@ -918,7 +910,7 @@ contract EIP20CoGateway is GatewayBase {
             valueToken
         );
 
-        // Get the messageHash
+        // Get the messageHash.
         messageHash_ = MessageBus.messageDigest(
             REDEEM_TYPEHASH,
             intentHash,
@@ -927,24 +919,23 @@ contract EIP20CoGateway is GatewayBase {
             _gasLimit
         );
 
-        // Get previousMessageHash
+        // Get previousMessageHash.
         bytes32 previousMessageHash = registerOutboxProcess(
             msg.sender,
             _nonce,
             messageHash_
         );
 
-        // Delete the previous progressed/revoked redeem data
+        // Delete the previous progressed/revoked redeem data.
         delete redeems[previousMessageHash];
 
         redeems[messageHash_] = Redeem({
             amount : _amount,
             beneficiary : _beneficiary,
-            facilitator : _facilitator,
             bounty : bounty
-            });
+        });
 
-        // create message object
+        // Create message object.
         messages[messageHash_] = getMessage(
             msg.sender,
             _nonce,
@@ -957,19 +948,19 @@ contract EIP20CoGateway is GatewayBase {
         require(
             messageBox.outbox[messageHash_] ==
             MessageBus.MessageStatus.Undeclared,
-            "Message status must be Undeclared"
+            "Message status must be Undeclared."
         );
         // Update the message outbox status to declared.
         messageBox.outbox[messageHash_] = MessageBus.MessageStatus.Declared;
 
-        //transfer redeem amount to Co-Gateway
+        // Transfer redeem amount to Co-Gateway.
         EIP20Interface(utilityToken).transferFrom(
             msg.sender,
             address(this),
             _amount
         );
 
-        // Emit RedeemIntentDeclared event
+        // Emit RedeemIntentDeclared event.
         emit RedeemIntentDeclared(
             messageHash_,
             msg.sender,
@@ -1162,7 +1153,7 @@ contract EIP20CoGateway is GatewayBase {
         redeemer_ = message.sender;
         redeemAmount_ = redeems[_messageHash].amount;
         // Burn the redeem amount.
-        UtilityTokenInterface(utilityToken).burn(address(this), redeemAmount_);
+        UtilityTokenInterface(utilityToken).burn(redeemAmount_);
 
         // Transfer the bounty amount to the facilitator
         msg.sender.transfer(redeems[_messageHash].bounty);

contracts/gateway/GatewayRedeemInterface.sol

@@ -57,7 +57,6 @@ contract GatewayRedeemInterface {
 	 *                account.
 	 * @param _beneficiary The address in the origin chain where the value
 	 *                     tok ens will be released.
-	 * @param _facilitator Facilitator address.
 	 * @param _gasPrice Gas price that redeemer is ready to pay to get the
 	 *                  redeem process done.
 	 * @param _gasLimit Gas limit that redeemer is ready to pay
@@ -69,7 +68,6 @@ contract GatewayRedeemInterface {
 	function redeem(
 		uint256 _amount,
 		address _beneficiary,
-		address _facilitator,
 		uint256 _gasPrice,
 		uint256 _gasLimit,
 		uint256 _nonce,

contracts/gateway/UtilityTokenInterface.sol

@@ -73,13 +73,11 @@ contract UtilityTokenInterface {
      * @dev only burns the amount from CoGateway address, So to burn
      *      transfer the amount to CoGateway.
      *
-     * @param _burner Burner address.
      * @param _amount Amount of tokens to burn.
      *
      * @return bool `true` if burn is successful, false otherwise.
      */
     function burn(
-        address _burner,
         uint256 _amount
     )
         external

migrations/2_deploy_contracts.js

@@ -36,7 +36,7 @@ module.exports = function (deployer) {
     deployer.deploy(MockGatewayLib);
     deployer.deploy(MetaBlock);
     deployer.link(GatewayLib, [GatewayBase, EIP20Gateway, TestEIP20Gateway, EIP20CoGateway]);
-    deployer.link(MessageBus, [EIP20CoGateway,TestEIP20Gateway, EIP20Gateway]);
+    deployer.link(MessageBus, [EIP20CoGateway, TestEIP20Gateway, EIP20Gateway] );
     deployer.link(MockGatewayLib, [MockGatewayBase, TestEIP20Gateway]);
     deployer.link(MetaBlock, [BlockStore, AuxiliaryBlockStore]);