From 42ca7a5a5d0f6bfcc777aa9f2be73335ebd2e0f7 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Mon, 4 Dec 2017 17:45:56 +0100
Subject: [PATCH] [enh] Improve ecomode unit test + fix workers
---
app/modules/prover/lib/powCluster.ts | 37 +++++++++++++---------------
test/integration/proof-of-work.js | 16 ++++++++----
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/app/modules/prover/lib/powCluster.ts b/app/modules/prover/lib/powCluster.ts
index 8e6e65843..15d8d24c3 100644
--- a/app/modules/prover/lib/powCluster.ts
+++ b/app/modules/prover/lib/powCluster.ts
@@ -185,27 +185,24 @@ export class Master {
// Start the salves' job
this.slaves.forEach((s:any, index) => {
- if(index < stuff.newPoW.conf.nbCores) {
- s.worker.send({
- uuid,
- command: 'newPoW',
- value: {
- block: stuff.newPoW.block,
- nonceBeginning: s.nonceBeginning,
- zeros: stuff.newPoW.zeros,
- highMark: stuff.newPoW.highMark,
- pair: _.clone(stuff.newPoW.pair),
- forcedTime: stuff.newPoW.forcedTime,
- turnDuration: stuff.newPoW.turnDuration,
- conf: {
- medianTimeBlocks: stuff.newPoW.conf.medianTimeBlocks,
- avgGenTime: stuff.newPoW.conf.avgGenTime,
- cpu: stuff.newPoW.conf.cpu,
- prefix: stuff.newPoW.conf.prefix
- }
+ s.worker.send({
+ uuid,
+ command: 'newPoW',
+ value: {
+ block: stuff.newPoW.block,
+ nonceBeginning: s.nonceBeginning,
+ zeros: stuff.newPoW.zeros,
+ highMark: stuff.newPoW.highMark,
+ pair: _.clone(stuff.newPoW.pair),
+ forcedTime: stuff.newPoW.forcedTime,
+ turnDuration: stuff.newPoW.turnDuration,conf: {
+ medianTimeBlocks: stuff.newPoW.conf.medianTimeBlocks,
+ avgGenTime: stuff.newPoW.conf.avgGenTime,
+ cpu: stuff.newPoW.conf.cpu,
+ prefix: stuff.newPoW.conf.prefix
}
- })
- }
+ }
+ })
})
return await this.currentPromise
diff --git a/test/integration/proof-of-work.js b/test/integration/proof-of-work.js
index dd507167a..4d61810e3 100644
--- a/test/integration/proof-of-work.js
+++ b/test/integration/proof-of-work.js
@@ -36,11 +36,10 @@ const prover = new BlockProver({
const now = 1474382274 * 1000;
const MUST_START_WITH_A_ZERO = 16;
const MUST_START_WITH_TWO_ZEROS = 32;
-const MUST_START_WITH_THREE_ZEROS = 58;
+const MUST_START_WITH_A_ZERO_AND_A_NUMBER = 22
describe("Proof-of-work", function() {
- this.timeout(6*60000)
it('should be able to find an easy PoW', () => co(function*() {
let block = yield prover.prove({
issuer: 'HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd',
@@ -53,12 +52,19 @@ describe("Proof-of-work", function() {
}));
it('should be reducing cpu when the PoW is too easy for the cpu', () => co(function*() {
+ prover.conf.nbCores = 2
+ prover.conf.cpu = 0.9
+ prover.conf.nbCores.should.equal(2)
+ prover.conf.cpu.should.equal(0.9)
for(let i=0; i<8; ++i) {
- let block = yield prover.prove({
+ yield prover.prove({
issuer: 'HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd',
- number: i+2
- }, MUST_START_WITH_THREE_ZEROS, now);
+ number: i+2,
+ now
+ }, MUST_START_WITH_A_ZERO_AND_A_NUMBER, now);
}
+ prover.conf.nbCores.should.equal(1)
+ prover.conf.cpu.should.be.below(0.9)
}));
// Too randomly successing test
// it('should be able to cancel a proof-of-work on other PoW receival', () => co(function*() {
--
GitLab