Skip to content

Commit

Permalink
Update ci/ethereum_test and examples to use JSONAPI (#3)
Browse files Browse the repository at this point in the history
* Add Zeppelin plugin for Solium

* Make UptimeSLA use SafeMath

* Generate SAID in Coordinator contract

* Upgrade notify for go 1.11

* node operator should be able to duplicate old jobs

* Keep currentUrl on RECEIVE_CREATE_SUCCESS

* Create JobRun,BridgeType now returns object in JSONAPI format

* Notifications better discerns types

* add a test case for running a web job with gui

* Create JobSpec responds in JSONAPI

* CLI correctly renders Create JSONAPI format

* Notifications now respect CreateJobSpec JSONAPI

* Update integration tests and examples to use JobSpec JSONAPI
  • Loading branch information
dimroc authored and NavyAdmiral committed Sep 8, 2018
1 parent f7deeb9 commit ca260c5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions examples/echo_server/migrations/5_run_log.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ let job = {
module.exports = clmigration(async function(truffleDeployer) {
await request.post(sessionsUrl, {json: credentials});
let body = await request.post(specsUrl, {json: job});
console.log(`Deploying Consumer Contract with JobID ${body.id}`);
await truffleDeployer.deploy(RunLog, LinkToken.address, Oracle.address, body.id);
console.log(`Deploying Consumer Contract with JobID ${body.data.id}`);
await truffleDeployer.deploy(RunLog, LinkToken.address, Oracle.address, body.data.id);
});
2 changes: 1 addition & 1 deletion examples/uptime_sla/migrations/4_uptime_sla.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = clmigration(async function(truffleDeployer) {
await request.post(sessionsUrl, {json: credentials});
let body = await request.post(specsUrl, {json: job});
console.log(`Deploying UptimeSLA:`)
console.log(`\tjob: ${body.id}`);
console.log(`\tjob: ${body.data.id}`);
console.log(`\tclient: ${client}`);
console.log(`\tservice provider: ${serviceProvider}`);

Expand Down
2 changes: 1 addition & 1 deletion integration/send_runlog_transaction
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const main = async () => {
let Job = await request.post(specsUrl, {json: job})
.catch(abort('Error creating Job'))

let RunLog = await deployer.perform('contracts/RunLog.sol', LINK_TOKEN_ADDRESS, ORACLE_CONTRACT_ADDRESS, Job.id)
let RunLog = await deployer.perform('contracts/RunLog.sol', LINK_TOKEN_ADDRESS, ORACLE_CONTRACT_ADDRESS, Job.data.id)
.catch(abort('Error deploying RunLog.sol'))
console.log(`Deployed RunLog at: ${RunLog.address}`)

Expand Down

0 comments on commit ca260c5

Please sign in to comment.