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

make lint more solid

Browse Source
This commit is contained in:
Sebastian Gerske 2018-11-01 13:24:41 +01:00
parent 093a6ea4af
commit 1d9754fba6
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -8,7 +8,7 @@
"test:watch": "mocha -w --watch-extensions js,ts,json", "test:watch": "mocha -w --watch-extensions js,ts,json",
"test:cover": "nyc mocha", "test:cover": "nyc mocha",
"clean": "rm -rf ./dist/ ./doc/ ./coverage ./.nyc_output", "clean": "rm -rf ./dist/ ./doc/ ./coverage ./.nyc_output",
"lint": "tslint -c tslint.json 'src/**/*.ts'", "lint": "tslint -c tslint.json 'src/**/*.ts' 'test/**/*.ts'",
"start": "npm link @oceanprotocol/keeper-contracts @oceanprotocol/secret-store-client && npm run build:watch", "start": "npm link @oceanprotocol/keeper-contracts @oceanprotocol/secret-store-client && npm run build:watch",
"build": "npm run clean && npm run lint && tsc && npm run doc", "build": "npm run clean && npm run lint && tsc && npm run doc",
"build:watch": "tsc -w", "build:watch": "tsc -w",

16
src/aquarius/Aquarius.ts
View File

@ -14,23 +14,23 @@ export default class Aquarius {
this.url = config.aquariusUri this.url = config.aquariusUri
} }
public async getAccessUrl(accessToken: any, payload: any): Promise<string | void> { public async getAccessUrl(accessToken: any, payload: any): Promise<string> {
const accessUrl = await AquariusConnectorProvider.getConnector().post( const accessUrl: string = await AquariusConnectorProvider.getConnector()
`${accessToken.service_endpoint}/${accessToken.resource_id}`, .post(`${accessToken.service_endpoint}/${accessToken.resource_id}`, payload)
payload) .then((response: any): string => {
.then((response: any) => {
if (response.ok) { if (response.ok) {
return response.text() return response.text()
} }
Logger.log("Failed: ", response.status, response.statusText) Logger.error("Failed: ", response.status, response.statusText)
}) })
.then((consumptionUrl: string) => { .then((consumptionUrl: string): string => {
Logger.log("Success accessing consume endpoint: ", consumptionUrl) Logger.log("Success accessing consume endpoint: ", consumptionUrl)
return consumptionUrl return consumptionUrl
}) })
.catch((error) => { .catch((error) => {
Logger.error("Error fetching the data asset consumption url: ", error) Logger.error("Error fetching the data asset consumption url: ", error)
return null
}) })
return accessUrl return accessUrl
@ -77,7 +77,7 @@ export default class Aquarius {
public async storeDDO(ddo: DDO): Promise<DDO> { public async storeDDO(ddo: DDO): Promise<DDO> {
const fullUrl = this.url + `/api/v1/aquarius/assets/ddo` const fullUrl = this.url + `/api/v1/aquarius/assets/ddo`
const result = await AquariusConnectorProvider.getConnector() const result: DDO = await AquariusConnectorProvider.getConnector()
.post(fullUrl, DDO.serialize(ddo)) .post(fullUrl, DDO.serialize(ddo))
.then((response: any) => { .then((response: any) => {
if (response.ok) { if (response.ok) {

2
src/aquarius/AquariusConnectorProvider.ts
View File

@ -7,7 +7,7 @@ export default class AquariusConnectorProvider {
AquariusConnectorProvider.connector = connector AquariusConnectorProvider.connector = connector
} }
public static getConnector() { public static getConnector(): AquariusConnector {
if (!AquariusConnectorProvider.connector) { if (!AquariusConnectorProvider.connector) {
AquariusConnectorProvider.connector = new AquariusConnector() AquariusConnectorProvider.connector = new AquariusConnector()

3
test/mocks/AquariusConnector.mock.ts
View File

@ -16,6 +16,9 @@ export default class AquariusConnectorMock extends AquariusConnector {
json: () => { json: () => {
return this.returnData ? this.returnData : [] return this.returnData ? this.returnData : []
}, },
text: () => {
return this.returnData ? this.returnData.toString() : ""
},
}) })
}) })
} }

1
test/ocean/Ocean.test.ts
View File

@ -84,7 +84,6 @@ describe("Ocean", () => {
assert(orders.length === 1) assert(orders.length === 1)
assert(orders[0].getId() === order.getId()) assert(orders[0].getId() === order.getId())
}) })
}) })