FIX #24 useless RLC address getter

Author: francois branciard

ChangeLog.md

@@ -18,6 +18,7 @@ Features:
  * [#16](https://github.com/iExecBlockchainComputing/PoCo/issues/16) add counters info in Hub
 
 Bugfixes:
+* [#24](https://github.com/iExecBlockchainComputing/PoCo/issues/24) possibly useless RLC address getter
 
 
 ### [v1.0.12](https://github.com/iExecBlockchainComputing/PoCo/releases/tag/v1.0.12)

contracts/IexecAPI.sol

@@ -47,17 +47,17 @@ contract IexecAPI is OwnableOZ, IexecHubAccessor, IexecCallbackInterface
 		return true;
 	}
 
-	function approveIexecHub(uint256 amount) public onlyOwner returns (bool)
+	function approveIexecHub(uint256 amount, address rlcAddress) public onlyOwner returns (bool)
 	{
-		RLC rlc = RLC(iexecHubInterface.getRLCAddress());
+		RLC rlc = RLC(rlcAddress);
 		require(rlc.approve(iexecHubAddress, amount));
 		emit ApproveIexecHub(iexecHubAddress, amount);
 		return true;
 	}
 
-	function withdrawRLCFromIexecAPI(uint256 amount) public onlyOwner returns (bool)
+	function withdrawRLCFromIexecAPI(uint256 amount, address rlcAddress) public onlyOwner returns (bool)
 	{
-		RLC rlc = RLC(iexecHubInterface.getRLCAddress());
+		RLC rlc = RLC(rlcAddress);
 		require(rlc.transfer(msg.sender, amount));
 		emit WithdrawRLCFromIexecAPI(msg.sender, amount);
 		return true;
@@ -70,10 +70,10 @@ contract IexecAPI is OwnableOZ, IexecHubAccessor, IexecCallbackInterface
 		return true;
 	}
 
-	function withdrawRLCFromIexecHub(uint256 amount) public onlyOwner returns (bool)
+	function withdrawRLCFromIexecHub(uint256 amount, address rlcAddress) public onlyOwner returns (bool)
 	{
 		require(iexecHubInterface.withdraw(amount));
-		require(withdrawRLCFromIexecAPI(amount));
+		require(withdrawRLCFromIexecAPI(amount,rlcAddress));
 		emit WithdrawRLCFromIexecHub(iexecHubAddress, amount);
 		return true;
 	}

contracts/IexecHub.sol

@@ -377,11 +377,6 @@ contract IexecHub
 		);
 	}
 
-	function getRLCAddress() public view returns (address rlcAddress)
-	{
-		return tokenAddress;
-	}
-
 	function getWorkerStatus(address _worker) public view returns (address workerPool, uint256 workerScore)
 	{
 		return (workerPoolHub.getWorkerAffectation(_worker), m_scores[_worker]);

contracts/IexecHubInterface.sol

@@ -104,9 +104,6 @@ contract IexecHubInterface
 		address _worker)
 	public view returns (uint256 workerScore);
 
-	function getRLCAddress()
-	public view returns (address rlc);
-
 	function registerToPool(address _worker)
 	public returns (bool subscribed);
 

test/byFunctions/IexecAPI/buyForWorkOrder.js

@@ -264,7 +264,7 @@ contract('IexecHub', function(accounts) {
     });
     console.log("aIexecAPIInstance created "+aIexecAPIInstance.address);
 
-    txMined = await aIexecAPIInstance.approveIexecHub(200, {
+    txMined = await aIexecAPIInstance.approveIexecHub(200,aRLCInstance.address, {
       from: iExecCloudUser,
       gas: constants.AMOUNT_GAS_PROVIDED
     });
@@ -284,7 +284,7 @@ contract('IexecHub', function(accounts) {
     balance =await aRLCInstance.balanceOf(iExecCloudUser);
 		assert.strictEqual(balance.toNumber(), 500, "check balanceOf iExecCloudUser");
 
-    txMined = await aIexecAPIInstance.withdrawRLCFromIexecAPI(100, {
+    txMined = await aIexecAPIInstance.withdrawRLCFromIexecAPI(100,aRLCInstance.address, {
       from: iExecCloudUser,
       gas: constants.AMOUNT_GAS_PROVIDED
     });
@@ -316,7 +316,7 @@ contract('IexecHub', function(accounts) {
 		assert.strictEqual(events[0].args.owner, aIexecAPIInstance.address, "check Deposit owner");
 		assert.strictEqual(events[0].args.amount.toNumber(), 200, "check Deposit amount");
 
-    txMined = await aIexecAPIInstance.withdrawRLCFromIexecHub(100, {
+    txMined = await aIexecAPIInstance.withdrawRLCFromIexecHub(100,aRLCInstance.address, {
       from: iExecCloudUser,
       gas: constants.AMOUNT_GAS_PROVIDED
     });

test/byFunctions/IexecAPI/workOrderCallback.js

@@ -309,7 +309,7 @@ contract('IexecHub', function(accounts) {
     });
     console.log("aIexecAPIInstance created " + aIexecAPIInstance.address);
 
-    txMined = await aIexecAPIInstance.approveIexecHub(200, {
+    txMined = await aIexecAPIInstance.approveIexecHub(200,aRLCInstance.address, {
       from: iExecCloudUser,
       gas: constants.AMOUNT_GAS_PROVIDED
     });