remove Address constructor

This commit is contained in:
Daniel Cousens 2015-07-21 10:55:47 +10:00
commit 13f414c122
6 changed files with 51 additions and 68 deletions

View file

@ -9,25 +9,13 @@ var Script = require('../src/script')
var fixtures = require('./fixtures/address.json')
describe('Address', function () {
describe('Constructor', function () {
it('does not mutate the input', function () {
fixtures.valid.forEach(function (f) {
var hash = new Buffer(f.hash, 'hex')
var addr = new Address(hash, f.version)
assert.strictEqual(addr.version, f.version)
assert.strictEqual(addr.hash.toString('hex'), f.hash)
})
})
})
describe('fromBase58Check', function () {
fixtures.valid.forEach(function (f) {
it('imports ' + f.script + ' (' + f.network + ') correctly', function () {
var addr = Address.fromBase58Check(f.base58check)
it('decodes ' + f.base58check, function () {
var decode = Address.fromBase58Check(f.base58check)
assert.strictEqual(addr.version, f.version)
assert.strictEqual(addr.hash.toString('hex'), f.hash)
assert.strictEqual(decode.version, f.version)
assert.strictEqual(decode.hash.toString('hex'), f.hash)
})
})
@ -42,12 +30,11 @@ describe('Address', function () {
describe('fromOutputScript', function () {
fixtures.valid.forEach(function (f) {
it('imports ' + f.script + ' (' + f.network + ') correctly', function () {
it('parses ' + f.script + ' (' + f.network + ')', function () {
var script = Script.fromASM(f.script)
var addr = Address.fromOutputScript(script, networks[f.network])
var address = Address.fromOutputScript(script, networks[f.network])
assert.strictEqual(addr.version, f.version)
assert.strictEqual(addr.hash.toString('hex'), f.hash)
assert.strictEqual(address, f.base58check)
})
})
@ -64,20 +51,18 @@ describe('Address', function () {
describe('toBase58Check', function () {
fixtures.valid.forEach(function (f) {
it('exports ' + f.script + ' (' + f.network + ') correctly', function () {
var addr = Address.fromBase58Check(f.base58check)
var result = addr.toBase58Check()
it('formats ' + f.hash + ' (' + f.network + ')', function () {
var address = Address.toBase58Check(new Buffer(f.hash, 'hex'), f.version)
assert.strictEqual(result, f.base58check)
assert.strictEqual(address, f.base58check)
})
})
})
describe('toOutputScript', function () {
fixtures.valid.forEach(function (f) {
it('imports ' + f.script + ' (' + f.network + ') correctly', function () {
var addr = Address.fromBase58Check(f.base58check)
var script = addr.toOutputScript()
it('exports ' + f.script + '(' + f.network + ')', function () {
var script = Address.toOutputScript(f.base58check)
assert.strictEqual(script.toASM(), f.script)
})
@ -85,10 +70,8 @@ describe('Address', function () {
fixtures.invalid.toOutputScript.forEach(function (f) {
it('throws when ' + f.description, function () {
var addr = new Address(new Buffer(f.hash, 'hex'), f.version)
assert.throws(function () {
addr.toOutputScript()
Address.toOutputScript(f.address)
}, new RegExp(f.description))
})
})

View file

@ -65,10 +65,10 @@ describe('Bitcoin-core', function () {
}
it('can import ' + string, function () {
var address = Address.fromBase58Check(string)
var decode = Address.fromBase58Check(string)
assert.strictEqual(address.hash.toString('hex'), hex)
assert.strictEqual(address.version, network[typeMap[params.addrType]])
assert.strictEqual(decode.hash.toString('hex'), hex)
assert.strictEqual(decode.version, network[typeMap[params.addrType]])
})
})
})

View file

@ -59,8 +59,7 @@
"toOutputScript": [
{
"description": "24kPZCmVgzfkpGdXExy56234MRHrsqQxNWE has no matching Script",
"hash": "751e76e8199196d454941c45d1b3a323f1433bd6",
"version": 153
"address": "24kPZCmVgzfkpGdXExy56234MRHrsqQxNWE"
}
]
}

View file

@ -65,13 +65,13 @@ describe('TransactionBuilder', function () {
txb = new TransactionBuilder()
prevTx = new Transaction()
prevTx.addOutput(Address.fromBase58Check('1BgGZ9tcN4rm9KBzDn7KprQz87SZ26SAMH').toOutputScript(), 0)
prevTx.addOutput(Address.fromBase58Check('1cMh228HTCiwS8ZsaakH8A8wze1JR5ZsP').toOutputScript(), 1)
prevTx.addOutput(Address.toOutputScript('1BgGZ9tcN4rm9KBzDn7KprQz87SZ26SAMH'), 0)
prevTx.addOutput(Address.toOutputScript('1cMh228HTCiwS8ZsaakH8A8wze1JR5ZsP'), 1)
prevTxHash = prevTx.getHash()
keyPair = new ECPair(BigInteger.ONE)
privAddress = keyPair.getAddress()
privScript = Address.fromBase58Check(privAddress).toOutputScript()
privScript = Address.toOutputScript(privAddress)
})
describe('addInput', function () {