Merge pull request #1133 from matiu/bug/nn-name

Bug/nn name
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-19 16:45:51 -03:00
commit 068f8cad52
7 changed files with 51 additions and 36 deletions

View file

@ -228,12 +228,12 @@ describe('PublicKeyRing model', function() {
var hasChanged;
w.copayersBackup = ["a", "b"];
hasChanged = w.mergeBackups(["b", "c"]);
hasChanged = w._mergeBackups(["b", "c"]);
w.copayersBackup.length.should.equal(3);
hasChanged.should.equal(true);
w.copayersBackup = ["a", "b", "c"];
hasChanged = w.mergeBackups(["b", "c"]);
hasChanged = w._mergeBackups(["b", "c"]);
w.copayersBackup.length.should.equal(3);
hasChanged.should.equal(false);
});

File diff suppressed because one or more lines are too long

View file

@ -26,11 +26,9 @@ describe('Performance tests', function() {
generated.push(k);
}
var delta1 = new Date().getTime() - start1;
var backup = k1.toObj();
var k2 = PrivateKey.fromObj(backup);
var start2 = new Date().getTime();
for (var i = 0; i < generateN; i++) {
var k = JSON.stringify(k2.get(i, false).storeObj());
var k = JSON.stringify(k1.get(i, false).storeObj());
generated[i].should.equal(k);
}
var delta2 = new Date().getTime() - start2;
@ -62,11 +60,9 @@ describe('Performance tests', function() {
generated.push(pubKeys);
}
var delta1 = new Date().getTime() - start1;
var backup = pkr1.toObj();
var pkr2 = PublicKeyRing.fromObj(backup);
var start2 = new Date().getTime();
for (var i = 0; i < generateN; i++) {
var pubKeys = JSON.stringify(pkr2.getPubKeys(i, false));
var pubKeys = JSON.stringify(pkr1.getPubKeys(i, false));
generated[i].should.equal(pubKeys);
}
var delta2 = new Date().getTime() - start2;