Fixed tests on Job wrapper contract

Author: tiero

contracts/agent/Agent.sol

@@ -6,7 +6,6 @@ import "zeppelin-solidity/contracts/ownership/Ownable.sol";
 contract Agent is AgentInterface, Ownable {
 
     bytes[] public packets;
-    MarketJobInterface public job;
 
     function sendPacket(address target, bytes packet) external onlyOwner {
         Agent(target).appendPacket(packet);
@@ -21,8 +20,4 @@ contract Agent is AgentInterface, Ownable {
         return packets[id];
     }
 
-    function setJob(MarketJob _job) external returns (address) {
-        job = _job;
-    }
-
 }

contracts/agent/AgentInterface.sol

@@ -1,12 +1,10 @@
 pragma solidity ^0.4.18;
 
-import "../market/MarketJob.sol";
 
 contract AgentInterface {
 
     function sendPacket(address target, bytes packet) external;
     function appendPacket(bytes packet) external;
     function getPacket(uint id) external constant returns (bytes);
-    function setJob(MarketJob _job) external returns (address);
 
 }

contracts/market/Job.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.4.18;
 
-import './JobValidator.sol';
+import "./JobValidator.sol";
 /**
  * @title The wrapped Job contract 
  */
@@ -49,7 +49,6 @@ contract Job is JobValidator {
     function setResult(bytes32 _result) public returns (bool) {
         require(msg.sender == payee);
         require(descriptor.length > 0);
-        require(result.length == 0);
 
         end = now;
 

contracts/market/JobValidator.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.4.18;
 
-import './JobInterface.sol';
+import "./JobInterface.sol";
 
 /**
  * @title The Job Validator contract 

contracts/market/MarketJob.sol

@@ -2,10 +2,9 @@ pragma solidity ^0.4.18;
 
 import "zeppelin-solidity/contracts/math/SafeMath.sol";
 import "../tokens/SingularityNetToken.sol";
-import "./MarketJobInterface.sol";
 
 
-contract MarketJob is MarketJobInterface {
+contract MarketJob {
     using SafeMath for uint256;
 
     SingularityNetToken public token;

job.sol

@@ -0,0 +1,155 @@
+pragma solidity ^0.4.13;
+
+contract JobInterface {
+    /** 
+     * @dev Starting hash of the job
+     */
+    bytes32 public descriptor;
+
+    /** 
+     * @dev Result hash of the job
+     */
+    bytes32 public result;
+
+    /** 
+     * @dev Start time timestamp 
+     */
+    uint256 public start;
+
+    /** 
+     * @dev End time timestamp 
+     */
+    uint256 public end;
+
+    /**
+     * @dev An agent who pays the job.
+     */
+    address public payer;
+
+    /**
+     * @dev An agent to whom the job is paid.
+     */
+    address public payee;
+
+    /**
+     * @dev Broadcast new hash as job result.
+     */
+    event Result(bytes32 result); 
+}
+
+contract JobValidator is JobInterface {
+
+    /**
+     * @dev Reward for validator in AGI.
+     */
+    address public validator; 
+
+    /**
+     * @dev Validation status
+     * 0 == pending && 1 == accepted && 2 == rejected 
+     */
+    address public status = 0; 
+    
+    /**
+     * @dev Reward for validator in AGI.
+     */
+    uint256 public reward; 
+
+    /**
+     * @dev Completed event to notice the validators pool
+     */
+    event Completed();
+
+    /**
+     * @dev Approved event to notice the parties
+     */
+    event Accepted();
+
+    /**
+     * @dev Rejected event to notice the parties
+     */
+    event Rejected();
+
+
+    /**
+     * @dev Confirm job result
+     */
+    function accept() public {
+        validator = msg.sender;
+        status = 1;
+
+        Accepted();
+    }
+
+    /**
+     * @dev Reject job result
+     */
+    function reject() public {
+        validator = msg.sender;
+        status = 2;
+
+        Rejected();
+    }
+
+}
+
+contract Job is JobValidator {
+
+     /**
+    * @dev Kovan AGI token.
+    * https://kovan.etherscan.io/token/0x3b226ff6aad7851d3263e53cb7688d13a07f6e81#readContract
+    * ERC20Basic public constant AGI = ERC20Basic(0x3b226ff6aad7851d3263e53cb7688d13a07f6e81);
+    */  
+
+    /**
+     * @dev Cost in AGI for the exection of the job
+     * (10**8 cogs === 1 AGI)
+     */
+    uint256 public cost;
+
+    /**
+     * @dev Started event
+     */
+    event Started(address indexed payer, address indexed payee, bytes32 descriptor, address job);
+
+     /**
+      * @dev Job constructor.
+      * @param _payer An agent who pays the job.
+      * @param _payee An agent to whom the job is paid.
+      * @param _cost Cost in AGI
+      */
+    function Job(address _payer, address _payee, bytes32 _descriptor, uint256 _cost, uint256 _reward) public {
+
+        payer = _payer;
+        payee = _payee;
+        descriptor = _descriptor;
+        cost = _cost;
+        reward = _reward;
+
+        start = now;
+
+        Started(payer, payee, descriptor, address(this));
+    }
+
+    /**
+     * @dev Set result of this Job
+     * @param _result Result data hash
+     */
+    function setResult(bytes32 _result) public returns (bool) {
+        require(msg.sender == payee);
+        require(descriptor.length > 0);
+
+        end = now;
+ 
+        Result(_result);
+        result = _result;
+
+        Completed();
+
+        return true;
+    }
+
+
+
+}
+

migrations/2_deploy_contracts.js

@@ -1,22 +1,21 @@
 const fs = require('fs')
 
-const AgentRegistry = artifacts.require('registries/AgentRegistry.sol')
 const Job = artifacts.require('market/Job.sol')
 /* const AgentFactory = artifacts.require('agent/AgentFactory.sol')
+const AgentRegistry = artifacts.require('registries/AgentRegistry.sol')
 const MarketJobFactory = artifacts.require('market/MarketJobFactory.sol')
 const SingularityNetToken = artifacts.require('tokens/SingularityNetToken.sol')
 const TokenVestingFactory = artifacts.require('tokens/TokenVestingFactory.sol') */
 
 module.exports = function(deployer, network, accounts) {
   deployer.deploy([
-    Job,
-    AgentRegistry
+    Job
   ]).then(() => {
     const fileName = "addresses.json"
     const content = {
       //AgentFactory: AgentFactory.address,
       Job: Job.address,
-      AgentRegistry: AgentRegistry.address,
+      //AgentRegistry: AgentRegistry.address,
       //MarketJobFactory: MarketJobFactory.address,
       //SingularityNetToken: SingularityNetToken.address,
       //TokenVestingFactory: TokenVestingFactory.address

package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "compile": "node_modules/.bin/truffle compile",
     "deploy": "node_modules/.bin/truffle migrate",
-    "test": "node_modules/.bin/truffle test"
+    "test": "rm -rf build && node_modules/.bin/truffle test"
   },
   "author": "tiero",
   "license": "MIT",

test/TestJob.js

@@ -1,29 +1,26 @@
 const Job = artifacts.require('market/Job.sol')
 
 
-contract('Job', function ([payer, payee]) {
+contract('Job', function ([payee, payer]) {
 
   beforeEach(async () => {
-    this.job = await Job.new()
-  })
-  
-  it('JOB STARTED', async () => {
     const jobDescriptor = "0x0"
-
-    const { logs } = await this.job.setJobStarted(payer, payee, jobDescriptor)
-    const found = logs.find(e => e.event === 'JobStarted')
-    assert.strictEqual(found.event, 'JobStarted', 'Job not started')
+    this.job = await Job.new(payer, payee, jobDescriptor, 800, 0)
+    console.log(this.job)
   })
 
-  it('JOB COMPLETED', async () => {
-    const jobDescriptor = "0x0"
-    const jobResult = "0x0102"
 
-    await this.job.setJobStarted(payer, payee, jobDescriptor)
+  it('JOB COMPLETED - set result', async () => {
+    const jobResult = "0x101"
     //Complete jobs
-    const { logs } = await this.job.setJobCompleted(jobResult, {from:payee})
-    const found = logs.find(e => e.event === 'JobCompleted')
-    assert.strictEqual(found.event, 'JobCompleted', 'Job not completed')
+    const result = await this.job.setResult(jobResult, {from:payee})
+
+    const found = result.logs.find(e => e.event === 'Result')
+    assert.strictEqual(found.event, 'Result', 'Result event not fired')
+
+    const found2 = result.logs.find(e => e.event === 'Completed')
+    assert.strictEqual(found2.event, 'Completed', 'Completed event not fired')
+    
   })