From c978338229d39cfaee5c54059e032bed4738bdb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Moreau?= <cem.moreau@gmail.com>
Date: Sun, 17 Dec 2017 16:00:12 +0100
Subject: [PATCH] [enh] Untrack some generated test files
---
.eslintignore | 2 +
.gitignore | 6 +
test/integration/branches.js | 59 --------
test/integration/branches2.js | 214 ----------------------------
test/integration/branches_switch.js | 102 -------------
5 files changed, 8 insertions(+), 375 deletions(-)
delete mode 100644 test/integration/branches.js
delete mode 100644 test/integration/branches2.js
delete mode 100644 test/integration/branches_switch.js
diff --git a/.eslintignore b/.eslintignore
index d25a2f246..052737334 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -43,5 +43,7 @@ app/modules/bma/lib/entity/*.js
app/modules/bma/lib/controllers/*.js
app/modules/crawler/*.js
app/modules/crawler/lib/*.js
+app/ProcessCpuProfiler.js
+app/lib/common/package.js
test/*.js
test/**/*.js
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 0fdf9f4d6..9b656c465 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,9 @@ test/integration/tools/TestUser.js*
test/integration/tools/TestUser.d.ts
test/integration/documents-currency.js*
test/integration/documents-currency.d.ts
+test/integration/forwarding.js
+test/integration/branches_switch.js
+test/integration/branches2.js
test/fast/modules/crawler/block_pulling.js*
test/fast/modules/crawler/block_pulling.d.ts
test/fast/fork*.js*
@@ -66,3 +69,6 @@ test/fast/modules/ws2p/*.js*
test/fast/modules/ws2p/*.d.ts
test/fast/modules/common/grammar.js*
test/fast/modules/common/grammar.d.ts
+test/fast/prover/pow-1-cluster.d.ts
+test/fast/prover/pow-1-cluster.js
+test/fast/prover/pow-1-cluster.js.map
diff --git a/test/integration/branches.js b/test/integration/branches.js
deleted file mode 100644
index dadf77a17..000000000
--- a/test/integration/branches.js
+++ /dev/null
@@ -1,59 +0,0 @@
-"use strict";
-
-const _ = require('underscore');
-const co = require('co');
-const should = require('should');
-const duniter = require('../../index');
-const bma = require('../../app/modules/bma').BmaDependency.duniter.methods.bma;
-const rp = require('request-promise');
-const httpTest = require('./tools/http');
-const shutDownEngine = require('./tools/shutDownEngine');
-
-const expectAnswer = httpTest.expectAnswer;
-
-const MEMORY_MODE = true;
-const commonConf = {
- ipv4: '127.0.0.1',
- currency: 'bb',
- httpLogs: true,
- forksize: 3,
- sigQty: 1
-};
-
-let s1
-
-describe("Branches", () => co(function*() {
-
- before(() => co(function*() {
-
- s1 = duniter(
- '/bb1',
- MEMORY_MODE,
- _.extend({
- port: '7778',
- pair: {
- pub: 'HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd',
- sec: '51w4fEShBk1jCMauWu4mLpmDVfHksKmWcygpxriqCEZizbtERA6de4STKRkQBpxmMUwsKXRjSzuQ8ECwmqN1u2DP'
- }
- }, commonConf));
-
- const server = yield s1.initWithDAL();
- const bmapi = yield bma(server);
- yield bmapi.openConnections();
- }));
-
- after(() => {
- return shutDownEngine(s1)
- })
-
- describe("Server 1 /blockchain", function() {
-
- it('should have a 3 blocks fork window size', function() {
- return expectAnswer(rp('http://127.0.0.1:7778/node/summary', { json: true }), function(res) {
- res.should.have.property('duniter').property('software').equal('duniter');
- res.should.have.property('duniter').property('version').equal('1.6.14');
- res.should.have.property('duniter').property('forkWindowSize').equal(3);
- });
- });
- });
-}));
diff --git a/test/integration/branches2.js b/test/integration/branches2.js
deleted file mode 100644
index 18d055579..000000000
--- a/test/integration/branches2.js
+++ /dev/null
@@ -1,214 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
- return new (P || (P = Promise))(function (resolve, reject) {
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
- function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
- step((generator = generator.apply(thisArg, _arguments || [])).next());
- });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const other_constants_1 = require("../../app/lib/other_constants");
-const logger_1 = require("../../app/lib/logger");
-const index_1 = require("../../app/modules/bma/index");
-const index_2 = require("../../app/modules/crawler/index");
-const toolbox_1 = require("./tools/toolbox");
-const TestUser_1 = require("./tools/TestUser");
-const co = require('co');
-const _ = require('underscore');
-const duniter = require('../../index');
-const bma = index_1.BmaDependency.duniter.methods.bma;
-const rp = require('request-promise');
-const httpTest = require('./tools/http');
-const commit = require('./tools/commit');
-const sync = require('./tools/sync');
-const shutDownEngine = require('./tools/shutDownEngine');
-const expectJSON = httpTest.expectJSON;
-const expectHttpCode = httpTest.expectHttpCode;
-if (other_constants_1.OtherConstants.MUTE_LOGS_DURING_UNIT_TESTS) {
- logger_1.NewLogger().mute();
-}
-// Trace these errors
-process.on('unhandledRejection', (reason) => {
- console.error('Unhandled rejection: ' + reason);
- console.error(reason);
-});
-const MEMORY_MODE = true;
-const commonConf = {
- ipv4: '127.0.0.1',
- currency: 'bb',
- httpLogs: true,
- forksize: 10,
- switchOnHeadAdvance: 6,
- avgGenTime: 30 * 60,
- sigQty: 1
-};
-let s1, s2, cat, toc;
-const now = Math.round(new Date().getTime() / 1000);
-describe("SelfFork", function () {
- before(() => co(function* () {
- s1 = duniter('/bb4', MEMORY_MODE, _.extend({
- port: '7781',
- pair: {
- pub: 'HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd',
- sec: '51w4fEShBk1jCMauWu4mLpmDVfHksKmWcygpxriqCEZizbtERA6de4STKRkQBpxmMUwsKXRjSzuQ8ECwmqN1u2DP'
- }
- }, commonConf));
- s2 = duniter('/bb5', MEMORY_MODE, _.extend({
- port: '7782',
- pair: {
- pub: 'DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo',
- sec: '64EYRvdPpTfLGGmaX5nijLXRqWXaVz8r1Z1GtaahXwVSJGQRn7tqkxLb288zwSYzELMEG5ZhXSBYSxsTsz1m9y8F'
- }
- }, commonConf));
- cat = new TestUser_1.TestUser('cat', { pub: 'HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd', sec: '51w4fEShBk1jCMauWu4mLpmDVfHksKmWcygpxriqCEZizbtERA6de4STKRkQBpxmMUwsKXRjSzuQ8ECwmqN1u2DP' }, { server: s1 });
- toc = new TestUser_1.TestUser('toc', { pub: 'DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo', sec: '64EYRvdPpTfLGGmaX5nijLXRqWXaVz8r1Z1GtaahXwVSJGQRn7tqkxLb288zwSYzELMEG5ZhXSBYSxsTsz1m9y8F' }, { server: s1 });
- const commitS1 = commit(s1);
- const commitS2 = commit(s2, {
- time: now + 37180
- });
- yield s1.initWithDAL().then(bma).then((bmapi) => bmapi.openConnections());
- yield s2.initWithDAL().then(bma).then((bmapi) => bmapi.openConnections());
- s1.addEndpointsDefinitions(() => index_1.BmaDependency.duniter.methods.getMainEndpoint(s1.conf));
- s2.addEndpointsDefinitions(() => index_1.BmaDependency.duniter.methods.getMainEndpoint(s2.conf));
- // Server 1
- yield cat.createIdentity();
- yield toc.createIdentity();
- yield toc.cert(cat);
- yield cat.cert(toc);
- yield cat.join();
- yield toc.join();
- yield commitS1({
- time: now
- });
- yield commitS1();
- yield commitS1();
- yield commitS1();
- // Server 2
- yield sync(0, 2, s1, s2);
- yield toolbox_1.waitToHaveBlock(s2, 2);
- let s2p = yield s2.PeeringService.peer();
- yield commitS2();
- yield commitS2();
- yield commitS2();
- yield commitS2();
- yield commitS2();
- yield commitS2();
- yield commitS2();
- yield s1.writePeer(s2p);
- // Forking S1 from S2
- yield Promise.all([
- toolbox_1.waitForkResolution(s1, 9),
- index_2.CrawlerDependency.duniter.methods.pullBlocks(s1, s2p.pubkey)
- ]);
- }));
- after(() => {
- return Promise.all([
- shutDownEngine(s1),
- shutDownEngine(s2)
- ]);
- });
- describe("Server 1 /blockchain", function () {
- it('/block/0 should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7781/blockchain/block/0', { json: true }), {
- number: 0,
- issuersCount: 0,
- issuersFrame: 1,
- issuersFrameVar: 0
- });
- });
- it('/block/1 should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7781/blockchain/block/1', { json: true }), {
- number: 1,
- issuersCount: 1,
- issuersFrame: 1,
- issuersFrameVar: 5
- });
- });
- it('/block/2 should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7781/blockchain/block/2', { json: true }), {
- number: 2,
- issuersCount: 1,
- issuersFrame: 2,
- issuersFrameVar: 4
- });
- });
- it('/block/3 should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7781/blockchain/block/3', { json: true }), {
- number: 3,
- issuersCount: 1,
- issuersFrame: 3,
- issuersFrameVar: 3
- });
- });
- it('/block/4 should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7781/blockchain/block/4', { json: true }), {
- number: 4,
- issuersCount: 2,
- issuersFrame: 4,
- issuersFrameVar: 7
- });
- });
- it('/block/5 should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7781/blockchain/block/5', { json: true }), {
- number: 5,
- issuersCount: 2,
- issuersFrame: 5,
- issuersFrameVar: 6
- });
- });
- it('/block/6 should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7781/blockchain/block/6', { json: true }), {
- number: 6,
- issuersCount: 2,
- issuersFrame: 6,
- issuersFrameVar: 5
- });
- });
- it('/block/7 should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7781/blockchain/block/7', { json: true }), {
- number: 7,
- issuersCount: 2,
- issuersFrame: 7,
- issuersFrameVar: 4
- });
- });
- it('/block/88 should not exist', function () {
- return expectHttpCode(404, rp('http://127.0.0.1:7781/blockchain/block/88'));
- });
- it('/current should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7781/blockchain/current', { json: true }), {
- number: 9
- });
- });
- it('should have 2 branch', () => __awaiter(this, void 0, void 0, function* () {
- const branches = yield s1.BlockchainService.branches();
- branches.should.have.length(1);
- }));
- });
- describe("Server 2 /blockchain", function () {
- it('/block/0 should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7782/blockchain/block/0', { json: true }), {
- number: 0
- });
- });
- it('/block/1 should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7782/blockchain/block/1', { json: true }), {
- number: 1
- });
- });
- it('/block/88 should not exist', function () {
- return expectHttpCode(404, rp('http://127.0.0.1:7782/blockchain/block/88'));
- });
- it('/current should exist', function () {
- return expectJSON(rp('http://127.0.0.1:7782/blockchain/current', { json: true }), {
- number: 9
- });
- });
- it('should have 1 branch', () => co(function* () {
- const branches = yield s2.BlockchainService.branches();
- branches.should.have.length(1);
- }));
- });
-});
-//# sourceMappingURL=branches2.js.map
\ No newline at end of file
diff --git a/test/integration/branches_switch.js b/test/integration/branches_switch.js
deleted file mode 100644
index d3c7eb1aa..000000000
--- a/test/integration/branches_switch.js
+++ /dev/null
@@ -1,102 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../../app/modules/crawler/index");
-const index_2 = require("../../app/modules/bma/index");
-const co = require('co');
-const _ = require('underscore');
-const duniter = require('../../index');
-const bma = require('../../app/modules/bma').BmaDependency.duniter.methods.bma;
-const TestUser = require('./tools/TestUser').TestUser;
-const rp = require('request-promise');
-const httpTest = require('./tools/http');
-const commit = require('./tools/commit');
-const sync = require('./tools/sync');
-const cluster = require('cluster');
-const shutDownEngine = require('./tools/shutDownEngine');
-const expectJSON = httpTest.expectJSON;
-const MEMORY_MODE = true;
-const commonConf = {
- ipv4: '127.0.0.1',
- currency: 'bb',
- httpLogs: true,
- forksize: 30,
- avgGenTime: 1,
- sigQty: 1
-};
-let s1, s2, cat, toc;
-describe("Switch", function () {
- before(() => co(function* () {
- cluster.setMaxListeners(6);
- s1 = duniter('/bb11', MEMORY_MODE, _.extend({
- switchOnHeadAdvance: 0,
- port: '7788',
- pair: {
- pub: 'HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd',
- sec: '51w4fEShBk1jCMauWu4mLpmDVfHksKmWcygpxriqCEZizbtERA6de4STKRkQBpxmMUwsKXRjSzuQ8ECwmqN1u2DP'
- },
- rootoffset: 10,
- sigQty: 1, dt: 1, ud0: 120
- }, commonConf));
- s2 = duniter('/bb12', MEMORY_MODE, _.extend({
- switchOnHeadAdvance: 0,
- port: '7789',
- pair: {
- pub: 'DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo',
- sec: '64EYRvdPpTfLGGmaX5nijLXRqWXaVz8r1Z1GtaahXwVSJGQRn7tqkxLb288zwSYzELMEG5ZhXSBYSxsTsz1m9y8F'
- }
- }, commonConf));
- cat = new TestUser('cat', { pub: 'HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd', sec: '51w4fEShBk1jCMauWu4mLpmDVfHksKmWcygpxriqCEZizbtERA6de4STKRkQBpxmMUwsKXRjSzuQ8ECwmqN1u2DP' }, { server: s1 });
- toc = new TestUser('toc', { pub: 'DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo', sec: '64EYRvdPpTfLGGmaX5nijLXRqWXaVz8r1Z1GtaahXwVSJGQRn7tqkxLb288zwSYzELMEG5ZhXSBYSxsTsz1m9y8F' }, { server: s1 });
- yield s1.initWithDAL().then(bma).then((bmapi) => bmapi.openConnections());
- yield s2.initWithDAL().then(bma).then((bmapi) => bmapi.openConnections());
- s1.addEndpointsDefinitions(() => index_2.BmaDependency.duniter.methods.getMainEndpoint(s1.conf));
- s2.addEndpointsDefinitions(() => index_2.BmaDependency.duniter.methods.getMainEndpoint(s2.conf));
- yield cat.createIdentity();
- yield toc.createIdentity();
- yield toc.cert(cat);
- yield cat.cert(toc);
- yield cat.join();
- yield toc.join();
- yield commit(s1)();
- yield commit(s1)();
- yield commit(s1)();
- yield sync(0, 2, s1, s2);
- let s2p = yield s2.PeeringService.peer();
- yield commit(s1)();
- yield commit(s1)();
- yield commit(s2)();
- yield commit(s2)();
- yield commit(s2)();
- yield commit(s2)();
- yield commit(s2)();
- yield commit(s2)();
- yield commit(s2)();
- // So we now have:
- // S1 01234
- // S2 `3456789
- yield s1.writePeer(s2p);
- // Forking S1 from S2
- yield index_1.CrawlerDependency.duniter.methods.pullBlocks(s1, s2p.pubkey);
- // S1 should have switched to the other branch
- }));
- after(() => {
- cluster.setMaxListeners(3);
- return Promise.all([
- shutDownEngine(s1),
- shutDownEngine(s2)
- ]);
- });
- describe("Server 1 /blockchain", function () {
- it('/block/8 should exist on S1', function () {
- return expectJSON(rp('http://127.0.0.1:7788/blockchain/block/8', { json: true }), {
- number: 8
- });
- });
- it('/block/8 should exist on S2', function () {
- return expectJSON(rp('http://127.0.0.1:7789/blockchain/block/8', { json: true }), {
- number: 8
- });
- });
- });
-});
-//# sourceMappingURL=branches_switch.js.map
\ No newline at end of file
--
GitLab