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

map events properly

Browse Source
This commit is contained in:
Sebastian Gerske 2018-12-07 16:00:33 +01:00
parent 2c85460285
commit 0f262f5f03
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ocean/ServiceAgreements/Condition.ts
View File

@ -1,3 +1,4 @@
import Event from "../../ddo/Event"
import MethodReflection from "../../models/MethodReflection" import MethodReflection from "../../models/MethodReflection"
import Parameter from "./Parameter" import Parameter from "./Parameter"
@ -8,5 +9,6 @@ export default class Condition {
public dependencyTimeoutFlags: number[] public dependencyTimeoutFlags: number[]
public isTerminalCondition: boolean public isTerminalCondition: boolean
public timeout: number public timeout: number
public events: Event[]
public parameters: Parameter[] public parameters: Parameter[]
} }

16
src/ocean/ServiceAgreements/ServiceAgreementTemplate.ts
View File

@ -1,7 +1,5 @@
import DDOCondition from "../../ddo/Condition" import DDOCondition from "../../ddo/Condition"
import Dependency from "../../ddo/Dependency" import Dependency from "../../ddo/Dependency"
import Event from "../../ddo/Event"
import EventHandler from "../../ddo/EventHandler"
import MetaData from "../../ddo/MetaData" import MetaData from "../../ddo/MetaData"
import Parameter from "../../ddo/Parameter" import Parameter from "../../ddo/Parameter"
import ContractReflector from "../../keeper/ContractReflector" import ContractReflector from "../../keeper/ContractReflector"
@ -105,17 +103,6 @@ export default class ServiceAgreementTemplate extends OceanBase {
public async getConditions(metadata: MetaData, assetId: string): Promise<DDOCondition[]> { public async getConditions(metadata: MetaData, assetId: string): Promise<DDOCondition[]> {
const conditions = await this.blendConditions() const conditions = await this.blendConditions()
return conditions.map((condition: Condition, index: number): DDOCondition => { return conditions.map((condition: Condition, index: number): DDOCondition => {
const events: Event[] = [
{
name: "PaymentReleased",
actorType: "consumer",
handler: {
moduleName: "serviceAgreement",
functionName: "fulfillAgreement",
version: "0.1",
} as EventHandler,
} as Event,
]
const mapParameterValueToName = (name) => { const mapParameterValueToName = (name) => {
@ -159,7 +146,7 @@ export default class ServiceAgreementTemplate extends OceanBase {
functionName: condition.methodReflection.methodName, functionName: condition.methodReflection.methodName,
index, index,
parameters, parameters,
events, events: condition.events,
} as DDOCondition } as DDOCondition
}) })
} }
@ -172,6 +159,7 @@ export default class ServiceAgreementTemplate extends OceanBase {
return { return {
methodReflection, methodReflection,
timeout: method.timeout, timeout: method.timeout,
events: method.events,
parameters: method.parameters, parameters: method.parameters,
dependencies: method.dependencies, dependencies: method.dependencies,
dependencyTimeoutFlags: method.dependencyTimeoutFlags, dependencyTimeoutFlags: method.dependencyTimeoutFlags,