From bca120a7b6bd82bd18878ddef3b86ae669f45a46 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Thu, 17 Apr 2014 15:04:39 -0300
Subject: [PATCH] optimize some tests

---
 js/models/core/PublicKeyRing.js | 10 ++++------
 test/test.PublicKeyRing.js      | 27 ++++++++++++++++-----------
 test/test.TxProposals.js        |  1 +
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/js/models/core/PublicKeyRing.js b/js/models/core/PublicKeyRing.js
index b7851ad24..23ef498ac 100644
--- a/js/models/core/PublicKeyRing.js
+++ b/js/models/core/PublicKeyRing.js
@@ -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;
 
diff --git a/test/test.PublicKeyRing.js b/test/test.PublicKeyRing.js
index b10338b94..c3701cb8b 100644
--- a/test/test.PublicKeyRing.js
+++ b/test/test.PublicKeyRing.js
@@ -75,10 +75,15 @@ describe('PublicKeyRing model', function() {
     var k = createW();
     var w = k.w;
     var copayers = k.copayers;
-    for(var i=0; i<3; i++)
+    var changeN = 2;
+    var addressN = 2;
+    var start = new Date().getTime();
+    for(var i=0; i<changeN; i++) {
       w.generateAddress(true);
-    for(var i=0; i<5; i++)
+    }
+    for(var i=0; i<addressN; i++) {
       w.generateAddress(false);
+    }
 
     var data = w.toObj();
     should.exist(data);
@@ -91,8 +96,8 @@ describe('PublicKeyRing model', function() {
       (function() {w.addCopayer(copayers[i])}).should.throw();
     }
 
-    w2.changeAddressIndex.should.equal(3);   
-    w2.addressIndex.should.equal(5); 
+    w2.changeAddressIndex.should.equal(changeN);   
+    w2.addressIndex.should.equal(addressN); 
   });
 
 
@@ -101,7 +106,7 @@ describe('PublicKeyRing model', function() {
     var w = k.w;
 
     for(var isChange=0; isChange<2; isChange++) {
-      for(var i=0; i<5; i++) {
+      for(var i=0; i<2; i++) {
         var a = w.generateAddress(isChange);
         a.isValid().should.equal(true);
         a.isScript().should.equal(true);
@@ -123,11 +128,11 @@ describe('PublicKeyRing model', function() {
     a.length.should.equal(0);
 
     for(var isChange=0; isChange<2; isChange++) 
-      for(var i=0; i<6; i++) 
+      for(var i=0; i<2; i++) 
          w.generateAddress(isChange);
  
     var as = w.getAddresses();
-    as.length.should.equal(12);
+    as.length.should.equal(4);
     for(var j in as) {
       var a = as[j];
       a.isValid().should.equal(true);
@@ -140,11 +145,11 @@ describe('PublicKeyRing model', function() {
 
     for(var i=0; i<3; i++)
       w.generateAddress(true);
-    for(var i=0; i<5; i++)
+    for(var i=0; i<2; i++)
       w.generateAddress(false);
 
     w.changeAddressIndex.should.equal(3);   
-    w.addressIndex.should.equal(5); 
+    w.addressIndex.should.equal(2); 
   });
 
   it('#merge index tests', function () {
@@ -281,11 +286,11 @@ describe('PublicKeyRing model', function() {
 
     for(var i=0; i<2; i++)
       w.generateAddress(true);
-    for(var i=0; i<3; i++)
+    for(var i=0; i<2; i++)
       w.generateAddress(false);
 
     var m = w.getRedeemScriptMap();
-    Object.keys(m).length.should.equal(5);
+    Object.keys(m).length.should.equal(4);
     Object.keys(m).forEach(function (k) {
       should.exist(m[k]);
     });
diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js
index 26ed2974d..aa120a17b 100644
--- a/test/test.TxProposals.js
+++ b/test/test.TxProposals.js
@@ -109,6 +109,7 @@ describe('TxProposals model', function() {
     var w = new TxProposals({
       networkName: config.networkName,
     });
+    var start = new Date().getTime();
     var pkr=createPKR([priv.getBIP32()]);
     var ts = Date.now();
     var isChange=0;