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

Replace serviceExecution with computeExecution.

Browse Source
This commit is contained in:
ssallam 2020-03-10 11:37:06 +01:00
parent d3c4407010
commit de541a9fd3
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -4,12 +4,6 @@ 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).
#### [v2.0.0](https://github.com/oceanprotocol/squid-js/compare/2.0.0-beta.4...v2.0.0)
> 9 March 2020
- Release 2.0.0 [`5a5e00f`](https://github.com/oceanprotocol/squid-js/commit/5a5e00f6c671d68153ad94704535253027142ff3)
#### [2.0.0-beta.4](https://github.com/oceanprotocol/squid-js/compare/v2.0.0-beta.3...2.0.0-beta.4)
> 6 March 2020

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

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

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

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