From 0b3f4e3f5aa304fdc2ec8791be6fed0454d11bf0 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Sun, 28 Jan 2018 11:17:06 +0100
Subject: [PATCH] Revert "[fix] #1256force sync for cancelWork job"
This reverts commit 9871890e84a03a3e2ab003dc1874564ce02f9bad.
---
app/modules/prover/lib/blockProver.ts | 8 ++++----
app/modules/prover/lib/engine.ts | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/modules/prover/lib/blockProver.ts b/app/modules/prover/lib/blockProver.ts
index 87a666758..32d5699ec 100644
--- a/app/modules/prover/lib/blockProver.ts
+++ b/app/modules/prover/lib/blockProver.ts
@@ -67,8 +67,8 @@ export class WorkerFarm {
/**
* Eventually stops the engine PoW if one was computing
*/
- async stopPoW() {
- this.stopPromise = querablep(Promise.resolve(this.theEngine.cancel()))
+ stopPoW() {
+ this.stopPromise = querablep(this.theEngine.cancel())
return this.stopPromise;
}
@@ -133,10 +133,10 @@ export class BlockProver {
if (this.workerFarmPromise) {
let farm = await this.getWorker();
if (farm.isComputing() && !farm.isStopping()) {
- Promise.resolve(farm.stopPoW())
+ await farm.stopPoW()
} else {
// We force the stop anyway, just to be sure
- Promise.resolve(farm.stopPoW())
+ await farm.stopPoW()
}
if (this.waitResolve) {
this.waitResolve();
diff --git a/app/modules/prover/lib/engine.ts b/app/modules/prover/lib/engine.ts
index eaf2e6b2d..0f42ec11e 100644
--- a/app/modules/prover/lib/engine.ts
+++ b/app/modules/prover/lib/engine.ts
@@ -33,11 +33,11 @@ export class PowEngine {
}
async prove(stuff:any) {
- Promise.all([this.cluster.cancelWork()])
+ this.cluster.cancelWork()
return await this.cluster.proveByWorkers(stuff)
}
- async cancel() {
+ cancel() {
return this.cluster.cancelWork()
}
--
GitLab