From 3bb03c63fa2141a27d025cff469e6be837d9d67b Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Mon, 16 May 2016 15:58:07 -0700 Subject: [PATCH] move sizePush. --- lib/bcoin/mtx.js | 2 +- lib/bcoin/script.js | 20 ++++++++++++++++++++ lib/bcoin/utils.js | 20 -------------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/bcoin/mtx.js b/lib/bcoin/mtx.js index 5758f8cf..5161dbb1 100644 --- a/lib/bcoin/mtx.js +++ b/lib/bcoin/mtx.js @@ -936,7 +936,7 @@ MTX.prototype.maxSize = function maxSize(options, force) { if (redeem) { prev = redeem; sz = prev.getSize(); - size += utils.sizePush(sz); + size += bcoin.script.sizePush(sz); size += sz; } } diff --git a/lib/bcoin/script.js b/lib/bcoin/script.js index 7260476e..17624719 100644 --- a/lib/bcoin/script.js +++ b/lib/bcoin/script.js @@ -4296,6 +4296,26 @@ Script.isBadPush = function isBadPush(op) { return false; }; +/** + * Calculate the size (including + * the opcode) of a pushdata. + * @param {Number} num - Pushdata data length. + * @returns {Number} size + */ + +Script.sizePush = function sizePush(num) { + if (num <= 0x4b) + return 1; + + if (num <= 0xff) + return 2; + + if (num <= 0xffff) + return 3; + + return 5; +}; + /** * Test an object to see if it is a Script. * @param {Object} obj diff --git a/lib/bcoin/utils.js b/lib/bcoin/utils.js index e29c1204..e1820fc4 100644 --- a/lib/bcoin/utils.js +++ b/lib/bcoin/utils.js @@ -2126,26 +2126,6 @@ utils.sizeVarint = function sizeVarint(num) { return 9; }; -/** - * Calculate the size (including - * the opcode) of a pushdata. - * @param {Number} num - Pushdata data length. - * @returns {Number} size - */ - -utils.sizePush = function sizePush(num) { - if (num <= 0x4b) - return 1; - - if (num <= 0xff) - return 2; - - if (num <= 0xffff) - return 3; - - return 5; -}; - /** * Buffer comparator (memcmp + length comparison). * @param {Buffer} a