diff --git a/evm/contracts/examples/Consumer.sol b/evm/contracts/examples/Consumer.sol index 1ceb346fda3..058f36cbd62 100644 --- a/evm/contracts/examples/Consumer.sol +++ b/evm/contracts/examples/Consumer.sol @@ -15,7 +15,7 @@ contract Consumer is ChainlinkClient { function requestEthereumPrice(string _currency) public { Chainlink.Request memory req = buildChainlinkRequest(specId, this, this.fulfill.selector); - req.add("url", "https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD,EUR,JPY"); + req.add("get", "https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD,EUR,JPY"); string[] memory path = new string[](1); path[0] = _currency; req.addStringArray("path", path); diff --git a/evm/contracts/examples/ServiceAgreementConsumer.sol b/evm/contracts/examples/ServiceAgreementConsumer.sol index 4c7d9b907de..105060e5b1d 100644 --- a/evm/contracts/examples/ServiceAgreementConsumer.sol +++ b/evm/contracts/examples/ServiceAgreementConsumer.sol @@ -16,7 +16,7 @@ contract ServiceAgreementConsumer is Chainlinked { function requestEthereumPrice(string _currency) public { Chainlink.Request memory req = newRequest(sAId, this, this.fulfill.selector); - req.add("url", "https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD,EUR,JPY"); + req.add("get", "https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD,EUR,JPY"); req.add("path", _currency); chainlinkRequest(req, ORACLE_PAYMENT); } diff --git a/evm/test/BasicConsumer_test.js b/evm/test/BasicConsumer_test.js index e9037be7c66..ce54175035c 100644 --- a/evm/test/BasicConsumer_test.js +++ b/evm/test/BasicConsumer_test.js @@ -42,7 +42,7 @@ contract('BasicConsumer', () => { const request = h.decodeRunRequest(log) const expected = { path: ['USD'], - url: + get: 'https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD,EUR,JPY' } diff --git a/evm/test/ServiceAgreementConsumer_test.js b/evm/test/ServiceAgreementConsumer_test.js index 728a37ba9e4..cca36977994 100644 --- a/evm/test/ServiceAgreementConsumer_test.js +++ b/evm/test/ServiceAgreementConsumer_test.js @@ -47,7 +47,7 @@ contract('ServiceAgreementConsumer', () => { assertBigNum(1, request.dataVersion) const url = 'https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD,EUR,JPY' - assert.deepEqual(params, { path: currency, url: url }) + assert.deepEqual(params, { path: currency, get: url }) }) it('has a reasonable gas cost', async () => { diff --git a/examples/echo_server/broadcast_logs_job.json b/examples/echo_server/broadcast_logs_job.json index be11f82a3b4..2a15e3e50cc 100644 --- a/examples/echo_server/broadcast_logs_job.json +++ b/examples/echo_server/broadcast_logs_job.json @@ -2,6 +2,6 @@ "_comment": "An ethlog with no address listens to all addresses.", "initiators": [{ "type": "ethlog" }], "tasks": [ - { "type": "HttpPost", "params": { "url": "http://localhost:6690" } } + { "type": "HttpPost", "params": { "post": "http://localhost:6690" } } ] } diff --git a/examples/testnet/TestnetConsumerBase.sol b/examples/testnet/TestnetConsumerBase.sol index ea85f4387f2..bf177ed63d8 100644 --- a/examples/testnet/TestnetConsumerBase.sol +++ b/examples/testnet/TestnetConsumerBase.sol @@ -34,7 +34,7 @@ contract ATestnetConsumer is ChainlinkClient, Ownable { onlyOwner { Chainlink.Request memory req = buildChainlinkRequest(stringToBytes32(_jobId), this, this.fulfillEthereumPrice.selector); - req.add("url", "https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD"); + req.add("get", "https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD"); req.add("path", "USD"); req.addInt("times", 100); sendChainlinkRequestTo(_oracle, req, ORACLE_PAYMENT); @@ -45,7 +45,7 @@ contract ATestnetConsumer is ChainlinkClient, Ownable { onlyOwner { Chainlink.Request memory req = buildChainlinkRequest(stringToBytes32(_jobId), this, this.fulfillEthereumChange.selector); - req.add("url", "https://min-api.cryptocompare.com/data/pricemultifull?fsyms=ETH&tsyms=USD"); + req.add("get", "https://min-api.cryptocompare.com/data/pricemultifull?fsyms=ETH&tsyms=USD"); req.add("path", "RAW.ETH.USD.CHANGEPCTDAY"); req.addInt("times", 1000000000); sendChainlinkRequestTo(_oracle, req, ORACLE_PAYMENT); @@ -56,7 +56,7 @@ contract ATestnetConsumer is ChainlinkClient, Ownable { onlyOwner { Chainlink.Request memory req = buildChainlinkRequest(stringToBytes32(_jobId), this, this.fulfillEthereumLastMarket.selector); - req.add("url", "https://min-api.cryptocompare.com/data/pricemultifull?fsyms=ETH&tsyms=USD"); + req.add("get", "https://min-api.cryptocompare.com/data/pricemultifull?fsyms=ETH&tsyms=USD"); string[] memory path = new string[](4); path[0] = "RAW"; path[1] = "ETH"; diff --git a/examples/testnet/contracts/TestnetConsumer.sol b/examples/testnet/contracts/TestnetConsumer.sol index 8f6366ffeec..c0fb391386e 100644 --- a/examples/testnet/contracts/TestnetConsumer.sol +++ b/examples/testnet/contracts/TestnetConsumer.sol @@ -1014,7 +1014,7 @@ contract ATestnetConsumer is ChainlinkClient, Ownable { onlyOwner { Chainlink.Request memory req = buildChainlinkRequest(stringToBytes32(_jobId), this, this.fulfillEthereumPrice.selector); - req.add("url", "https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD"); + req.add("get", "https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD"); req.add("path", "USD"); req.addInt("times", 100); sendChainlinkRequestTo(_oracle, req, ORACLE_PAYMENT); @@ -1025,7 +1025,7 @@ contract ATestnetConsumer is ChainlinkClient, Ownable { onlyOwner { Chainlink.Request memory req = buildChainlinkRequest(stringToBytes32(_jobId), this, this.fulfillEthereumChange.selector); - req.add("url", "https://min-api.cryptocompare.com/data/pricemultifull?fsyms=ETH&tsyms=USD"); + req.add("get", "https://min-api.cryptocompare.com/data/pricemultifull?fsyms=ETH&tsyms=USD"); req.add("path", "RAW.ETH.USD.CHANGEPCTDAY"); req.addInt("times", 1000000000); sendChainlinkRequestTo(_oracle, req, ORACLE_PAYMENT); @@ -1036,7 +1036,7 @@ contract ATestnetConsumer is ChainlinkClient, Ownable { onlyOwner { Chainlink.Request memory req = buildChainlinkRequest(stringToBytes32(_jobId), this, this.fulfillEthereumLastMarket.selector); - req.add("url", "https://min-api.cryptocompare.com/data/pricemultifull?fsyms=ETH&tsyms=USD"); + req.add("get", "https://min-api.cryptocompare.com/data/pricemultifull?fsyms=ETH&tsyms=USD"); string[] memory path = new string[](4); path[0] = "RAW"; path[1] = "ETH"; diff --git a/examples/twilio_sms/create_twilio_job_for b/examples/twilio_sms/create_twilio_job_for index e4056fff4d0..3ef63f536a9 100755 --- a/examples/twilio_sms/create_twilio_job_for +++ b/examples/twilio_sms/create_twilio_job_for @@ -8,7 +8,7 @@ if (process.argv.length <= 2) { const job = { "_comment": "An ethlog with a specific address only listens to that address.", "initiators": [{ "type": "ethlog", "address": process.argv[2]}], - "tasks": [{ "type": "HttpPost", "params": { "url": "http://localhost:6691" }}] + "tasks": [{ "type": "HttpPost", "params": { "post": "http://localhost:6691" }}] }; const request = require("request").defaults({jar: true}); diff --git a/examples/uptime_sla/README.md b/examples/uptime_sla/README.md index ca1ba748db4..eacd153edff 100644 --- a/examples/uptime_sla/README.md +++ b/examples/uptime_sla/README.md @@ -33,7 +33,7 @@ The ChainLink Job is configured to not take any specific URL or JSON path, so th ```solidity function updateUptime(string _when) public { Chainlink.Request memory req = newRequest(jobId, this, "report(uint256,uint256)"); - req.add("url", "https://status.heroku.com/api/ui/availabilities"); + req.add("get", "https://status.heroku.com/api/ui/availabilities"); string[] memory path = new string[](4); path[0] = "data"; path[1] = _when; //pick which data point in the array you want to examine diff --git a/examples/uptime_sla/contracts/UptimeSLA.sol b/examples/uptime_sla/contracts/UptimeSLA.sol index 7a08ae2ec83..87a9cf419aa 100644 --- a/examples/uptime_sla/contracts/UptimeSLA.sol +++ b/examples/uptime_sla/contracts/UptimeSLA.sol @@ -29,7 +29,7 @@ contract UptimeSLA is Chainlinked { function updateUptime(string _when) public { Chainlink.Request memory req = newRequest(jobId, this, this.report.selector); - req.add("url", "https://status.heroku.com/api/ui/availabilities"); + req.add("get", "https://status.heroku.com/api/ui/availabilities"); string[] memory path = new string[](4); path[0] = "data"; path[1] = _when; diff --git a/examples/uptime_sla/test/UptimeSLA_test.js b/examples/uptime_sla/test/UptimeSLA_test.js index 89564aeac23..f3cea2dbad2 100644 --- a/examples/uptime_sla/test/UptimeSLA_test.js +++ b/examples/uptime_sla/test/UptimeSLA_test.js @@ -49,7 +49,7 @@ contract('UptimeSLA', accounts => { const decoded = await h.decodeDietCBOR(events[0].args.data) assert.deepEqual(decoded, { - url: 'https://status.heroku.com/api/ui/availabilities', + get: 'https://status.heroku.com/api/ui/availabilities', path: ['data', '0', 'attributes', 'calculation'] }) })