script.toAddress -> script.getToAddress

This commit is contained in:
Wei Lu 2014-03-22 20:30:49 +08:00
parent 423124966f
commit c3880c0cdf
3 changed files with 5 additions and 5 deletions

View file

@ -150,7 +150,7 @@ Script.prototype.toScriptHash = function() {
return util.sha256ripe160(this.buffer) return util.sha256ripe160(this.buffer)
} }
Script.prototype.toAddress = function() { Script.prototype.getToAddress = function() {
var outType = this.getOutType(); var outType = this.getOutType();
if (outType == 'Pubkey') { if (outType == 'Pubkey') {

View file

@ -415,7 +415,7 @@ var TransactionOut = function (data) {
: data.address ? Script.createOutputScript(data.address) : data.address ? Script.createOutputScript(data.address)
: new Script(); : new Script();
if (this.script.buffer.length > 0) this.address = this.script.toAddress(); if (this.script.buffer.length > 0) this.address = this.script.getToAddress();
this.value = this.value =
Array.isArray(data.value) ? convert.bytesToNum(data.value) Array.isArray(data.value) ? convert.bytesToNum(data.value)

View file

@ -63,15 +63,15 @@ describe('Script', function() {
}) })
}) })
describe('toAddress', function() { describe('getToAddress', function() {
it('works for p2sh type output', function() { it('works for p2sh type output', function() {
var script = Script.fromHex("a914e8c300c87986efa84c37c0519929019ef86eb5b487") var script = Script.fromHex("a914e8c300c87986efa84c37c0519929019ef86eb5b487")
assert.equal(script.toAddress(), '3NukJ6fYZJ5Kk8bPjycAnruZkE5Q7UW7i8') assert.equal(script.getToAddress(), '3NukJ6fYZJ5Kk8bPjycAnruZkE5Q7UW7i8')
}) })
it('works for pubkey type output', function() { it('works for pubkey type output', function() {
var script = Script.fromHex("76a9145a3acbc7bbcc97c5ff16f5909c9d7d3fadb293a888ac") var script = Script.fromHex("76a9145a3acbc7bbcc97c5ff16f5909c9d7d3fadb293a888ac")
assert.equal(script.toAddress(), '19E6FV3m3kEPoJD5Jz6dGKdKwTVvjsWUvu') assert.equal(script.getToAddress(), '19E6FV3m3kEPoJD5Jz6dGKdKwTVvjsWUvu')
}) })
}) })
}) })