Update Tests and JobValidator logic

Author: tiero

README.md

@@ -28,4 +28,9 @@ or
 
 ```bash
 truffle test
-```
+```
+
+## Flattening
+
+`solidity_flattener contracts/Contract.sol --solc-paths=zeppelin-solidity=$(pwd)/node_modules/zeppelin-solidity/ --output contract.sol`
+

contracts/market/Escrow.sol

@@ -3,17 +3,18 @@ pragma solidity ^0.4.18;
 import "./Job.sol";
 import "zeppelin-solidity/contracts/token/ERC20.sol";
 
+
 contract Escrow is Job {
     /**
-     * @dev Kovan AGI token.
+     * @dev Kovan token.
      * https://kovan.etherscan.io/token/0x3b226ff6aad7851d3263e53cb7688d13a07f6e81#readContract
      */  
-    ERC20 public constant AGI = ERC20(0x3b226ff6aad7851d3263e53cb7688d13a07f6e81);
-    
+    ERC20 public token;
+
     /**
-     * @dev Vault mapping
+     * @dev Fund  Timelock in milliseconds
      */
-    mapping(address => mapping(address => uint256)) public vault;
+    uint256 public timelock;
 
     /**
      * @dev Deposited event
@@ -25,44 +26,73 @@ contract Escrow is Job {
       */
     event Withdrew(address payee, uint256 amount);
 
-        /**
+    /**
       * @dev Escrow constructor.
       * @param _payer An agent who pays the job.
       * @param _payee An agent to whom the job is paid.
-      * @param _cost Cost in AGI
+      * @param _timelock how many seconds after end should be the window for rejections   
+      * @param _validator who should check if rejected
       * @param _reward reward for validator
       */
     function Escrow(
+        address _token,
         address _payer, 
-        address _payee, 
-        bytes32 _descriptor, 
-        uint256 _cost, 
+        address _payee,
+        uint256 _timelock,
+        address _validator,
         uint256 _reward ) public
     {
+        token = ERC20(_token);
         payer = _payer;
         payee = _payee;
-        descriptor = _descriptor;
-        cost = _cost;
+
+        timelock = _timelock;
+        //Reward for the validator in case of dispute
+        validator = _validator;
         reward = _reward;
 
+        //Who actually should deliver the job, capable of setResult and close the job
+        //Beaware that who can withdraw money is still the payee, not the provider
         provider = payee;
-        start = now;
 
-        Started(payer, payee, descriptor, address(this));
     }
 
+    /**
+      * @dev Deposit function.
+      * @param _amount Token amount to fill the price
+      * @param _descriptor bytes hash that represent the input for the job      
+      */
+    function deposit(uint256 _amount, bytes32 _descriptor) public {
+        require(msg.sender == payer);
+        require(token.transferFrom(msg.sender, this, _amount));
+        Deposited(msg.sender, _amount);
+        
+        descriptor = _descriptor;
+        price = _amount;
+        start = now;
 
-    function deposit(uint256 amount) public {
-        require(AGI.transferFrom(msg.sender, this, amount));
-
-        Deposited(msg.sender,amount);
+        Started(payer, payee, descriptor, address(this));
     }
 
+     /**
+      * @dev withdraw all funds from escrow 
+      */
     function withdraw() public {
         require(msg.sender == payee);
-        require(status == 1);
-        uint256 balance = AGI.balanceOf(this);
-        require(AGI.transfer(msg.sender, balance));
+        require(timelockExpired());
+        require(!isRejected); 
+
+        uint256 balance = token.balanceOf(this);
+        require (balance > 0);
+
+        require(token.transfer(msg.sender, balance));
         Withdrew(msg.sender, balance);
     }
+
+    function timelockExpired() internal constant returns(bool) {
+        bool isExpired = (end + timelock) <= block.timestamp;
+        return isCompleted && isExpired ;
+    }
+
+    
 }

contracts/market/Job.sol

@@ -6,15 +6,21 @@ import "./JobValidator.sol";
  */
 contract Job is JobValidator {
 
+    /**
+     * @dev Determines if job is completed
+     */
+    bool public isCompleted = false; 
+
     /**
      * @dev Who can set the result
      */
-     address provider;
+    address public provider;
+    
     /**
-     * @dev Cost in AGI for the exection of the job
+     * @dev Price in AGI for the exection of the job
      * (10**8 cogs === 1 AGI)
      */
-    uint256 public cost;
+    uint256 public price;
 
     /**
      * @dev Started event
@@ -35,6 +41,7 @@ contract Job is JobValidator {
         result = _result;
 
         Completed();
+        isCompleted = true;
 
         return true;
     }

contracts/market/JobInterface.sol

@@ -1,23 +1,22 @@
 pragma solidity ^0.4.18;
 
-import "./JobInterface.sol";
+import "./JobStandard.sol";
 
 /**
  * @title The Job Validator contract 
  */
 
-contract JobValidator is JobInterface {
+contract JobValidator is JobStandard {
 
     /**
      * @dev Reward for validator in AGI.
      */
     address public validator; 
 
     /**
-     * @dev Validation status
-     * 0 == pending && 1 == accepted && 2 == rejected 
+     * @dev rejection status
      */
-    address public status = 0; 
+    bool public isRejected = false; 
 
     /**
      * @dev Reward for validator in AGI.
@@ -45,18 +44,15 @@ contract JobValidator is JobInterface {
      */
     function accept() public {
         validator = msg.sender;
-        status = 1;
-
         Accepted();
     }
 
     /**
      * @dev Reject job result
      */
     function reject() public {
-        validator = msg.sender;
-        status = 2;
-
+        require(msg.sender==validator);
+        isRejected = true;
         Rejected();
     }