From 7944573df2681b676f4455202f6bad224e964c6b Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Mon, 2 Sep 2019 13:53:44 +0200 Subject: [PATCH 1/8] Upload subgraph manifest to both thegraph.com IPFS nodes --- ops/graph-deploy.js | 60 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/ops/graph-deploy.js b/ops/graph-deploy.js index 4235e58d..de968750 100644 --- a/ops/graph-deploy.js +++ b/ops/graph-deploy.js @@ -3,6 +3,16 @@ const { runGraphCli, subgraphLocation: defaultSubgraphLocation} = require('./gra const { graphNode, ipfsNode, subgraphName: defaultSubgraphName } = require('./settings') const cwd = path.resolve(`${__dirname}/..`) +function extractSubgraphId(output) { + return output + .trim() + .split('\n') + .reverse() + .find(line => line.match(/(Build completed|Subgraph): Qm/)) + .split(':') + .slice(-1)[0] + .trim() +} async function deploy (opts = {}) { if (!opts.subgraphLocation) { @@ -33,21 +43,53 @@ async function deploy (opts = {}) { } } - result = await runGraphCli([ - 'deploy', - '--access-token "${access_token-""}"', - '--ipfs ' + ipfsNode, - '--node ' + graphNode, - opts.subgraphName, - opts.subgraphLocation - ], cwd) + /* upload subgraph files to the other IPFS node */ + let builtSubgraphId + if (graphNode.match(/thegraph\.com/)) { + let otherIpfsNode = ipfsNode.match(/staging/) + ? 'https://api.thegraph.com/ipfs/' + : 'https://api.staging.thegraph.com/ipfs/' + result = await runGraphCli(['build', '--ipfs', otherIpfsNode, opts.subgraphLocation]) + msg = result[1] + result[2] + if (result[0] === 1 || result[0] === 127) { + throw Error(`Failed to upload subgraph files to ${otherIpfsNode}: ${msg}`) + } + + builtSubgraphId = extractSubgraphId(result[1]) + console.log(`Uploaded subgraph: ${builtSubgraphId}`) + } + + result = await runGraphCli( + [ + 'deploy', + '--access-token "${access_token-""}"', + '--ipfs ' + ipfsNode, + '--node ' + graphNode, + opts.subgraphName, + opts.subgraphLocation, + ], + cwd + ) msg = result[1] + result[2] - if ((result[0] === 1)|| (result[0] === 127)){ + if (result[0] === 1 || result[0] === 127) { throw Error(`Deployment failed! ${msg}`) } if (msg.toLowerCase().indexOf('error') > 0) { throw Error(`Deployment failed! ${msg}`) } + + if (graphNode.match(/thegraph\.com/)) { + let deployedSubgraphId = extractSubgraphId(result[1]) + console.log(`Deployed subgraph: ${deployedSubgraphId}`) + + if (builtSubgraphId !== deployedSubgraphId) { + console.error( + `Subgraph ID mismatch between 'build' and 'deploy':`, + `${builtSubgraphId} !== ${deployedSubgraphId}` + ) + } + } + return result } From 22d5144005eca560abae2d556ac62baad7b64162 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Wed, 4 Sep 2019 11:45:33 +0200 Subject: [PATCH 2/8] Update graph-cli and graph-ts to 0.15.0 --- package-lock.json | 115 ++++++++++++++++++++++++++++++++++++---------- package.json | 4 +- 2 files changed, 92 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f3a12cf..d26bdc19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -243,9 +243,9 @@ } }, "@graphprotocol/graph-cli": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@graphprotocol/graph-cli/-/graph-cli-0.14.0.tgz", - "integrity": "sha512-xW0A0ZVdF8r9IjpIgfg3sAgJ+neMRSRuKd9hmvFdgepuAYJTMNdFppJhHjuqe0y/krg0dw21jhC7/+mlC7X4lQ==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@graphprotocol/graph-cli/-/graph-cli-0.15.0.tgz", + "integrity": "sha512-7wfHRDDxKbOrcp9c71dxqDIYviKPyDvApD1oC51fOWLsm6aFe9mFmZDfF3jp+hIeYvSX6dBwakNAphsX9cc1jA==", "requires": { "assemblyscript": "git+https://github.com/AssemblyScript/assemblyscript.git#36040d5b5312f19a025782b5e36663823494c2f3", "chalk": "^2.4.1", @@ -256,7 +256,7 @@ "gluegun": "^3.0.0", "graphql": "^14.0.2", "immutable": "^3.8.2", - "ipfs-http-client": "^33.1.0", + "ipfs-http-client": "^34.0.0", "jayson": "^3.0.2", "js-yaml": "^3.13.1", "keytar": "^4.6.0", @@ -267,22 +267,38 @@ "yaml": "^1.5.1" }, "dependencies": { + "buffer": { + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.2.tgz", + "integrity": "sha512-iy9koArjAFCzGnx3ZvNA6Z0clIbbFgbdWQ0mKD3hO0krOrZh8UgA6qMKcZvwLJxS+D6iVR76+5/pV56yMNYTag==", + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, + "err-code": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.0.tgz", + "integrity": "sha512-MsMOijQ4v0xlmrz1fc7lyPEy7jFhoNF7EVaRSP7mPzs20LaFOwG6qNjGRy3Ie85n9DARlcUnB1zbsBv5sJrIvw==" + }, "ipfs-http-client": { - "version": "33.1.1", - "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-33.1.1.tgz", - "integrity": "sha512-iwtLL3lOIzxXJFwLnOEtFUv1cYTuWJ0NauD7rpMEd/y4C7z6fuN6TSF4h547lxMh7sJWv+6Z0PmOA5N8FzUHJw==", + "version": "34.0.0", + "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-34.0.0.tgz", + "integrity": "sha512-4RCkk8ix4Dqn6sxqFVwuXWCZ1eLFPsVaj6Ijvu1fs9VYgxgVudsW9PWwarlr4mw1xUCmPWYyXnEbGgzBrfMy0Q==", "requires": { + "abort-controller": "^3.0.0", "async": "^2.6.1", "bignumber.js": "^9.0.0", "bl": "^3.0.0", "bs58": "^4.0.1", - "buffer": "^5.2.1", + "buffer": "^5.4.2", "cids": "~0.7.1", "concat-stream": "github:hugomrdias/concat-stream#feat/smaller", "debug": "^4.1.0", "detect-node": "^2.0.4", "end-of-stream": "^1.4.1", - "err-code": "^1.1.2", + "err-code": "^2.0.0", + "explain-error": "^1.0.4", "flatmap": "0.0.3", "glob": "^7.1.3", "ipfs-block": "~0.8.1", @@ -295,9 +311,12 @@ "is-stream": "^2.0.0", "iso-stream-http": "~0.1.2", "iso-url": "~0.4.6", + "iterable-ndjson": "^1.1.0", "just-kebab-case": "^1.1.0", "just-map-keys": "^1.1.0", "kind-of": "^6.0.2", + "ky": "^0.11.2", + "ky-universal": "^0.2.2", "lru-cache": "^5.1.1", "multiaddr": "^6.0.6", "multibase": "~0.6.0", @@ -305,8 +324,9 @@ "multihashes": "~0.4.14", "ndjson": "github:hugomrdias/ndjson#feat/readable-stream3", "once": "^1.4.0", - "peer-id": "~0.12.2", + "peer-id": "~0.12.3", "peer-info": "~0.15.1", + "promise-nodeify": "^3.0.1", "promisify-es6": "^1.0.3", "pull-defer": "~0.2.3", "pull-stream": "^3.6.9", @@ -327,9 +347,9 @@ } }, "@graphprotocol/graph-ts": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@graphprotocol/graph-ts/-/graph-ts-0.14.0.tgz", - "integrity": "sha512-PPokgf5/VaZz74+5y3aprPpSNncC4beinw6U1ZyOac8dsd5dVdgKD3oru9Jf1ihTU39bE4oDyKRxqlso2F2dEg==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@graphprotocol/graph-ts/-/graph-ts-0.15.0.tgz", + "integrity": "sha512-rYrIUDNGdQTxU+UogI5OhjP73LL8B9jwB29jysztaaSRqJumf8DEmftG0K42+7CvWtYfpiZNKpGpKt/xUR80NQ==", "requires": { "assemblyscript": "git+https://github.com/AssemblyScript/assemblyscript.git#36040d5b5312f19a025782b5e36663823494c2f3" } @@ -649,6 +669,14 @@ "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz", "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==" }, + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "requires": { + "event-target-shim": "^5.0.0" + } + }, "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -975,18 +1003,18 @@ "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" }, "anymatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz", - "integrity": "sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz", + "integrity": "sha512-Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA==", "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, "apisauce": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/apisauce/-/apisauce-1.0.5.tgz", - "integrity": "sha512-iXqkqCph/yp1AmmGm/SBN2lWAhX8F++etLBb40MLM+cb/2gF490bVhb7kl6wmM6VoSSDsirLalOziITVBMXdnA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/apisauce/-/apisauce-1.1.0.tgz", + "integrity": "sha512-pCBCF9GgO5J4uMgrW7nxM07WCa+h52jXxyXttPNHfBjEzSciMV33M1GDx9AXmX+iA8MefJ6s8KnZpMZpXf9x+Q==", "requires": { "axios": "^0.19.0", "ramda": "^0.25.0" @@ -2798,9 +2826,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "ejs": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.2.tgz", - "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==" + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz", + "integrity": "sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==" }, "elliptic": { "version": "6.5.0", @@ -3594,6 +3622,11 @@ "strip-hex-prefix": "1.0.0" } }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" + }, "eventemitter3": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", @@ -3696,6 +3729,11 @@ "jest-regex-util": "^24.9.0" } }, + "explain-error": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/explain-error/-/explain-error-1.0.4.tgz", + "integrity": "sha1-p5PTrAytTGq1cemWj7urbLJTKSk=" + }, "express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", @@ -4628,9 +4666,9 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "gluegun": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/gluegun/-/gluegun-3.3.3.tgz", - "integrity": "sha512-1Iq8Mjh58MxhArMqmfsoO9thgK8tiDLDMQCnCS8LTNg176bTOAqRn3PIxW+wh9Z6KtofVXbyKI5COzDAFtzuzw==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/gluegun/-/gluegun-3.3.4.tgz", + "integrity": "sha512-XapJyKEE/Iqn1CYeWxLklGicZ8mM9k0Bdvj2JdYuy6hcCZ9nkDqxAbO5ZvzhPl+naX9K96S40y/XTVHabZ+ZSA==", "requires": { "apisauce": "^1.0.1", "app-module-path": "^2.2.0", @@ -5915,6 +5953,14 @@ "is-object": "^1.0.1" } }, + "iterable-ndjson": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/iterable-ndjson/-/iterable-ndjson-1.1.0.tgz", + "integrity": "sha512-OOp1Lb0o3k5MkXHx1YaIY5Z0ELosZfTnBaas9f8opJVcZGBIONA2zY/6CYE+LKkqrSDooIneZbrBGgOZnHPkrg==", + "requires": { + "string_decoder": "^1.2.0" + } + }, "iterall": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz", @@ -7128,6 +7174,20 @@ "colornames": "^1.1.1" } }, + "ky": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/ky/-/ky-0.11.2.tgz", + "integrity": "sha512-5Aou5BWue5/mkPqIRqzSWW+0Hkl403pr/2AIrCKYw7cVl/Xoe8Xe4KLBO0PRjbz7GnRe1/8wW1KhqQNFFE7/GQ==" + }, + "ky-universal": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/ky-universal/-/ky-universal-0.2.2.tgz", + "integrity": "sha512-fb32o/fKy/ux2ALWa9HU2hvGtfOq7/vn2nH0FpVE+jwNzyTeORlAbj3Fiw+WLMbUlmVqZIWupnLZ2USHvqwZHw==", + "requires": { + "abort-controller": "^3.0.0", + "node-fetch": "^2.3.0" + } + }, "lazy-cache": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", @@ -8727,6 +8787,11 @@ "is-promise": "~1" } }, + "promise-nodeify": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/promise-nodeify/-/promise-nodeify-3.0.1.tgz", + "integrity": "sha512-ghsSuzZXJX8iO7WVec2z7GI+Xk/EyiD+JZK7AZKhUqYfpLa/Zs4ylUD+CwwnKlG6G3HnkUPMAi6PO7zeqGKssg==" + }, "promisify-es6": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/promisify-es6/-/promisify-es6-1.0.3.tgz", diff --git a/package.json b/package.json index e7df1e52..b8661b72 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,8 @@ "watch": "^1.0.2" }, "dependencies": { - "@graphprotocol/graph-cli": "^0.14.0", - "@graphprotocol/graph-ts": "^0.14.0", + "@graphprotocol/graph-cli": "^0.15.0", + "@graphprotocol/graph-ts": "^0.15.0", "@types/node": "^10.14.4", "apollo-client": "^2.4.5", "apollo-link-ws": "^1.0.9", From c9412bda95e00770665c1822ce2d9834d81fc2f5 Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 4 Sep 2019 15:19:03 +0300 Subject: [PATCH 3/8] Use graph node 0.15.1 --- docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 79d40fac..d2ca09af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,7 @@ version: '3' services: graph-node: - image: >- - graphprotocol/graph-node@sha256:688f00bd12d619c3cc8c8c0b11aee47d61b5f5e36d62ad002e5ce1e7f3c116f2 + image: 'graphprotocol/graph-node:v0.15.1' ports: - '8000:8000' - '8001:8001' From 8ca72270c876e1a996963fc3d1c735b498ef76b2 Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 4 Sep 2019 15:35:38 +0300 Subject: [PATCH 4/8] Check sleep --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9e1e8d9f..5210f337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ script: - docker-compose exec graph-node graph-node --version # - docker-compose logs graph-node - echo -en 'travis_fold:end:script.2\\r' + - sleep 120 - npm run lint - npm run jest From 97c421a9752f1fb17a51e82ad1105945f135bd90 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 5 Sep 2019 10:21:29 +0300 Subject: [PATCH 5/8] Fix tests --- .travis.yml | 1 - test/0.0.1-rc.16/domain.spec.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5210f337..9e1e8d9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,6 @@ script: - docker-compose exec graph-node graph-node --version # - docker-compose logs graph-node - echo -en 'travis_fold:end:script.2\\r' - - sleep 120 - npm run lint - npm run jest diff --git a/test/0.0.1-rc.16/domain.spec.ts b/test/0.0.1-rc.16/domain.spec.ts index 4178de62..55e37183 100644 --- a/test/0.0.1-rc.16/domain.spec.ts +++ b/test/0.0.1-rc.16/domain.spec.ts @@ -1152,5 +1152,5 @@ describe('Domain Layer', () => { await genesisProtocol.methods.execute(p2).send(); expect((await sendQuery(getExpiredProposal)).proposal.accountsWithUnclaimedRewards) .toEqual([]); - }, 100000); + }, 200000); }); From 75b03482f43ab7787b0737255465c29a287efab5 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 5 Sep 2019 10:35:57 +0300 Subject: [PATCH 6/8] FIx test --- test/0.0.1-rc.16/domain.spec.ts | 2 +- test/0.0.1-rc.19/domain.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/0.0.1-rc.16/domain.spec.ts b/test/0.0.1-rc.16/domain.spec.ts index 55e37183..460123b0 100644 --- a/test/0.0.1-rc.16/domain.spec.ts +++ b/test/0.0.1-rc.16/domain.spec.ts @@ -1152,5 +1152,5 @@ describe('Domain Layer', () => { await genesisProtocol.methods.execute(p2).send(); expect((await sendQuery(getExpiredProposal)).proposal.accountsWithUnclaimedRewards) .toEqual([]); - }, 200000); + }, 2000000); }); diff --git a/test/0.0.1-rc.19/domain.spec.ts b/test/0.0.1-rc.19/domain.spec.ts index 96e48f52..e1829b5e 100644 --- a/test/0.0.1-rc.19/domain.spec.ts +++ b/test/0.0.1-rc.19/domain.spec.ts @@ -1151,5 +1151,5 @@ describe('Domain Layer', () => { await genesisProtocol.methods.execute(p2).send(); expect((await sendQuery(getExpiredProposal)).proposal.accountsWithUnclaimedRewards) .toEqual([]); - }, 100000); + }, 2000000); }); From 97b20ab50c68c2a6b8eb3cd9ac0babfde28ea4f4 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 5 Sep 2019 10:37:23 +0300 Subject: [PATCH 7/8] Fix --- test/0.0.1-rc.16/domain.spec.ts | 2 +- test/0.0.1-rc.19/domain.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/0.0.1-rc.16/domain.spec.ts b/test/0.0.1-rc.16/domain.spec.ts index 460123b0..33eeeccd 100644 --- a/test/0.0.1-rc.16/domain.spec.ts +++ b/test/0.0.1-rc.16/domain.spec.ts @@ -117,7 +117,7 @@ describe('Domain Layer', () => { register = (await sendQuery(getRegister, 2000)).dao.register; expect(register).toEqual('unRegistered'); - }, 120000); + }, 2000000); it('Sanity', async () => { const accounts = web3.eth.accounts.wallet; diff --git a/test/0.0.1-rc.19/domain.spec.ts b/test/0.0.1-rc.19/domain.spec.ts index e1829b5e..83e2cb73 100644 --- a/test/0.0.1-rc.19/domain.spec.ts +++ b/test/0.0.1-rc.19/domain.spec.ts @@ -115,7 +115,7 @@ describe('Domain Layer', () => { register = (await sendQuery(getRegister, 2000)).dao.register; expect(register).toEqual('unRegistered'); - }, 120000); + }, 2000000); it('Sanity', async () => { const accounts = web3.eth.accounts.wallet; From 0a63ea7e0ec010c53671af7e312e35b4c275c092 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 5 Sep 2019 12:11:00 +0300 Subject: [PATCH 8/8] Fix --- .travis.yml | 1 + test/0.0.1-rc.16/domain.spec.ts | 4 ++-- test/0.0.1-rc.19/domain.spec.ts | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e1e8d9f..5210f337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ script: - docker-compose exec graph-node graph-node --version # - docker-compose logs graph-node - echo -en 'travis_fold:end:script.2\\r' + - sleep 120 - npm run lint - npm run jest diff --git a/test/0.0.1-rc.16/domain.spec.ts b/test/0.0.1-rc.16/domain.spec.ts index 33eeeccd..4178de62 100644 --- a/test/0.0.1-rc.16/domain.spec.ts +++ b/test/0.0.1-rc.16/domain.spec.ts @@ -117,7 +117,7 @@ describe('Domain Layer', () => { register = (await sendQuery(getRegister, 2000)).dao.register; expect(register).toEqual('unRegistered'); - }, 2000000); + }, 120000); it('Sanity', async () => { const accounts = web3.eth.accounts.wallet; @@ -1152,5 +1152,5 @@ describe('Domain Layer', () => { await genesisProtocol.methods.execute(p2).send(); expect((await sendQuery(getExpiredProposal)).proposal.accountsWithUnclaimedRewards) .toEqual([]); - }, 2000000); + }, 100000); }); diff --git a/test/0.0.1-rc.19/domain.spec.ts b/test/0.0.1-rc.19/domain.spec.ts index 83e2cb73..96e48f52 100644 --- a/test/0.0.1-rc.19/domain.spec.ts +++ b/test/0.0.1-rc.19/domain.spec.ts @@ -115,7 +115,7 @@ describe('Domain Layer', () => { register = (await sendQuery(getRegister, 2000)).dao.register; expect(register).toEqual('unRegistered'); - }, 2000000); + }, 120000); it('Sanity', async () => { const accounts = web3.eth.accounts.wallet; @@ -1151,5 +1151,5 @@ describe('Domain Layer', () => { await genesisProtocol.methods.execute(p2).send(); expect((await sendQuery(getExpiredProposal)).proposal.accountsWithUnclaimedRewards) .toEqual([]); - }, 2000000); + }, 100000); });