diff --git a/src/ddo/Condition.ts b/src/ddo/Condition.ts index bdaf18a..7cd840c 100644 --- a/src/ddo/Condition.ts +++ b/src/ddo/Condition.ts @@ -1,7 +1,8 @@ import Parameter from "./Parameter" export default class Condition { - public name: string = "lockPayment" + public contractName: string = "AccessCondition" + public methodName: string = "lockPayment" public timeout: number = 0 public conditionKey: string public parameters: Parameter[] diff --git a/src/ocean/Ocean.ts b/src/ocean/Ocean.ts index 26d414a..b83c1b7 100644 --- a/src/ocean/Ocean.ts +++ b/src/ocean/Ocean.ts @@ -72,17 +72,15 @@ export default class Ocean { // create ddo conditions out of the keys const ddoConditions: DDOCondition[] = conditions.map((condition: Condition): DDOCondition => { return { - name: condition.methodReflection.methodName, + contractName: condition.methodReflection.contractName, + methodName: condition.methodReflection.methodName, timeout: condition.timeout, conditionKey: condition.condtionKey, parameters: condition.methodReflection.inputs.map((input: ValuePair) => { return { ...input, - // todo: change remove, move to execute - value: "xxx", } as Parameter }), - } as DDOCondition }) const serviceEndpoint = aquarius.getServiceEndpoint(did)