From 8dafbbe6914015f58c806bfd19e4b04546d2e79a Mon Sep 17 00:00:00 2001 From: cgeek <cem.moreau@gmail.com> Date: Wed, 8 Mar 2017 16:38:48 +0100 Subject: [PATCH] Changing G1 Test to reflect the actual launching --- test/integration/v1.0-g1-dividend.js | 59 ++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/test/integration/v1.0-g1-dividend.js b/test/integration/v1.0-g1-dividend.js index b32b9bd6f..9fe62f35f 100644 --- a/test/integration/v1.0-g1-dividend.js +++ b/test/integration/v1.0-g1-dividend.js @@ -6,14 +6,15 @@ const bma = require('duniter-bma').duniter.methods.bma; const constants = require('../../app/lib/constants'); const toolbox = require('./tools/toolbox'); -const start = 1489057200; // 2016-03-09 12:00:00 UTC+0 +const start = 1488985390; // 2016-03-08 16:03:10 UTC+0 +const delayToUD = 1489057200 - start; // Delay to 2016-03-09 12:00:00 UTC+0 const aDay = 3600 * 24; const _6months = 15778800; const conf = { ud0: 1000, - udTime0: 1489143600, // 2016-03-10 12:00:00 UTC+0 + udTime0: 1488970800, // 2016-03-08 12:00:00 UTC+0 udReevalTime0: 1490094000, // 2016-03-21 12:00:00 UTC+0 ==> first recomputed UD (equinox) c: .0488, // 4.88 % dt: aDay, @@ -41,52 +42,78 @@ describe("Protocol 1.0 Äž1 Dividend", function() { s1 = res1.s1; cat = res1.cat; // HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd tac = res1.tac; // 2LvDg21dVXvetTD9GdkPLURavLYEqP3whauvPWX4c2qc - for (let i = 0; i < 15; i++) { - yield s1.commit({ time: start + aDay * i }); + yield s1.commit({ time: start }); + yield s1.commit({ time: start + 1 }); + yield s1.commit({ time: start + delayToUD }); + for (let i = 1; i < 15; i++) { + yield s1.commit({ time: (start + delayToUD) + aDay * i }); } })); it('should have block#0 has no UD', () => s1.expectThat('/blockchain/block/0', (json) => { should.not.exist(json.dividend); - json.should.have.property('medianTime').equal(start); // 2016-03-09 12:00:00 UTC+0 + json.should.have.property('medianTime').equal(start); // 2016-03-08 16:03:10 UTC+0 })); it('should have block#1 has no UD', () => s1.expectThat('/blockchain/block/1', (json) => { - should.not.exist(json.dividend); - json.should.have.property('medianTime').equal(start); // 2016-03-09 12:00:00 UTC+0 + json.dividend.should.equal(1000); + json.should.have.property('medianTime').equal(start); // 2016-03-08 16:03:10 UTC+0 })); it('should have block#2 with UD 1000', () => s1.expectThat('/blockchain/block/2', (json) => { - json.dividend.should.equal(1000); - json.should.have.property('medianTime').equal(start + aDay); // 2016-03-10 12:00:00 UTC+0 + should.not.exist(json.dividend); + json.should.have.property('medianTime').equal(start + 1); // 2016-03-08 16:03:11 UTC+0 })); it('should have block#3 with UD 1000', () => s1.expectThat('/blockchain/block/3', (json) => { json.dividend.should.equal(1000); - json.should.have.property('medianTime').equal(start + aDay * 2); // 2016-03-11 12:00:00 UTC+0 + json.should.have.property('medianTime').equal(start + delayToUD); // 2016-03-09 12:00:00 UTC+0 })); it('should have block#4 with UD 1000', () => s1.expectThat('/blockchain/block/4', (json) => { json.dividend.should.equal(1000); + json.should.have.property('medianTime').equal((start + delayToUD) + aDay); // 2016-03-10 12:00:00 UTC+0 })); + it('should have block#4 with UD 1000', () => s1.expectThat('/blockchain/block/5', (json) => { + json.dividend.should.equal(1000); + json.should.have.property('medianTime').equal((start + delayToUD) + aDay * 2); // 2016-03-11 12:00:00 UTC+0 + })); + + it('should have block#4 with UD 1000', () => s1.expectThat('/blockchain/block/6', (json) => { + json.dividend.should.equal(1000); + json.should.have.property('medianTime').equal((start + delayToUD) + aDay * 3); // 2016-03-12 12:00:00 UTC+0 + })); + + // ... skip some blocks ... + it('should have block#11 with UD 1000', () => s1.expectThat('/blockchain/block/11', (json) => { json.dividend.should.equal(1000); - json.should.have.property('medianTime').equal(start + aDay * 10); // 2016-03-19 12:00:00 UTC+0 + json.should.have.property('medianTime').equal((start + delayToUD) + aDay * 8); // 2016-03-17 12:00:00 UTC+0 })); it('should have block#12 with UD 1000', () => s1.expectThat('/blockchain/block/12', (json) => { json.dividend.should.equal(1000); - json.should.have.property('medianTime').equal(start + aDay * 11); // 2016-03-20 12:00:00 UTC+0 + json.should.have.property('medianTime').equal((start + delayToUD) + aDay * 9); // 2016-03-18 12:00:00 UTC+0 + })); + + it('should have block#13 with UD 1000', () => s1.expectThat('/blockchain/block/13', (json) => { + json.dividend.should.equal(1000); + json.should.have.property('medianTime').equal((start + delayToUD) + aDay * 10); // 2016-03-19 12:00:00 UTC+0 + })); + + it('should have block#14 with UD 1000', () => s1.expectThat('/blockchain/block/14', (json) => { + json.dividend.should.equal(1000); + json.should.have.property('medianTime').equal((start + delayToUD) + aDay * 11); // 2016-03-20 12:00:00 UTC+0 })); - it('should have block#13 with UD 1001', () => s1.expectThat('/blockchain/block/13', (json) => { + it('should have block#14 with UD 1001', () => s1.expectThat('/blockchain/block/15', (json) => { json.dividend.should.equal(1001); - json.should.have.property('medianTime').equal(start + aDay * 12); // 2016-03-21 12:00:00 UTC+0 + json.should.have.property('medianTime').equal((start + delayToUD) + aDay * 12); // 2016-03-21 12:00:00 UTC+0 })); - it('should have block#14 with UD 1001', () => s1.expectThat('/blockchain/block/14', (json) => { + it('should have block#14 with UD 1001', () => s1.expectThat('/blockchain/block/16', (json) => { json.dividend.should.equal(1001); - json.should.have.property('medianTime').equal(start + aDay * 13); // 2016-03-22 12:00:00 UTC+0 + json.should.have.property('medianTime').equal((start + delayToUD) + aDay * 13); // 2016-03-22 12:00:00 UTC+0 })); }); -- GitLab