From f5ea3b1870a9fe6de5e41a211010055529e41aea Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Fri, 1 Jul 2016 02:35:04 -0700 Subject: [PATCH] always duplicate objects. --- lib/bcoin/coin.js | 5 ----- lib/bcoin/script.js | 8 -------- lib/bcoin/tx.js | 34 +--------------------------------- 3 files changed, 1 insertion(+), 46 deletions(-) diff --git a/lib/bcoin/coin.js b/lib/bcoin/coin.js index 0838447d..d2d87149 100644 --- a/lib/bcoin/coin.js +++ b/lib/bcoin/coin.js @@ -29,9 +29,6 @@ var assert = utils.assert; */ function Coin(options) { - if (options instanceof Coin) - return options; - if (!(this instanceof Coin)) return new Coin(options); @@ -85,8 +82,6 @@ Coin.prototype.fromOptions = function fromOptions(options) { */ Coin.fromOptions = function fromOptions(options) { - if (options instanceof Coin) - return options; return new Coin().fromOptions(options); }; diff --git a/lib/bcoin/script.js b/lib/bcoin/script.js index 99178d19..92e7798a 100644 --- a/lib/bcoin/script.js +++ b/lib/bcoin/script.js @@ -32,9 +32,6 @@ var ScriptError = bcoin.errors.ScriptError; */ function Witness(options) { - if (options instanceof Witness) - return options; - if (!(this instanceof Witness)) return new Witness(options); @@ -1090,9 +1087,6 @@ Stack.isStack = function isStack(obj) { */ function Script(options) { - if (options instanceof Script) - return options; - if (!(this instanceof Script)) return new Script(options); @@ -1156,8 +1150,6 @@ Script.prototype.fromOptions = function fromOptions(options) { */ Script.fromOptions = function fromOptions(options) { - if (options instanceof Script) - return options; return new Script().fromOptions(options); }; diff --git a/lib/bcoin/tx.js b/lib/bcoin/tx.js index f270e3c1..07928dee 100644 --- a/lib/bcoin/tx.js +++ b/lib/bcoin/tx.js @@ -166,39 +166,7 @@ TX.fromOptions = function fromOptions(options) { */ TX.prototype.clone = function clone() { - var copy = new TX(); - var i, input, output; - - copy.ts = this.ts; - copy.block = this.block; - copy.index = this.index; - copy.height = this.height; - - copy.version = this.version; - copy.flag = this.flag; - - for (i = 0; i < this.inputs.length; i++) { - input = new bcoin.input(); - input.prevout = new bcoin.outpoint(); - input.prevout.hash = this.inputs[i].prevout.hash; - input.prevout.index = this.inputs[i].prevout.index; - input.coin = this.inputs[i].coin; - input.script = this.inputs[i].script; - input.witness = this.inputs[i].witness; - input.sequence = this.inputs[i].sequence; - copy.inputs.push(input); - } - - for (i = 0; i < this.outputs.length; i++) { - output = new bcoin.output(); - output.value = this.outputs[i].value; - output.script = this.outputs[i].script; - copy.outputs.push(output); - } - - copy.locktime = this.locktime; - - return copy; + return new TX(this); }; /**