From 4eb3c2172dccb53390af8599c9d4cfce1063dfee Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sat, 15 Jul 2017 16:12:34 -0700 Subject: [PATCH] workers: refactor jobs. --- lib/workers/jobs.js | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/lib/workers/jobs.js b/lib/workers/jobs.js index b20b523e..ff39037c 100644 --- a/lib/workers/jobs.js +++ b/lib/workers/jobs.js @@ -70,21 +70,18 @@ jobs.handle = function handle(p) { * @param {TX} tx * @param {CoinView} view * @param {VerifyFlags} flags - * @returns {Boolean} + * @returns {CheckResultPacket} */ jobs.check = function check(tx, view, flags) { - let err = null; - try { tx.check(view, flags); - } catch (e) { - if (e.type !== 'ScriptError') - throw e; - err = e; + } catch (err) { + if (err.type === 'ScriptError') + return new packets.CheckResultPacket(err); + throw err; } - - return new packets.CheckResultPacket(err); + return new packets.CheckResultPacket(); }; /** @@ -94,21 +91,18 @@ jobs.check = function check(tx, view, flags) { * @param {Number} index * @param {Output} coin * @param {VerifyFlags} flags - * @returns {Boolean} + * @returns {CheckInputResultPacket} */ jobs.checkInput = function checkInput(tx, index, coin, flags) { - let err = null; - try { tx.checkInput(index, coin, flags); - } catch (e) { - if (e.type !== 'ScriptError') - throw e; - err = e; + } catch (err) { + if (err.type === 'ScriptError') + return new packets.CheckInputResultPacket(err); + throw err; } - - return new packets.CheckInputResultPacket(err); + return new packets.CheckInputResultPacket(); }; /**