oceanprotocol/squid-js
1
0
Fork 0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00
Code Releases Activity

Merge pull request #380 from oceanprotocol/feature/update-compute-condition-name

Browse Source 
Replace serviceExecution with computeExecution.
This commit is contained in:
Samer 2020-03-10 12:46:20 +01:00 committed by GitHub
commit 13c5498c84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -4,11 +4,11 @@ All notable changes to this project will be documented in this file. Dates are d
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### [v2.0.0](https://github.com/oceanprotocol/squid-js/compare/2.0.0-beta.4...v2.0.0) #### [v2.0.0-beta.5](https://github.com/oceanprotocol/squid-js/compare/2.0.0-beta.4...v2.0.0-beta.5)
> 9 March 2020 > 10 March 2020
- Release 2.0.0 [`5a5e00f`](https://github.com/oceanprotocol/squid-js/commit/5a5e00f6c671d68153ad94704535253027142ff3) - Update the compute condition name in ddo jason definition. [`#380`](https://github.com/oceanprotocol/squid-js/pull/380)
#### [2.0.0-beta.4](https://github.com/oceanprotocol/squid-js/compare/v2.0.0-beta.3...2.0.0-beta.4) #### [2.0.0-beta.4](https://github.com/oceanprotocol/squid-js/compare/v2.0.0-beta.3...2.0.0-beta.4)

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@oceanprotocol/squid", "name": "@oceanprotocol/squid",
"version": "2.0.0-beta.4", "version": "2.0.0-beta.5",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@oceanprotocol/squid", "name": "@oceanprotocol/squid",
"version": "2.0.0-beta.4", "version": "2.0.0-beta.5",
"description": "JavaScript client library for Ocean Protocol", "description": "JavaScript client library for Ocean Protocol",
"main": "./dist/node/squid.js", "main": "./dist/node/squid.js",
"typings": "./dist/node/squid.d.ts", "typings": "./dist/node/squid.d.ts",

2
src/keeper/contracts/templates/EscrowCompute.serviceAgreementTemplate.ts
View File

@ -20,7 +20,7 @@ export const escrowComputeServiceAgreementTemplate: ServiceAgreementTemplate = {
], ],
conditionDependency: { conditionDependency: {
lockReward: [], lockReward: [],
serviceExecution: [], computeExecution: [],
escrowReward: ['lockReward', 'computeExecution'] escrowReward: ['lockReward', 'computeExecution']
}, },
conditions: [ conditions: [

34
test/unit/__fixtures__/ddo.json
View File

@ -138,7 +138,7 @@
"actorType": "consumer", "actorType": "consumer",
"handler": { "handler": {
"moduleName": "accessSecretStore", "moduleName": "accessSecretStore",
"functionName": "fulfillEscrowRewardCondition", "functionName": "refundReward",
"version": "0.1" "version": "0.1"
} }
} }
@ -255,10 +255,10 @@
"contractName": "EscrowComputeExecutionTemplate", "contractName": "EscrowComputeExecutionTemplate",
"events": [ "events": [
{ {
"name": "AgreementCreated", "name": "AgreementActorAdded",
"actorType": "consumer", "actorType": "provider",
"handler": { "handler": {
"moduleName": "serviceExecutionTemplate", "moduleName": "",
"functionName": "fulfillLockRewardCondition", "functionName": "fulfillLockRewardCondition",
"version": "0.1" "version": "0.1"
} }
@ -266,13 +266,13 @@
], ],
"fulfillmentOrder": [ "fulfillmentOrder": [
"lockReward.fulfill", "lockReward.fulfill",
"serviceExecution.fulfill", "computeExecution.fulfill",
"escrowReward.fulfill" "escrowReward.fulfill"
], ],
"conditionDependency": { "conditionDependency": {
"lockReward": [], "lockReward": [],
"serviceExecution": [], "computeExecution": [],
"releaseReward": ["lockReward", "serviceExecution"] "releaseReward": ["lockReward", "computeExecution"]
}, },
"conditions": [ "conditions": [
{ {
@ -296,17 +296,17 @@
"events": [ "events": [
{ {
"name": "Fulfilled", "name": "Fulfilled",
"actorType": "publisher", "actorType": "provider",
"handler": { "handler": {
"moduleName": "lockRewardCondition", "moduleName": "lockRewardExecutionCondition",
"functionName": "fulfillServiceExecutionCondition", "functionName": "fulfillComputeExecutionCondition",
"version": "0.1" "version": "0.1"
} }
} }
] ]
}, },
{ {
"name": "serviceExecution", "name": "computeExecution",
"timelock": 0, "timelock": 0,
"timeout": 0, "timeout": 0,
"contractName": "ComputeExecutionCondition", "contractName": "ComputeExecutionCondition",
@ -326,10 +326,10 @@
"events": [ "events": [
{ {
"name": "Fulfilled", "name": "Fulfilled",
"actorType": "publisher", "actorType": "provider",
"handler": { "handler": {
"moduleName": "serviceExecution", "moduleName": "accessSecretStore",
"functionName": "fulfillServiceExecutionCondition", "functionName": "fulfillEscrowRewardCondition",
"version": "0.1" "version": "0.1"
} }
}, },
@ -337,8 +337,8 @@
"name": "TimedOut", "name": "TimedOut",
"actorType": "consumer", "actorType": "consumer",
"handler": { "handler": {
"moduleName": "serviceExec", "moduleName": "accessSecretStore",
"functionName": "fulfillServiceExecutionCondition", "functionName": "refundReward",
"version": "0.1" "version": "0.1"
} }
} }
@ -380,7 +380,7 @@
"events": [ "events": [
{ {
"name": "Fulfilled", "name": "Fulfilled",
"actorType": "publisher", "actorType": "provider",
"handler": { "handler": {
"moduleName": "escrowRewardCondition", "moduleName": "escrowRewardCondition",
"functionName": "verifyRewardTokens", "functionName": "verifyRewardTokens",