From 7b597352b8b7ed51bd9bbf82abd4ed77a257cceb Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Wed, 24 Jan 2018 23:00:22 +0100
Subject: [PATCH] [fix] #1256force sync for cancelWork job
---
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 32d5699ec..87a666758 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
*/
- stopPoW() {
- this.stopPromise = querablep(this.theEngine.cancel())
+ async stopPoW() {
+ this.stopPromise = querablep(Promise.resolve(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()) {
- await farm.stopPoW()
+ Promise.resolve(farm.stopPoW())
} else {
// We force the stop anyway, just to be sure
- await farm.stopPoW()
+ Promise.resolve(farm.stopPoW())
}
if (this.waitResolve) {
this.waitResolve();
diff --git a/app/modules/prover/lib/engine.ts b/app/modules/prover/lib/engine.ts
index 0f42ec11e..eaf2e6b2d 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) {
- this.cluster.cancelWork()
+ Promise.all([this.cluster.cancelWork()])
return await this.cluster.proveByWorkers(stuff)
}
- cancel() {
+ async cancel() {
return this.cluster.cancelWork()
}
--
GitLab