From f557fccd2971afd74d3d8722c36cc64c18eac03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Guti=C3=A9rrez?= Date: Mon, 4 Feb 2019 18:04:23 +0100 Subject: [PATCH] apply changes on examples --- src/examples/BuyAsset.ts | 16 ++++++++-------- src/examples/ExecuteAgreement.ts | 16 ++++++++-------- src/examples/GrantAccess.ts | 16 ++++++++-------- src/examples/InitializeAgreement.ts | 15 +++++++-------- src/examples/RegisterAsset.ts | 16 ++++++++-------- src/examples/Search.ts | 2 +- src/examples/SignAgreement.ts | 21 +++++++++------------ 7 files changed, 49 insertions(+), 53 deletions(-) diff --git a/src/examples/BuyAsset.ts b/src/examples/BuyAsset.ts index a50c0fb..841b274 100644 --- a/src/examples/BuyAsset.ts +++ b/src/examples/BuyAsset.ts @@ -1,7 +1,6 @@ -import DDO from "../ddo/DDO" -import MetaData from "../ddo/MetaData" -import MetaDataBase from "../ddo/MetaDataBase" -import Service from "../ddo/Service" +import { DDO } from "../ddo/DDO" +import { MetaData } from "../ddo/MetaData" +import { Service } from "../ddo/Service" import DID from "../ocean/DID" import {Account, Logger, Ocean, ServiceAgreement} from "../squid" import config from "./config" @@ -11,9 +10,10 @@ async function exec() { const ocean: Ocean = await Ocean.getInstance(config) const publisher: Account = (await ocean.getAccounts())[0] + publisher.setPassword('node0') const consumer: Account = (await ocean.getAccounts())[1] - const metaData = new MetaData({ + const metaData: Partial = { base: { name: "Office Humidity", type: "dataset", @@ -40,10 +40,10 @@ async function exec() { inLanguage: "en", tags: "weather, uk, 2011, temperature, humidity", price: 10, - } as MetaDataBase, - } as MetaData) + }, + } - const ddo: DDO = await ocean.registerAsset(metaData, publisher) + const ddo: DDO = await ocean.registerAsset(metaData, publisher) Logger.log("did", ddo.id) const did: DID = DID.parse(ddo.id) diff --git a/src/examples/ExecuteAgreement.ts b/src/examples/ExecuteAgreement.ts index 9a3fe2b..783f882 100644 --- a/src/examples/ExecuteAgreement.ts +++ b/src/examples/ExecuteAgreement.ts @@ -1,7 +1,6 @@ -import DDO from "../ddo/DDO" -import MetaData from "../ddo/MetaData" -import MetaDataBase from "../ddo/MetaDataBase" -import Service from "../ddo/Service" +import { DDO } from "../ddo/DDO" +import { MetaData } from "../ddo/MetaData" +import { Service } from "../ddo/Service" import {Account, Logger, Ocean, ServiceAgreement} from "../squid" import config from "./config" import {runner} from "./runner" @@ -10,9 +9,10 @@ async function exec() { const ocean: Ocean = await Ocean.getInstance(config) const publisher: Account = (await ocean.getAccounts())[0] + publisher.setPassword('node0') const consumer: Account = (await ocean.getAccounts())[1] - const metaData = new MetaData({ + const metaData: Partial = { base: { name: "Office Humidity", type: "dataset", @@ -39,10 +39,10 @@ async function exec() { inLanguage: "en", tags: "weather, uk, 2011, temperature, humidity", price: 10, - } as MetaDataBase, - } as MetaData) + }, + } - const ddo: DDO = await ocean.registerAsset(metaData, publisher) + const ddo: DDO = await ocean.registerAsset(metaData, publisher) Logger.log("did", ddo.id) const accessService = ddo.findServiceByType("Access") diff --git a/src/examples/GrantAccess.ts b/src/examples/GrantAccess.ts index 1430d55..aef460b 100644 --- a/src/examples/GrantAccess.ts +++ b/src/examples/GrantAccess.ts @@ -1,7 +1,6 @@ -import DDO from "../ddo/DDO" -import MetaData from "../ddo/MetaData" -import MetaDataBase from "../ddo/MetaDataBase" -import Service from "../ddo/Service" +import { DDO } from "../ddo/DDO" +import { MetaData } from "../ddo/MetaData" +import { Service } from "../ddo/Service" import DID from "../ocean/DID" import {Account, Logger, Ocean, ServiceAgreement} from "../squid" import config from "./config" @@ -11,9 +10,10 @@ async function exec() { const ocean: Ocean = await Ocean.getInstance(config) const publisher: Account = (await ocean.getAccounts())[0] + publisher.setPassword('node0') const consumer: Account = (await ocean.getAccounts())[1] - const metaData = new MetaData({ + const metaData: Partial = { base: { name: "Office Humidity", type: "dataset", @@ -40,10 +40,10 @@ async function exec() { inLanguage: "en", tags: "weather, uk, 2011, temperature, humidity", price: 10, - } as MetaDataBase, - } as MetaData) + }, + } - const ddo: DDO = await ocean.registerAsset(metaData, publisher) + const ddo: DDO = await ocean.registerAsset(metaData, publisher) Logger.log("did", ddo.id) const did: DID = DID.parse(ddo.id) diff --git a/src/examples/InitializeAgreement.ts b/src/examples/InitializeAgreement.ts index 541d637..c055e41 100644 --- a/src/examples/InitializeAgreement.ts +++ b/src/examples/InitializeAgreement.ts @@ -1,7 +1,6 @@ -import DDO from "../ddo/DDO" -import MetaData from "../ddo/MetaData" -import MetaDataBase from "../ddo/MetaDataBase" -import Service from "../ddo/Service" +import { DDO } from "../ddo/DDO" +import { MetaData } from "../ddo/MetaData" +import { Service } from "../ddo/Service" import {Account, Logger, Ocean} from "../squid" import config from "./config" import {runner} from "./runner" @@ -12,7 +11,7 @@ async function exec() { const publisher: Account = (await ocean.getAccounts())[1] const consumer: Account = (await ocean.getAccounts())[1] - const metaData = new MetaData({ + const metaData: Partial = { base: { name: "Office Humidity", type: "dataset", @@ -38,10 +37,10 @@ async function exec() { inLanguage: "en", tags: "weather, uk, 2011, temperature, humidity", price: 10, - } as MetaDataBase, - } as MetaData) + }, + } - const ddo: DDO = await ocean.registerAsset(metaData, publisher) + const ddo: DDO = await ocean.registerAsset(metaData, publisher) Logger.log("Registered asset with did:", ddo.id) const accessService = ddo.findServiceByType("Access") diff --git a/src/examples/RegisterAsset.ts b/src/examples/RegisterAsset.ts index 483b089..6d858d5 100644 --- a/src/examples/RegisterAsset.ts +++ b/src/examples/RegisterAsset.ts @@ -1,7 +1,6 @@ -import DDO from "../ddo/DDO" -import MetaData from "../ddo/MetaData" -import MetaDataBase from "../ddo/MetaDataBase" -import {Account, Logger, Ocean} from "../squid" +import { DDO } from "../ddo/DDO" +import { MetaData } from "../ddo/MetaData" +import { Account, Logger, Ocean } from "../squid" import config from "./config" import {runner} from "./runner" @@ -9,8 +8,9 @@ async function exec() { const ocean: Ocean = await Ocean.getInstance(config) const publisher: Account = (await ocean.getAccounts())[0] + publisher.setPassword('node0') - const metaData = new MetaData({ + const metaData: Partial = { base: { name: "Office Humidity", type: "dataset", @@ -37,10 +37,10 @@ async function exec() { inLanguage: "en", tags: "weather, uk, 2011, temperature, humidity", price: 10, - } as MetaDataBase, - } as MetaData) + }, + } - const ddo: DDO = await ocean.registerAsset(metaData, publisher) + const ddo: DDO = await ocean.registerAsset(metaData, publisher) Logger.log(ddo.id) } diff --git a/src/examples/Search.ts b/src/examples/Search.ts index edb9e89..5dd06da 100644 --- a/src/examples/Search.ts +++ b/src/examples/Search.ts @@ -1,4 +1,4 @@ -import DDO from "../ddo/DDO" +import { DDO } from "../ddo/DDO" import {Logger, Ocean} from "../squid" import config from "./config" import {runner} from "./runner" diff --git a/src/examples/SignAgreement.ts b/src/examples/SignAgreement.ts index a1e8d2a..ebc78ca 100644 --- a/src/examples/SignAgreement.ts +++ b/src/examples/SignAgreement.ts @@ -1,9 +1,6 @@ -import AdditionalInformation from "../ddo/AdditionalInformation" -import Curation from "../ddo/Curation" -import DDO from "../ddo/DDO" -import MetaData from "../ddo/MetaData" -import MetaDataBase from "../ddo/MetaDataBase" -import Service from "../ddo/Service" +import { DDO } from "../ddo/DDO" +import { MetaData } from "../ddo/MetaData" +import { Service } from "../ddo/Service" import {Account, Logger, Ocean} from "../squid" import config from "./config" import {runner} from "./runner" @@ -14,7 +11,7 @@ async function exec() { const publisher: Account = (await ocean.getAccounts())[0] const consumer: Account = (await ocean.getAccounts())[1] - const metaData = { + const metaData: MetaData = { additionalInformation: { structuredMarkup: [ { @@ -28,8 +25,8 @@ async function exec() { ], updateFrecuency: "yearly", checksum: "efdd14d39feb726e321931f408b3454d26f1a4899bcc608a68b5397f23203174", - } as AdditionalInformation, - base: { + }, + base: { name: "Office Humidity", type: "dataset", description: "Weather information of UK including temperature and humidity", @@ -55,15 +52,15 @@ async function exec() { inLanguage: "en", tags: "weather, uk, 2011, temperature, humidity", price: 10, - } as MetaDataBase, + }, curation: { rating: 0.94, numVotes: 124, schema: "Binary Votting", - } as Curation, + }, } - const ddo: DDO = await ocean.registerAsset(metaData as MetaData, publisher) + const ddo: DDO = await ocean.registerAsset(metaData, publisher) Logger.log("did", ddo.id) const accessService: Service = ddo.findServiceByType("Access")