LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tests/payments: fix redeem fixture mutation

Browse source
This commit is contained in:
Daniel Cousens 2018-09-26 16:02:39 +10:00
parent a6f2cc2924
commit df2a66c852
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/payments.utils.js
View file

@ -1,6 +1,6 @@
const t = require('assert') const t = require('assert')
const bscript = require('../src/script') const bscript = require('../src/script')
const bnetworks = require('../src/networks') const BNETWORKS = require('../src/networks')
function tryHex (x) { function tryHex (x) {
if (Buffer.isBuffer(x)) return x.toString('hex') if (Buffer.isBuffer(x)) return x.toString('hex')
@ -58,7 +58,7 @@ function equate (a, b, args) {
equateBase(a, b, '') equateBase(a, b, '')
if (b.redeem) equateBase(a.redeem, b.redeem, 'redeem.') if (b.redeem) equateBase(a.redeem, b.redeem, 'redeem.')
if (b.network) t.deepEqual(a.network, b.network, 'Inequal *.network') if (b.network) t.deepEqual(a.network, BNETWORKS[b.network], 'Inequal *.network')
// contextual // contextual
if (b.signature === null) b.signature = undefined if (b.signature === null) b.signature = undefined
@ -76,7 +76,7 @@ function equate (a, b, args) {
function preform (x) { function preform (x) {
x = Object.assign({}, x) x = Object.assign({}, x)
if (x.network) x.network = bnetworks[x.network] if (x.network) x.network = BNETWORKS[x.network]
if (typeof x.inputHex === 'string') { if (typeof x.inputHex === 'string') {
x.input = Buffer.from(x.inputHex, 'hex') x.input = Buffer.from(x.inputHex, 'hex')
delete x.inputHex delete x.inputHex
@ -96,10 +96,11 @@ function preform (x) {
if (x.pubkeys) x.pubkeys = x.pubkeys.map(fromHex) if (x.pubkeys) x.pubkeys = x.pubkeys.map(fromHex)
if (x.signatures) x.signatures = x.signatures.map(function (y) { return Number.isFinite(y) ? y : Buffer.from(y, 'hex') }) if (x.signatures) x.signatures = x.signatures.map(function (y) { return Number.isFinite(y) ? y : Buffer.from(y, 'hex') })
if (x.redeem) { if (x.redeem) {
x.redeem = Object.assign({}, x.redeem)
if (typeof x.redeem.input === 'string') x.redeem.input = asmToBuffer(x.redeem.input) if (typeof x.redeem.input === 'string') x.redeem.input = asmToBuffer(x.redeem.input)
if (typeof x.redeem.output === 'string') x.redeem.output = asmToBuffer(x.redeem.output) if (typeof x.redeem.output === 'string') x.redeem.output = asmToBuffer(x.redeem.output)
if (Array.isArray(x.redeem.witness)) x.redeem.witness = x.redeem.witness.map(fromHex) if (Array.isArray(x.redeem.witness)) x.redeem.witness = x.redeem.witness.map(fromHex)
if (x.redeem.network) x.redeem.network = bnetworks[x.redeem.network] if (x.redeem.network) x.redeem.network = BNETWORKS[x.redeem.network]
} }
return x return x