anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #79 from maraoz/optimize/tests

Browse source 
optimize some tests
This commit is contained in:
Gustavo Maximiliano Cortez 2014-04-17 15:30:05 -03:00
commit e88c80bc3e
3 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/models/core/PublicKeyRing.js
View file

@ -166,10 +166,7 @@ PublicKeyRing.prototype.getAddress = function (index, isChange) {
this._checkIndexRange(index, isChange);
var script = this.getRedeemScript(index,isChange);
var hash = coinUtil.sha256ripe160(script.getBuffer());
var version = this.network.P2SHVersion;
var addr = new Address(version, hash);
return addr;
return Address.fromScript(script, this.network.name);
};
PublicKeyRing.prototype.getScriptPubKeyHex = function (index, isChange) {
@ -185,10 +182,11 @@ PublicKeyRing.prototype.generateAddress = function(isChange) {
var ret =
this.getAddress(isChange ? this.changeAddressIndex : this.addressIndex, isChange);
if (isChange)
if (isChange) {
this.changeAddressIndex++;
else
} else {
this.addressIndex++;
}
return ret;